X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Fstx_object.py;h=5e4d660bc3ee7e4140b7311e64ef181a739c2f6c;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=09d1a16cc0017b999ba632e6b14bc996a4f3c788;hpb=965d6c3640ec7e735f0c17985c583952962fbbba;p=pti%2Fo2.git

diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py
index 09d1a16..5e4d660 100644
--- a/o2ims/domain/stx_object.py
+++ b/o2ims/domain/stx_object.py
@@ -13,40 +13,41 @@
 #  limitations under the License.
 
 # from dataclasses import dataclass
-# import datetime
+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 MismatchedModel(Exception):
-    pass
 
-
-class StxGenericModel:
-    def __init__(self, api_response: dict = None) -> None:
+class StxGenericModel(AgRoot):
+    def __init__(self, type: ResourceTypeEnum,
+                 api_response: dict = None, content_hash=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.id = str(api_response.uuid)
+            self.type = type
+            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())
 
     def is_outdated(self, newmodel) -> bool:
-        return self.updatetime < newmodel.updatetime
+        # 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.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
+        self.content = newmodel.content