Add auditor for resource pool, pserver and cpu/memory/port/interface for pserver...

[pti/o2.git] / o2ims / domain / ocloud.py

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 0829fb9..ec41c0e 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -73,8 +73,9 @@ class ResourceType(AgRoot):
                  description: str = '') -> None:\r
         super().__init__()\r
         self.resourceTypeId = typeid\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
-        self.resourceTypeEnum = typeEnum.value\r
+        self.resourceTypeEnum = typeEnum\r
         self.name = name\r
         self.vender = vender\r
         self.model = model\r
@@ -85,17 +86,16 @@ class ResourceType(AgRoot):
 \r
 class Resource(AgRoot):\r
     def __init__(self, resourceId: str, resourceTypeId: str,\r
-                 resourcePoolId: str, oCloudId: str = '',\r
-                 parentId: str = '', elements: list = [],\r
+                 resourcePoolId: str, parentId: str = '',\r
+                 gAssetId: str = '', elements: str = '',\r
                  description: str = '') -> None:\r
         super().__init__()\r
         self.resourceId = resourceId\r
         self.version_number = 0\r
-        self.oCloudId = oCloudId\r
         self.resourceTypeId = resourceTypeId\r
         self.resourcePoolId = resourcePoolId\r
+        self.globalAssetId = gAssetId\r
         self.parentId = parentId\r
-        self.path = str()\r
         self.elements = elements\r
         self.description = description\r
         self.extensions = []\r
@@ -116,7 +116,6 @@ class Ocloud(AgRoot):
         self.deploymentManagers = []\r
         self.resourceTypes = []\r
         self.extensions = []\r
-        # self.events = []\r
 \r
     # def addDeploymentManager(self,\r
     #                          deploymentManager: DeploymentManager):\r