X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fresource_watcher.py;h=86416e3bd8d8c93050b0aa81f56f9918ae58bebb;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=4d2555b0285e30be34d34c7559e14e86d89b37de;hpb=62f8863960ebd439c714b0ceed204731d9b31266;p=pti%2Fo2.git

diff --git a/o2ims/service/watcher/resource_watcher.py b/o2ims/service/watcher/resource_watcher.py
index 4d2555b..86416e3 100644
--- a/o2ims/service/watcher/resource_watcher.py
+++ b/o2ims/service/watcher/resource_watcher.py
@@ -12,11 +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.service.watcher.base import BaseWatcher
+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 o2ims.service.messagebus import MessageBus
+from o2common.service.messagebus import MessageBus
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -30,10 +31,8 @@ class ResourceWatcher(BaseWatcher):
     def _targetname(self):
         return "resource"
 
-    def _probe(self, parent: object = None):
-        parentid = parent.id if parent else None
+    def _probe(self, parent: StxGenericModel):
+        parentid = parent.id
         newmodels = self._client.get(parentid=parentid)
-        # for newmodel in newmodels:
-        #     super()._compare_and_update(newmodel)
-        # return newmodels
-        return [commands.UpdateResource(m) for m in newmodels]
+        return [commands.UpdateResource(data=m, parentid=parentid)
+                for m in newmodels]