Refactor code layout

[pti/o2.git] / o2common / service / watcher / base.py

diff --git a/o2common/service/watcher/base.py b/o2common/service/watcher/base.py
index 0daf8d4..6e1eb9e 100644 (file)
--- a/o2common/service/watcher/base.py
+++ b/o2common/service/watcher/base.py
@@ -14,11 +14,9 @@
 \r
 # from logging import exception\r
 # from cgtsclient import exc\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.domain import commands\r
-from o2ims.service.messagebus import MessageBus\r
+from o2common.service.client.base_client import BaseClient\r
+from o2common.domain import commands\r
+from o2common.service.messagebus import MessageBus\r
 from o2common.helper import o2logging\r
 logger = o2logging.get_logger(__name__)\r
 \r
@@ -34,7 +32,7 @@ class BaseWatcher(object):
     def targetname(self) -> str:\r
         return self._targetname()\r
 \r
-    def probe(self, parent: commands.UpdateStxObject = None):\r
+    def probe(self, parent: commands.Command = None):\r
         try:\r
             cmds = self._probe(parent.data if parent else None)\r
             for cmd in cmds:\r
@@ -46,7 +44,7 @@ class BaseWatcher(object):
             logger.warning("Failed to probe resource due to: " + str(ex))\r
             return []\r
 \r
-    def _probe(self, parent: object = None) -> commands.UpdateStxObject:\r
+    def _probe(self, parent: object = None) -> commands.Command:\r
         raise NotImplementedError\r
 \r
     def _targetname(self):\r