Add subscription and notification for resource changes; fix a bug while pserver node...

[pti/o2.git] / o2app / entrypoints / resource_watcher.py

diff --git a/o2app/entrypoints/resource_watcher.py b/o2app/entrypoints/resource_watcher.py
index 8a9b0cc..38308eb 100644 (file)
--- a/o2app/entrypoints/resource_watcher.py
+++ b/o2app/entrypoints/resource_watcher.py
@@ -31,6 +31,18 @@ from o2ims.adapter.clients.ocloud_sa_client import StxPserverClient
 from o2ims.service.watcher.pserver_cpu_watcher import PServerCpuWatcher\r
 from o2ims.adapter.clients.ocloud_sa_client import StxCpuClient\r
 \r
+from o2ims.service.watcher.pserver_mem_watcher import PServerMemWatcher\r
+from o2ims.adapter.clients.ocloud_sa_client import StxMemClient\r
+\r
+from o2ims.service.watcher.pserver_if_watcher import PServerIfWatcher\r
+from o2ims.adapter.clients.ocloud_sa_client import StxIfClient\r
+\r
+from o2ims.service.watcher.pserver_port_watcher import PServerIfPortWatcher\r
+from o2ims.adapter.clients.ocloud_sa_client import StxIfPortClient\r
+\r
+from o2ims.service.watcher.pserver_eth_watcher import PServerEthWatcher\r
+from o2ims.adapter.clients.ocloud_sa_client import StxEthClient\r
+\r
 from o2common.helper import o2logging\r
 logger = o2logging.get_logger(__name__)\r
 \r
@@ -42,7 +54,7 @@ class WatcherService(cotyledon.Service):
         super().__init__(worker_id)\r
         self.args = args\r
         self.bus = bootstrap.bootstrap()\r
-        self.worker = PollWorker()\r
+        self.worker = PollWorker(bus=self.bus)\r
 \r
     def run(self):\r
         try:\r
@@ -58,6 +70,14 @@ class WatcherService(cotyledon.Service):
                 PServerWatcher(StxPserverClient(), self.bus))\r
             child_pserver.addchild(\r
                 PServerCpuWatcher(StxCpuClient(), self.bus))\r
+            child_pserver.addchild(\r
+                PServerMemWatcher(StxMemClient(), self.bus))\r
+            child_pserver.addchild(\r
+                PServerEthWatcher(StxEthClient(), self.bus))\r
+            child_if = child_pserver.addchild(\r
+                PServerIfWatcher(StxIfClient(), self.bus))\r
+            # child_if.addchild(\r
+            #     PServerIfPortWatcher(StxIfPortClient(), self.bus))\r
 \r
             self.worker.add_watcher(root)\r
 \r