Fix INF-359 and INF-352 about the alarm event record

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

diff --git a/o2app/entrypoints/resource_watcher.py b/o2app/entrypoints/resource_watcher.py
index 3f54758..b557054 100644 (file)
--- a/o2app/entrypoints/resource_watcher.py
+++ b/o2app/entrypoints/resource_watcher.py
@@ -21,27 +21,42 @@ 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.adapter.clients.ocloud_sa_client import StxSaDmsClient
-from o2ims.adapter.clients.ocloud_sa_client import StxSaOcloudClient
-from o2ims.adapter.clients.ocloud_sa_client import StxSaResourcePoolClient
+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_sa_client import StxPserverClient
+from o2ims.adapter.clients.ocloud_client import StxPserverClient
 
 from o2ims.service.watcher.pserver_cpu_watcher import PServerCpuWatcher
-from o2ims.adapter.clients.ocloud_sa_client import StxCpuClient
+from o2ims.adapter.clients.ocloud_client import StxCpuClient
 
 from o2ims.service.watcher.pserver_mem_watcher import PServerMemWatcher
-from o2ims.adapter.clients.ocloud_sa_client import StxMemClient
+from o2ims.adapter.clients.ocloud_client import StxMemClient
 
 from o2ims.service.watcher.pserver_if_watcher import PServerIfWatcher
-from o2ims.adapter.clients.ocloud_sa_client import StxIfClient
+from o2ims.adapter.clients.ocloud_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_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_sa_client import StxEthClient
+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.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__)
@@ -59,13 +74,27 @@ class WatcherService(cotyledon.Service):
     def run(self):
         try:
             root = WatcherTree(OcloudWatcher(
-                StxSaOcloudClient(), self.bus))
+                StxOcloudClient(), self.bus))
             root.addchild(
-                DmsWatcher(StxSaDmsClient(), self.bus))
+                DmsWatcher(StxDmsClient(), self.bus))
+            # root.addchild(
+            #     AlarmWatcher(StxFaultClient(), self.bus))
 
             child_respool = root.addchild(
-                ResourcePoolWatcher(StxSaResourcePoolClient(),
+                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 +103,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)