commit 86f2a07f014fd7dc85d6048286ab8be474e2f413
author Norman James <njames@us.ibm.com> Sat Jan 30 22:48:54 2016 -0600
committer Norman James <njames@us.ibm.com> Sun Jan 31 19:01:38 2016 -0600
tree f1f1a404970dba9026f9418ae88d112e266613fe
parent 7d524e0f4257eca1049fd075535239c803e1dee8

change object path for occ status sensor

bin/Barreleye.py

diff --git a/bin/Barreleye.py b/bin/Barreleye.py
index f939c12..b0badc1 100755
--- a/bin/Barreleye.py
+++ b/bin/Barreleye.py
@@ -507,8 +507,8 @@
 		0x09 : '/org/openbmc/sensors/host/BootCount',
 		0x05 : '/org/openbmc/sensors/host/BootProgress',
 		0x04 : '/org/openbmc/sensors/host/HostStatus',
-		0x08 : '/org/openbmc/sensors/host/OccStatus',
-		0x0A : '/org/openbmc/sensors/host/OccStatus1',
+		0x08 : '/org/openbmc/sensors/host/cpu0/OccStatus',
+		0x0A : '/org/openbmc/sensors/host/cpu1/OccStatus',
 		0x32 : '/org/openbmc/sensors/host/OperatingSystemStatus',
 		0x33 : '/org/openbmc/sensors/host/powercap',
 	},

bin/Palmetto.py

diff --git a/bin/Palmetto.py b/bin/Palmetto.py
index 4d2bf88..0735770 100755
--- a/bin/Palmetto.py
+++ b/bin/Palmetto.py
@@ -252,7 +252,7 @@
 		0x21 : '<inventory_root>/system/chassis/motherboard/dimm3',
 		0x09 : '/org/openbmc/sensors/host/BootCount',
 		0x05 : '/org/openbmc/sensors/host/BootProgress',
-		0x08 : '/org/openbmc/sensors/host/OccStatus',
+		0x08 : '/org/openbmc/sensors/host/cpu0/OccStatus',
 		0x32 : '/org/openbmc/sensors/host/OperatingSystemStatus',
 		0x33 : '/org/openbmc/sensors/host/PowerCap',
 	},

bin/discover_system_state.py

diff --git a/bin/discover_system_state.py b/bin/discover_system_state.py
index 236bd01..2657ca1 100755
--- a/bin/discover_system_state.py
+++ b/bin/discover_system_state.py
@@ -13,9 +13,14 @@
 		'object_name' : '/org/openbmc/control/power0',
 		'interface_name' : 'org.openbmc.control.Power'
 	},
-	'occstatus' : { 
+	'occstatus0' : { 
 		'bus_name' : 'org.openbmc.Sensors',
-		'object_name' : '/org/openbmc/sensors/host/OccStatus',
+		'object_name' : '/org/openbmc/sensors/host/cpu0/OccStatus',
+		'interface_name' : 'org.openbmc.SensorValue'
+	},
+	'occstatus1' : { 
+		'bus_name' : 'org.openbmc.Sensors',
+		'object_name' : '/org/openbmc/sensors/host/cpu1/OccStatus',
 		'interface_name' : 'org.openbmc.SensorValue'
 	},
 	'bootprogress' : { 
@@ -23,6 +28,11 @@
 		'object_name' : '/org/openbmc/sensors/host/BootProgress',
 		'interface_name' : 'org.openbmc.SensorValue'
 	},
+	'chassis' : { 
+		'bus_name' : 'org.openbmc.control.Chassis',
+		'object_name' : '/org/openbmc/control/chassis0',
+		'interface_name' : 'org.openbmc.control.Chassis'
+	},
 }
 
 def getInterface(bus,objs,key):
@@ -41,9 +51,16 @@
 if (pgood == 1):
 	intf = getInterface(bus,dbus_objects,'bootprogress')
 	intf.setValue("FW Progress, Starting OS")
-	intf = getInterface(bus,dbus_objects,'occstatus')
+	intf = getInterface(bus,dbus_objects,'occstatus0')
 	intf.setValue("Enabled")
-	
+	intf = getInterface(bus,dbus_objects,'occstatus1')
+	intf.setValue("Enabled")
+#else:
+#	chassis_intf = getInterface(bus,dbus_objects,'chassis')
+#	if (power_policy == "ALWAYS_POWER_ON" or
+#	  (power_policy == "RESTORE_LAST_STATE" and 
+#	  saved_system_state =="HOST_BOOTED")):
+#		chassis_intf.powerOn()
 
-		
+
 

bin/sensor_manager2.py

diff --git a/bin/sensor_manager2.py b/bin/sensor_manager2.py
index 58042ca..8146740 100755
--- a/bin/sensor_manager2.py
+++ b/bin/sensor_manager2.py
@@ -57,12 +57,12 @@
 	obj_path = OBJ_PATH+"/host/BootProgress"
 	root_sensor.add(obj_path,Sensors.BootProgressSensor(bus,obj_path))
 
-	obj_path = OBJ_PATH+"/host/OccStatus"
+	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/OccStatus1"
+	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)