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 847ce4c..ec41c0e 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -14,7 +14,7 @@
 \r
 from __future__ import annotations\r
 \r
-from o2ims.domain.base import AgRoot\r
+from o2common.domain.base import AgRoot\r
 # from dataclasses import dataclass\r
 # from datetime import date\r
 # from typing import Optional, List, Set\r
@@ -25,6 +25,7 @@ from .resource_type import ResourceTypeEnum
 class Subscription(AgRoot):\r
     def __init__(self, id: str, callback: str, consumersubid: str = '',\r
                  filter: str = '') -> None:\r
+        super().__init__()\r
         self.subscriptionId = id\r
         self.version_number = 0\r
         self.callback = callback\r
@@ -32,11 +33,12 @@ class Subscription(AgRoot):
         self.filter = filter\r
 \r
 \r
-class DeploymentManager:\r
+class DeploymentManager(AgRoot):\r
     def __init__(self, id: str, name: str, ocloudid: str,\r
                  dmsendpoint: str, description: str = '',\r
                  supportedLocations: str = '', capabilities: str = '',\r
                  capacity: str = '') -> None:\r
+        super().__init__()\r
         self.deploymentManagerId = id\r
         self.version_number = 0\r
         self.oCloudId = ocloudid\r
@@ -53,6 +55,7 @@ class ResourcePool(AgRoot):
     def __init__(self, id: str, name: str, location: str,\r
                  ocloudid: str, gLocationId: str = '',\r
                  description: str = '') -> None:\r
+        super().__init__()\r
         self.resourcePoolId = id\r
         self.version_number = 0\r
         self.oCloudId = ocloudid\r
@@ -68,9 +71,11 @@ class ResourceType(AgRoot):
                  ocloudid: str, vender: str = '', model: str = '',\r
                  version: str = '',\r
                  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
@@ -81,14 +86,15 @@ 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.elements = elements\r
         self.description = description\r
@@ -110,16 +116,15 @@ class Ocloud(AgRoot):
         self.deploymentManagers = []\r
         self.resourceTypes = []\r
         self.extensions = []\r
-        # self.events = []\r
-\r
-    def addDeploymentManager(self,\r
-                             deploymentManager: DeploymentManager):\r
-\r
-        deploymentManager.oCloudId = self.oCloudId\r
-        old = filter(\r
-            lambda x: x.deploymentManagerId ==\r
-            deploymentManager.deploymentManagerId,\r
-            self.deploymentManagers)\r
-        for o in old or []:\r
-            self.deploymentManagers.remove(o)\r
-        self.deploymentManagers.append(deploymentManager)\r
+\r
+    # def addDeploymentManager(self,\r
+    #                          deploymentManager: DeploymentManager):\r
+\r
+    #     deploymentManager.oCloudId = self.oCloudId\r
+    #     old = filter(\r
+    #         lambda x: x.deploymentManagerId ==\r
+    #         deploymentManager.deploymentManagerId,\r
+    #         self.deploymentManagers)\r
+    #     for o in old or []:\r
+    #         self.deploymentManagers.remove(o)\r
+    #     self.deploymentManagers.append(deploymentManager)\r