pysensormgr: Remove sensor manager
This sensor manager was in charge of managing the sensors under
the /org/openbmc/sensors path, but this path is now deprecated
and the sensors have moved to other paths specified by the ipmi
sensor config.yaml file in the openbmc/openbmc repo.
This sensor manager can now be removed.
Tested: Powered on a Witherspoon to the Host OS without ipmi
giving get/set sensor errors.
Change-Id: Ic6a8b95d9dd025ba160669acac134c0b49420a89
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/Makefile b/Makefile
index 3938ddc..6a6422f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@
pyflashbmc \
pyinventorymgr \
pyipmitest \
- pysensormgr \
pystatemgr \
pysystemmgr \
pytools
diff --git a/pysensormgr/Makefile b/pysensormgr/Makefile
deleted file mode 120000
index 76a90fc..0000000
--- a/pysensormgr/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile.python
\ No newline at end of file
diff --git a/pysensormgr/sensor_manager2.py b/pysensormgr/sensor_manager2.py
deleted file mode 100644
index f6a7dbf..0000000
--- a/pysensormgr/sensor_manager2.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env python
-
-# TODO: openbmc/openbmc#2994 remove python 2 support
-try: # python 2
- import gobject
-except ImportError: # python 3
- from gi.repository import GObject as gobject
-import dbus
-import dbus.service
-import dbus.mainloop.glib
-import obmc.sensors
-from obmc.dbuslib.bindings import DbusProperties, DbusObjectManager, get_dbus
-
-try:
- import obmc_system_config as System
- has_system = True
-except ImportError:
- has_system = False
-
-DBUS_NAME = 'org.openbmc.Sensors'
-OBJ_PATH = '/org/openbmc/sensors'
-
-
-class SensorManager(DbusProperties, DbusObjectManager):
- def __init__(self, bus, name):
- super(SensorManager, self).__init__(
- conn=bus,
- object_path=name)
-
- @dbus.service.method(
- DBUS_NAME, in_signature='ss', out_signature='')
- def register(self, object_name, obj_path):
- if obj_path not in self.objects:
- print("Register: "+object_name+" : "+obj_path)
- sensor = eval('obmc.sensors.'+object_name+'(bus,obj_path)')
- self.add(obj_path, sensor)
-
- @dbus.service.method(
- DBUS_NAME, in_signature='s', out_signature='')
- def delete(self, obj_path):
- if obj_path in self.objects:
- print("Delete: "+obj_path)
- self.remove(obj_path)
-
- def SensorChange(self, value, path=None):
- if path in self.objects:
- self.objects[path].setValue(value)
- else:
- print("ERROR: Sensor not found: "+path)
-
-
-if __name__ == '__main__':
- dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
- bus = get_dbus()
- root_sensor = SensorManager(bus, OBJ_PATH)
-
- # instantiate non-polling sensors
- # these don't need to be in separate process
- if has_system:
- for (id, the_sensor) in list(System.MISC_SENSORS.items()):
- sensor_class = the_sensor['class']
- obj_path = System.ID_LOOKUP['SENSOR'][id]
- sensor_obj = getattr(obmc.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()
-
- root_sensor.unmask_signals()
- name = dbus.service.BusName(DBUS_NAME, bus)
- print("Starting sensor manager")
- mainloop.run()
-
-# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
diff --git a/pysensormgr/setup.cfg b/pysensormgr/setup.cfg
deleted file mode 120000
index 29939b5..0000000
--- a/pysensormgr/setup.cfg
+++ /dev/null
@@ -1 +0,0 @@
-../setup.cfg
\ No newline at end of file
diff --git a/pysensormgr/setup.py b/pysensormgr/setup.py
deleted file mode 100644
index 7944841..0000000
--- a/pysensormgr/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from distutils.core import setup
-
-setup(name='pysensormgr',
- version='1.0',
- scripts=['sensor_manager2.py'],
- )