X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Fstx_object.py;h=549c4fc734788a861e3b03a6e5da15865b66a2f8;hb=282ddaeedc42ddafead018bd4aea4740d275f2bb;hp=c53b877fa0127e1d98e1fab37dfa005ed78f28c8;hpb=2e17b150a5df5ecd11cf668e7cccea021a03ab7b;p=pti%2Fo2.git diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py index c53b877..549c4fc 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.content = json.dumps(api_response.to_dict()) + self.filtered = getattr(api_response, 'filtered', None) + self.hash = content_hash or str( + hash((self.id, str(self.filtered) + if self.filtered else self.updatetime))) + + def handle_non_serializable(obj): + return repr(obj) + self.content = json.dumps( + vars(api_response), default=handle_non_serializable) + if ResourceTypeEnum.RESOURCE_POOL == type: self.res_pool_id = self.id