Update model of resourcetype and set empty for the gLocationId of the resourcepool...

[pti/o2.git] / o2ims / service / auditor / resourcepool_handler.py

diff --git a/o2ims/service/auditor/resourcepool_handler.py b/o2ims/service/auditor/resourcepool_handler.py
index b5b0e0d..1fb2458 100644 (file)
--- a/o2ims/service/auditor/resourcepool_handler.py
+++ b/o2ims/service/auditor/resourcepool_handler.py
@@ -75,11 +75,12 @@ def is_outdated(resourcepool: ResourcePool, stxobj: StxGenericModel):
 
 def create_by(stxobj: StxGenericModel, parentid: str) -> ResourcePool:
     content = json.loads(stxobj.content)
-    globalcloudId = stxobj.id  # to be updated
+    globalLocationId = ''  # to be updated
     description = "A Resource Pool"
+    location = content['location'] if content['location'] is not None else ''
     resourcepool = ResourcePool(stxobj.id, stxobj.name,
-                                content['location'],
-                                parentid, globalcloudId, description)
+                                location,
+                                parentid, globalLocationId, description)
     resourcepool.createtime = stxobj.createtime
     resourcepool.updatetime = stxobj.updatetime
     resourcepool.hash = stxobj.hash
@@ -93,7 +94,8 @@ def update_by(target: ResourcePool, stxobj: StxGenericModel,
         raise MismatchedModel("Mismatched Id")
     content = json.loads(stxobj.content)
     target.name = stxobj.name
-    target.location = content['location']
+    target.location = content['location'] if content['location'] is not None \
+        else ''
     target.createtime = stxobj.createtime
     target.updatetime = stxobj.updatetime
     target.hash = stxobj.hash