X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fresourcepool_watcher.py;h=20090bfe8d1186fca1b3bd422d3aad133cc5790b;hb=45f6aa19191f366a05aa6df0902536c225c6d970;hp=6343292f85acb49fe7e5a443a608fbf91cff1bff;hpb=d4513e022d7d75d9967072cec1e0d7db34571120;p=pti%2Fo2.git

diff --git a/o2ims/service/watcher/resourcepool_watcher.py b/o2ims/service/watcher/resourcepool_watcher.py
index 6343292..20090bf 100644
--- a/o2ims/service/watcher/resourcepool_watcher.py
+++ b/o2ims/service/watcher/resourcepool_watcher.py
@@ -1,37 +1,43 @@
-# Copyright (C) 2021 Wind River Systems, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-from o2ims.service.client.base_client import BaseClient
-from o2ims.service.unit_of_work import AbstractUnitOfWork
-from o2ims.service.watcher.base import BaseWatcher
-
-from o2common.helper import o2logging
-logger = o2logging.get_logger(__name__)
-
-
-class ResourcePoolWatcher(BaseWatcher):
-    def __init__(self, client: BaseClient,
-                 uow: AbstractUnitOfWork) -> None:
-        super().__init__(client, uow)
-
-    def _targetname(self):
-        return "resourcepool"
-
-    def _probe(self, parent: object = None):
-        ocloudid = parent.id if parent else None
-        newmodels = self._client.list(ocloudid=ocloudid)
-        for newmodel in newmodels:
-            logger.info("detect ocloudmodel:" + newmodel.name)
-            super()._compare_and_update(newmodel)
-        return newmodels
+# Copyright (C) 2021 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+from o2ims.domain.stx_object import StxGenericModel
+from o2common.service.client.base_client import BaseClient
+# from o2common.service.unit_of_work import AbstractUnitOfWork
+from o2common.service.watcher.base import BaseWatcher
+from o2ims.domain import commands
+from o2common.service.messagebus import MessageBus
+
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
+
+
+class ResourcePoolWatcher(BaseWatcher):
+
+    def __init__(self, client: BaseClient,
+                 bus: MessageBus) -> None:
+        super().__init__(client, bus)
+
+    def _targetname(self):
+        return "resourcepool"
+
+    def _probe(self, parent: StxGenericModel, tags: object = None):
+        ocloudid = parent.id
+        newmodels = self._client.list(ocloudid=ocloudid)
+        # for newmodel in newmodels:
+        #     logger.info("detect ocloudmodel:" + newmodel.name)
+        #     super()._compare_and_update(newmodel)
+        # return newmodels
+        return [commands.UpdateResourcePool(data=m, parentid=ocloudid)
+                for m in newmodels]