X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud.py;h=ec41c0e03d52a2f7662b04bab222b1c0be50366c;hb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;hp=0c5d23239ff86a153f0104bf69f4c8cbc56c789f;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 0c5d232..ec41c0e 100644
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from o2ims.domain.base import AgRoot
+from o2common.domain.base import AgRoot
 # from dataclasses import dataclass
 # from datetime import date
 # from typing import Optional, List, Set
@@ -73,8 +73,9 @@ class ResourceType(AgRoot):
                  description: str = '') -> None:
         super().__init__()
         self.resourceTypeId = typeid
+        self.version_number = 0
         self.oCloudId = ocloudid
-        self.resourceTypeEnum = typeEnum.value
+        self.resourceTypeEnum = typeEnum
         self.name = name
         self.vender = vender
         self.model = model
@@ -85,17 +86,16 @@ class ResourceType(AgRoot):
 
 class Resource(AgRoot):
     def __init__(self, resourceId: str, resourceTypeId: str,
-                 resourcePoolId: str, oCloudId: str = '',
-                 parentId: str = '', elements: list = [],
+                 resourcePoolId: str, parentId: str = '',
+                 gAssetId: str = '', elements: str = '',
                  description: str = '') -> None:
         super().__init__()
         self.resourceId = resourceId
         self.version_number = 0
-        self.oCloudId = oCloudId
         self.resourceTypeId = resourceTypeId
         self.resourcePoolId = resourcePoolId
+        self.globalAssetId = gAssetId
         self.parentId = parentId
-        self.path = str()
         self.elements = elements
         self.description = description
         self.extensions = []
@@ -116,7 +116,6 @@ class Ocloud(AgRoot):
         self.deploymentManagers = []
         self.resourceTypes = []
         self.extensions = []
-        # self.events = []
 
     # def addDeploymentManager(self,
     #                          deploymentManager: DeploymentManager):