Refactor code layout

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

diff --git a/o2ims/service/watcher/pserver_watcher.py b/o2ims/service/watcher/pserver_watcher.py
index ec21564..ca3e898 100644 (file)
--- a/o2ims/service/watcher/pserver_watcher.py
+++ b/o2ims/service/watcher/pserver_watcher.py
@@ -12,25 +12,27 @@
 #  See the License for the specific language governing permissions and\r
 #  limitations under the License.\r
 \r
-from o2ims.service.client.base_client import BaseClient\r
-from o2ims.service.unit_of_work import AbstractUnitOfWork\r
+from o2ims.domain.stx_object import StxGenericModel\r
+from o2common.service.client.base_client import BaseClient\r
+# from o2common.service.unit_of_work import AbstractUnitOfWork\r
 from o2ims.service.watcher.resource_watcher import ResourceWatcher\r
+from o2ims.domain import commands\r
+from o2common.service.messagebus import MessageBus\r
 \r
-import logging\r
-logger = logging.getLogger(__name__)\r
+from o2common.helper import o2logging\r
+logger = o2logging.get_logger(__name__)\r
 \r
 \r
 class PServerWatcher(ResourceWatcher):\r
     def __init__(self, client: BaseClient,\r
-                 uow: AbstractUnitOfWork) -> None:\r
-        super().__init__(client, uow)\r
+                 bus: MessageBus) -> None:\r
+        super().__init__(client, bus)\r
 \r
     def _targetname(self):\r
         return "pserver"\r
 \r
-    def _probe(self, parent: object = None):\r
-        resourcepoolid = parent.id if parent else None\r
+    def _probe(self, parent: StxGenericModel):\r
+        resourcepoolid = parent.id\r
         newmodels = self._client.list(resourcepoolid=resourcepoolid)\r
-        for newmodel in newmodels:\r
-            super()._compare_and_update(newmodel)\r
-        return newmodels\r
+        return [commands.UpdatePserverCpu(data=m, parentid=resourcepoolid)\r
+                for m in newmodels]\r