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=ee4f718421d77acb53777239e7625eec84782aa9;hpb=f10107e78b324fc607fe06486764588f38fc220d;p=pti%2Fo2.git

diff --git a/o2ims/domain/stx_object.py b/o2ims/domain/stx_object.py
index ee4f718..5e4d660 100644
--- a/o2ims/domain/stx_object.py
+++ b/o2ims/domain/stx_object.py
@@ -15,22 +15,39 @@
 # 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:
-    def __init__(self, api_response: dict) -> None:
-        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 __init__(self, id: str, name: str,
-    #              lastupdate: datetime, content: str) -> None:
-    #     self.id = id
-    #     self.name = name
-    #     self.lastupdate = lastupdate
-    #     self.content = content
+class StxGenericModel(AgRoot):
+    def __init__(self, type: ResourceTypeEnum,
+                 api_response: dict = None, content_hash=None) -> None:
+        if api_response:
+            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 isChanged(self, updatetime: datetime) -> bool:
-        return True if self.updatetime > updatetime else False
+    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