Refactor code layout

[pti/o2.git] / o2ims / service / watcher / ocloud_watcher.py

diff --git a/o2ims/service/watcher/ocloud_watcher.py b/o2ims/service/watcher/ocloud_watcher.py
index bf4ce43..1d0c0ae 100644 (file)
--- a/o2ims/service/watcher/ocloud_watcher.py
+++ b/o2ims/service/watcher/ocloud_watcher.py
@@ -13,12 +13,12 @@
 #  limitations under the License.\r
 \r
 # from o2ims.domain.resource_type import ResourceTypeEnum\r
-from o2ims.service.client.base_client import BaseClient\r
-# from o2ims.domain.stx_object import StxGenericModel\r
-# from o2ims.service.unit_of_work import AbstractUnitOfWork\r
-from o2ims.service.watcher.base import BaseWatcher\r
+from o2common.service.client.base_client import BaseClient\r
+from o2ims.domain.stx_object import StxGenericModel\r
+# from o2common.service.unit_of_work import AbstractUnitOfWork\r
+from o2common.service.watcher.base import BaseWatcher\r
 from o2ims.domain import commands\r
-from o2ims.service.messagebus import MessageBus\r
+from o2common.service.messagebus import MessageBus\r
 \r
 from o2common.helper import o2logging\r
 logger = o2logging.get_logger(__name__)\r
@@ -73,10 +73,11 @@ class DmsWatcher(BaseWatcher):
     def _targetname(self):\r
         return "dms"\r
 \r
-    def _probe(self, parent: object = None):\r
-        ocloudid = parent.id if parent else None\r
+    def _probe(self, parent: StxGenericModel):\r
+        ocloudid = parent.id\r
         newmodels = self._client.list(ocloudid=ocloudid)\r
         # for newmodel in newmodels:\r
         #     super()._compare_and_update(newmodel)\r
         # return newmodels\r
-        return [commands.UpdateDms(m) for m in newmodels]\r
+        return [commands.UpdateDms(data=m, parentid=ocloudid)\r
+                for m in newmodels]\r