X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fresourcepool_watcher.py;h=214041fd2e533d6f59f300b91f4f14e47b147789;hb=44f01a560347914798d8f913696d0e495ee076f8;hp=dc7745ac36e8a57d0ce9a5cf7c0e20031e3d3f15;hpb=62f8863960ebd439c714b0ceed204731d9b31266;p=pti%2Fo2.git diff --git a/o2ims/service/watcher/resourcepool_watcher.py b/o2ims/service/watcher/resourcepool_watcher.py index dc7745a..214041f 100644 --- a/o2ims/service/watcher/resourcepool_watcher.py +++ b/o2ims/service/watcher/resourcepool_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,11 +31,12 @@ class ResourcePoolWatcher(BaseWatcher): def _targetname(self): return "resourcepool" - def _probe(self, parent: object = None): - ocloudid = parent.id if parent else None + def _probe(self, parent: StxGenericModel): + ocloudid = parent.id newmodels = self._client.list(ocloudid=ocloudid) # for newmodel in newmodels: # logger.info("detect ocloudmodel:" + newmodel.name) # super()._compare_and_update(newmodel) # return newmodels - return [commands.UpdateResourcePool(m) for m in newmodels] + return [commands.UpdateResourcePool(data=m, parentid=ocloudid) + for m in newmodels]