[PATCH skeleton] [skeleton]: Fix hard-coded path name when creating sensor object

[OpenBMC Patches]

From: Yi Li <adamliyi at msn.com>

This patch fixes skeleton issue: https://github.com/openbmc/skeleton/issues/33
The non-poll sensors have system specific properties. Define the sensor properties
in System files, and generate sensor object dynamically.
---
 bin/Barreleye.py       | 25 +++++++++++++++++++++++++
 bin/Firestone.py       | 27 +++++++++++++++++++++++++++
 bin/Garrison.py        | 26 ++++++++++++++++++++++++++
 bin/Palmetto.py        | 22 ++++++++++++++++++++++
 bin/sensor_manager2.py | 35 +++++++++--------------------------
 5 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index 0cf55a1..72a913a 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -718,3 +718,28 @@ HWMON_CONFIG = {
 	},
 }
 
+# Miscellaneous non-poll sensor with system specific properties.
+# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
+MISC_SENSORS = {
+	'BootCount' : { 'id' : 0x09,
+			'class' : 'BootCountSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootCount' },
+	'BootProgress' : { 'id' : 0x05,
+			'class' : 'BootProgressSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootProgress' },
+	'OccStatus_0' : { 'id' : 0x08,
+			'class' : 'OccStatusSensor',
+			'object_path'  : '/org/openbmc/sensors/host/cpu0/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' },
+	'OccStatus_1' : { 'id' : 0x0A,
+			'class' : 'OccStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/cpu1/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' },
+	'OperatingSystemStatus' : { 'id' : 0x32,
+			'class' : 'OperatingSystemStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/OperatingSystemStatus' },
+	'PowerCap' : { 'id' : 0x33,
+			'class' : 'PowerCap',
+			'object_path' : '/org/openbmc/sensors/host/PowerCap',
+			'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
+}
diff --git a/bin/Firestone.py b/bin/Firestone.py
index 91a6099..be755a2 100755
--- a/bin/Firestone.py
+++ b/bin/Firestone.py
@@ -608,3 +608,30 @@ HWMON_CONFIG = {
         }
     },
 }
+
+
+# Miscellaneous non-poll sensor with system specific properties.
+# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
+MISC_SENSORS = {
+	'BootCount' : { 'id' : 0x09,
+			'class' : 'BootCountSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootCount' },
+	'BootProgress' : { 'id' : 0x05,
+			'class' : 'BootProgressSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootProgress' },
+	'OccStatus_0' : { 'id' : 0x08,
+			'class' : 'OccStatusSensor',
+			'object_path'  : '/org/openbmc/sensors/host/cpu0/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' },
+	'OccStatus_1' : { 'id' : 0x0A,
+			'class' : 'OccStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/cpu1/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' },
+	'OperatingSystemStatus' : { 'id' : 0x32,
+			'class' : 'OperatingSystemStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/OperatingSystemStatus' },
+	'PowerCap' : { 'id' : 0x33,
+			'class' : 'PowerCap',
+			'object_path' : '/org/openbmc/sensors/host/PowerCap',
+			'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
+}
diff --git a/bin/Garrison.py b/bin/Garrison.py
index 5564162..c6959eb 100755
--- a/bin/Garrison.py
+++ b/bin/Garrison.py
@@ -608,3 +608,29 @@ HWMON_CONFIG = {
         }
     },
 }
+
+# Miscellaneous non-poll sensor with system specific properties.
+# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
+MISC_SENSORS = {
+	'BootCount' : { 'id' : 0x09,
+			'class' : 'BootCountSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootCount' },
+	'BootProgress' : { 'id' : 0x05,
+			'class' : 'BootProgressSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootProgress' },
+	'OccStatus_0' : { 'id' : 0x08,
+			'class' : 'OccStatusSensor',
+			'object_path'  : '/org/openbmc/sensors/host/cpu0/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' },
+	'OccStatus_1' : { 'id' : 0x0A,
+			'class' : 'OccStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/cpu1/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0051/online' },
+	'OperatingSystemStatus' : { 'id' : 0x32,
+			'class' : 'OperatingSystemStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/OperatingSystemStatus' },
+	'PowerCap' : { 'id' : 0x33,
+			'class' : 'PowerCap',
+			'object_path' : '/org/openbmc/sensors/host/PowerCap',
+			'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
+}
diff --git a/bin/Palmetto.py b/bin/Palmetto.py
index 09fbe06..4d227bd 100755
--- a/bin/Palmetto.py
+++ b/bin/Palmetto.py
@@ -306,3 +306,25 @@ HWMON_CONFIG = {
 		}
 	}
 }
+
+# Miscellaneous non-poll sensor with system specific properties.
+# The sensor id is the same as those defined in ID_LOOKUP['SENSOR'].
+MISC_SENSORS = {
+	'BootCount' : { 'id' : 0x09,
+			'class' : 'BootCountSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootCount' },
+        'BootProgress' : { 'id' : 0x05,
+			'class' : 'BootProgressSensor',
+			'object_path' : '/org/openbmc/sensors/host/BootProgress' },
+        'OccStatus_0' : { 'id' : 0x08,
+			'class' : 'OccStatusSensor',
+			'object_path'  : '/org/openbmc/sensors/host/cpu0/OccStatus',
+			'os_path' : '/sys/class/i2c-adapter/i2c-3/3-0050/online' },
+        'OperatingSystemStatus' : { 'id' : 0x32,
+			'class' : 'OperatingSystemStatusSensor',
+			'object_path' : '/org/openbmc/sensors/host/OperatingSystemStatus' },
+        'PowerCap' : { 'id' : 0x33,
+			'class' : 'PowerCap',
+			'object_path' : '/org/openbmc/sensors/host/PowerCap',
+			'os_path' : '/sys/class/hwmon/hwmon3/user_powercap' },
+}
diff --git a/bin/sensor_manager2.py b/bin/sensor_manager2.py
index b5aac53..711d5e0 100755
--- a/bin/sensor_manager2.py
+++ b/bin/sensor_manager2.py
@@ -9,6 +9,8 @@ import dbus.mainloop.glib
 import Openbmc
 import Sensors
 
+System = __import__(sys.argv[1])
+
 DBUS_NAME = 'org.openbmc.Sensors'
 OBJ_PATH = '/org/openbmc/sensors'
 
@@ -50,32 +52,13 @@ if __name__ == '__main__':
 
 	## instantiate non-polling sensors
 	## these don't need to be in seperate process
-	## TODO: this should not be hardcoded
-
-	obj_path = OBJ_PATH+"/host/PowerCap"
-	sensor_obj = Sensors.PowerCap(bus,obj_path)
-	## hwmon3 is default for master OCC on Barreleye.
-	## should rewrite sensor_manager to remove hardcode
-	sensor_obj.sysfs_attr = "/sys/class/hwmon/hwmon3/user_powercap"
-	root_sensor.add(obj_path,sensor_obj)
-
-	obj_path = OBJ_PATH+"/host/BootProgress"
-	root_sensor.add(obj_path,Sensors.BootProgressSensor(bus,obj_path))
-
-	obj_path = OBJ_PATH+"/host/cpu0/OccStatus"
-	sensor_obj = Sensors.OccStatusSensor(bus,obj_path)
-	sensor_obj.sysfs_attr = "/sys/class/i2c-adapter/i2c-3/3-0050/online"
-	root_sensor.add(obj_path,sensor_obj)
-
-	obj_path = OBJ_PATH+"/host/cpu1/OccStatus"
-	sensor_obj = Sensors.OccStatusSensor(bus,obj_path)
-	sensor_obj.sysfs_attr = "/sys/class/i2c-adapter/i2c-3/3-0051/online"
-	root_sensor.add(obj_path,sensor_obj)
-
-	obj_path = OBJ_PATH+"/host/BootCount"
-	root_sensor.add(obj_path,Sensors.BootCountSensor(bus,obj_path))
-	obj_path = OBJ_PATH+"/host/OperatingSystemStatus"
-	root_sensor.add(obj_path,Sensors.OperatingSystemStatusSensor(bus,obj_path))
+	for the_sensor in System.MISC_SENSORS.values():
+		sensor_class = the_sensor['class']
+		obj_path = the_sensor['object_path']
+		sensor_obj = getattr(Sensors, sensor_class)(bus, obj_path)
+		if 'os_path' in the_sensor:
+			sensor_obj.sysfs_attr = the_sensor['os_path']
+		root_sensor.add(obj_path, sensor_obj)
 
 	mainloop = gobject.MainLoop()
 	print "Starting sensor manager"
-- 
2.8.1