X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2app%2Fentrypoints%2Fresource_watcher.py;h=38308ebb7e62893c9807968d2493fe04b1ca2b0f;hb=730b4043e3512893704b4ec66492812dd3f0adc1;hp=036596cac605f8d6cef47ae1de02f56bc61224bc;hpb=5e02e76308e1677fb106572b885a366eb6c0fbec;p=pti%2Fo2.git

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