X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fpserver_watcher.py;h=8222cc3b38bf0dddd77e6ab470db03f525eababa;hb=44f01a560347914798d8f913696d0e495ee076f8;hp=4e2f330abafa874a54f5e6facb32e95bf2cad032;hpb=d4513e022d7d75d9967072cec1e0d7db34571120;p=pti%2Fo2.git

diff --git a/o2ims/service/watcher/pserver_watcher.py b/o2ims/service/watcher/pserver_watcher.py
index 4e2f330..8222cc3 100644
--- a/o2ims/service/watcher/pserver_watcher.py
+++ b/o2ims/service/watcher/pserver_watcher.py
@@ -12,9 +12,12 @@
 #  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.domain.stx_object import StxGenericModel
+from o2common.service.client.base_client import BaseClient
+# from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2ims.service.watcher.resource_watcher import ResourceWatcher
+from o2ims.domain import commands
+from o2common.service.messagebus import MessageBus
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -22,15 +25,14 @@ logger = o2logging.get_logger(__name__)
 
 class PServerWatcher(ResourceWatcher):
     def __init__(self, client: BaseClient,
-                 uow: AbstractUnitOfWork) -> None:
-        super().__init__(client, uow)
+                 bus: MessageBus) -> None:
+        super().__init__(client, bus)
 
     def _targetname(self):
         return "pserver"
 
-    def _probe(self, parent: object = None):
-        resourcepoolid = parent.id if parent else None
+    def _probe(self, parent: StxGenericModel):
+        resourcepoolid = parent.id
         newmodels = self._client.list(resourcepoolid=resourcepoolid)
-        for newmodel in newmodels:
-            super()._compare_and_update(newmodel)
-        return newmodels
+        return [commands.UpdatePserver(data=m, parentid=resourcepoolid)
+                for m in newmodels]