X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fentrypoints%2Fresource_watcher.py;h=085fb132829c82dc66df03403e09fab8ecb9f4a1;hb=cb338064d8fc43734aa16d2c75bdc664a1eb6422;hp=98145dcfe8b1afaddbe956602e6524acdc6d74aa;hpb=2e17b150a5df5ecd11cf668e7cccea021a03ab7b;p=pti%2Fo2.git

diff --git a/o2app/entrypoints/resource_watcher.py b/o2app/entrypoints/resource_watcher.py
index 98145dc..085fb13 100644
--- a/o2app/entrypoints/resource_watcher.py
+++ b/o2app/entrypoints/resource_watcher.py
@@ -21,9 +21,12 @@ from o2common.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
+from o2ims.service.watcher.alarm_watcher import AlarmWatcher
+
 from o2ims.adapter.clients.ocloud_client import StxDmsClient
 from o2ims.adapter.clients.ocloud_client import StxOcloudClient
 from o2ims.adapter.clients.ocloud_client import StxResourcePoolClient
+from o2ims.adapter.clients.fault_client import StxAlarmClient
 
 from o2ims.service.watcher.pserver_watcher import PServerWatcher
 from o2ims.adapter.clients.ocloud_client import StxPserverClient
@@ -37,12 +40,26 @@ from o2ims.adapter.clients.ocloud_client import StxMemClient
 from o2ims.service.watcher.pserver_if_watcher import PServerIfWatcher
 from o2ims.adapter.clients.ocloud_client import StxIfClient
 
-from o2ims.service.watcher.pserver_port_watcher import PServerIfPortWatcher
-from o2ims.adapter.clients.ocloud_client import StxIfPortClient
+# from o2ims.service.watcher.pserver_port_watcher import PServerIfPortWatcher
+# from o2ims.adapter.clients.ocloud_client import StxIfPortClient
 
 from o2ims.service.watcher.pserver_eth_watcher import PServerEthWatcher
 from o2ims.adapter.clients.ocloud_client import StxEthClient
 
+# from o2ims.service.watcher.pserver_dev_watcher import PServerDevWatcher
+# from o2ims.adapter.clients.ocloud_client import StxDevClient
+from o2ims.service.watcher.pserver_acc_watcher import PServerAccWatcher
+from o2ims.adapter.clients.ocloud_client import StxAccClient
+
+from o2ims.adapter.clients.alarm_dict_client import load_alarm_definition,\
+    load_alarm_dictionary_from_conf_file
+from o2ims.service.watcher.agg_compute_watcher import ComputeAggWatcher
+from o2ims.service.watcher.agg_network_watcher import NetworkAggWatcher
+from o2ims.service.watcher.agg_storage_watcher import StorageAggWatcher
+from o2ims.service.watcher.agg_undefined_watcher import UndefinedAggWatcher
+from o2ims.adapter.clients.aggregate_client import ComputeAggClient, \
+    NetworkAggClient, StorageAggClient, UndefinedAggClient
+
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -55,6 +72,8 @@ class WatcherService(cotyledon.Service):
         self.args = args
         self.bus = bootstrap.bootstrap()
         self.worker = PollWorker(bus=self.bus)
+        load_alarm_definition(self.bus.uow)
+        load_alarm_dictionary_from_conf_file(self.bus.uow)
 
     def run(self):
         try:
@@ -62,10 +81,24 @@ class WatcherService(cotyledon.Service):
                 StxOcloudClient(), self.bus))
             root.addchild(
                 DmsWatcher(StxDmsClient(), self.bus))
+            # root.addchild(
+            #     AlarmWatcher(StxFaultClient(), self.bus))
 
             child_respool = root.addchild(
                 ResourcePoolWatcher(StxResourcePoolClient(),
                                     self.bus))
+
+            # Add Aggregate watch
+            child_respool.addchild(
+                ComputeAggWatcher(ComputeAggClient(), self.bus))
+            child_respool.addchild(
+                NetworkAggWatcher(NetworkAggClient(), self.bus))
+            child_respool.addchild(
+                StorageAggWatcher(StorageAggClient(), self.bus))
+            child_respool.addchild(
+                UndefinedAggWatcher(UndefinedAggClient(), self.bus))
+
+            # Add Resource watch
             child_pserver = child_respool.addchild(
                 PServerWatcher(StxPserverClient(), self.bus))
             child_pserver.addchild(
@@ -74,10 +107,18 @@ class WatcherService(cotyledon.Service):
                 PServerMemWatcher(StxMemClient(), self.bus))
             child_pserver.addchild(
                 PServerEthWatcher(StxEthClient(), self.bus))
-            child_if = child_pserver.addchild(
+            child_pserver.addchild(
                 PServerIfWatcher(StxIfClient(), self.bus))
             # child_if.addchild(
             #     PServerIfPortWatcher(StxIfPortClient(), self.bus))
+            # child_pserver.addchild(
+            #     PServerDevWatcher(StxDevClient(), self.bus))
+            child_pserver.addchild(
+                PServerAccWatcher(StxAccClient(), self.bus))
+
+            # Add Alarm watch
+            child_respool.addchild(
+                AlarmWatcher(StxAlarmClient(self.bus.uow), self.bus))
 
             self.worker.add_watcher(root)