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=09d1a16cc0017b999ba632e6b14bc996a4f3c788;hpb=965d6c3640ec7e735f0c17985c583952962fbbba;p=pti%2Fo2.git

diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py
index 09d1a16..549c4fc 100644
--- a/o2ims/domain/stx_object.py
+++ b/o2ims/domain/stx_object.py
@@ -1,52 +1,63 @@
-# Copyright (C) 2021 Wind River Systems, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-# from dataclasses import dataclass
-# import datetime
-import json
-
-
-class MismatchedModel(Exception):
-    pass
-
-
-class StxGenericModel:
-    def __init__(self, api_response: dict = None) -> None:
-        if api_response:
-            self.id = api_response.uuid
-            self.content = json.dumps(api_response.to_dict())
-            self.updatetime = api_response.updated_at
-            self.createtime = api_response.created_at
-            self.name = api_response.name
-
-    def is_outdated(self, newmodel) -> bool:
-        return self.updatetime < newmodel.updatetime
-
-    def update_by(self, newmodel) -> None:
-        if self.id != newmodel.id:
-            raise MismatchedModel("Mismatched model")
-        self.name = newmodel.name
-
-        self.content = newmodel.content
-        self.createtime = newmodel.createtime
-        self.updatetime = newmodel.updatetime
-
-
-class StxK8sClusterModel(StxGenericModel):
-    def __init__(self, api_response: dict = None) -> None:
-        super().__init__(api_response=api_response)
-
-    def is_outdated(self, newmodel) -> bool:
-        # never outdated since lack of such evidence
-        return False
+# Copyright (C) 2021 Wind River Systems, Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+# from dataclasses import dataclass
+import datetime
+import json
+from o2common.domain.base import AgRoot
+
+from o2ims.domain.resource_type import ResourceTypeEnum, MismatchedModel
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
+
+
+class StxGenericModel(AgRoot):
+    def __init__(self, type: ResourceTypeEnum,
+                 api_response: dict = None, content_hash=None) -> None:
+        super().__init__()
+        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.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
+
+    def is_outdated(self, newmodel) -> bool:
+        # return self.updatetime < newmodel.updatetime
+        # logger.warning("hash1: " + self.hash + " vs hash2: " + newmodel.hash)
+        return self.hash != newmodel.hash
+
+    def update_by(self, newmodel) -> None:
+        if self.id != newmodel.id:
+            raise MismatchedModel("Mismatched model")
+        self.name = newmodel.name
+        self.createtime = newmodel.createtime
+        self.updatetime = newmodel.updatetime
+        self.content = newmodel.content