Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
charts: add supprot to pull images from private registry
[pti/o2.git]
/
o2app
/
entrypoints
/
resource_watcher.py
diff --git
a/o2app/entrypoints/resource_watcher.py
b/o2app/entrypoints/resource_watcher.py
index
3f54758
..
909e86c
100644
(file)
--- a/
o2app/entrypoints/resource_watcher.py
+++ b/
o2app/entrypoints/resource_watcher.py
@@
-21,27
+21,35
@@
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.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.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.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.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.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.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 o2common.helper import o2logging
logger = o2logging.get_logger(__name__)
from o2common.helper import o2logging
logger = o2logging.get_logger(__name__)
@@
-59,12
+67,14
@@
class WatcherService(cotyledon.Service):
def run(self):
try:
root = WatcherTree(OcloudWatcher(
def run(self):
try:
root = WatcherTree(OcloudWatcher(
- Stx
Sa
OcloudClient(), self.bus))
+ StxOcloudClient(), self.bus))
root.addchild(
root.addchild(
- DmsWatcher(StxSaDmsClient(), self.bus))
+ DmsWatcher(StxDmsClient(), self.bus))
+ # root.addchild(
+ # AlarmWatcher(StxFaultClient(), self.bus))
child_respool = root.addchild(
child_respool = root.addchild(
- ResourcePoolWatcher(Stx
Sa
ResourcePoolClient(),
+ ResourcePoolWatcher(StxResourcePoolClient(),
self.bus))
child_pserver = child_respool.addchild(
PServerWatcher(StxPserverClient(), self.bus))
self.bus))
child_pserver = child_respool.addchild(
PServerWatcher(StxPserverClient(), self.bus))
@@
-74,11
+84,20
@@
class WatcherService(cotyledon.Service):
PServerMemWatcher(StxMemClient(), self.bus))
child_pserver.addchild(
PServerEthWatcher(StxEthClient(), self.bus))
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))
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))
+
+ self.worker.add_watcher(root)
+ # Add Alarm watch
+ root = WatcherTree(
+ AlarmWatcher(StxAlarmClient(self.bus.uow), self.bus))
self.worker.add_watcher(root)
self.worker.start()
self.worker.add_watcher(root)
self.worker.start()