X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fdomain%2Fstx_object.py;h=2eee7b7b185000e378479f6da0b6995bae481ee1;hb=8d6c2f135ee103b9a94ea6c29986a608069b6982;hp=ea0fc3d3ab3dde6c1bdd5c84d29dff1c8f2782e9;hpb=defe8209b3628593c186487857fe02586d7e1503;p=pti%2Fo2.git diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py index ea0fc3d..2eee7b7 100644 --- a/o2ims/domain/stx_object.py +++ b/o2ims/domain/stx_object.py @@ -29,16 +29,23 @@ class StxGenericModel(AgRoot): if api_response: self.id = str(api_response.uuid) self.type = type + self.name = api_response.name self.updatetime = datetime.datetime.strptime( api_response.updated_at.split('.')[0], "%Y-%m-%dT%H:%M:%S") \ if api_response.updated_at else None self.createtime = datetime.datetime.strptime( api_response.created_at.split('.')[0], "%Y-%m-%dT%H:%M:%S") \ if api_response.created_at else None - self.name = api_response.name - self.hash = content_hash if content_hash \ - else str(hash((self.id, self.updatetime))) + self.hash = content_hash + if not self.hash: + if hasattr(api_response, 'filtered'): + self.filtered = api_response.filtered + self.hash = str(hash((self.id, str(self.filtered)))) + else: + self.hash = str(hash((self.id, self.updatetime))) self.content = json.dumps(api_response.to_dict()) + if ResourceTypeEnum.RESOURCE_POOL == type: + self.res_pool_id = self.id def is_outdated(self, newmodel) -> bool: # return self.updatetime < newmodel.updatetime