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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 7ed2c1e..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
@@ -23,20 +23,24 @@ from .resource_type import ResourceTypeEnum
 
 
 class Subscription(AgRoot):
-    def __init__(self, id: str, callback: str, consumersubid: list = [],
-                 filter: list = []) -> None:
+    def __init__(self, id: str, callback: str, consumersubid: str = '',
+                 filter: str = '') -> None:
+        super().__init__()
         self.subscriptionId = id
+        self.version_number = 0
         self.callback = callback
         self.consumerSubscriptionId = consumersubid
         self.filter = filter
 
 
-class DeploymentManager:
+class DeploymentManager(AgRoot):
     def __init__(self, id: str, name: str, ocloudid: str,
                  dmsendpoint: str, description: str = '',
                  supportedLocations: str = '', capabilities: str = '',
                  capacity: str = '') -> None:
+        super().__init__()
         self.deploymentManagerId = id
+        self.version_number = 0
         self.oCloudId = ocloudid
         self.name = name
         self.description = description
@@ -51,7 +55,9 @@ class ResourcePool(AgRoot):
     def __init__(self, id: str, name: str, location: str,
                  ocloudid: str, gLocationId: str = '',
                  description: str = '') -> None:
+        super().__init__()
         self.resourcePoolId = id
+        self.version_number = 0
         self.oCloudId = ocloudid
         self.globalLocationId = gLocationId
         self.name = name
@@ -65,9 +71,11 @@ class ResourceType(AgRoot):
                  ocloudid: str, vender: str = '', model: str = '',
                  version: str = '',
                  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
@@ -78,13 +86,15 @@ 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.oCloudId = oCloudId
+        self.version_number = 0
         self.resourceTypeId = resourceTypeId
         self.resourcePoolId = resourcePoolId
+        self.globalAssetId = gAssetId
         self.parentId = parentId
         self.elements = elements
         self.description = description
@@ -106,16 +116,15 @@ class Ocloud(AgRoot):
         self.deploymentManagers = []
         self.resourceTypes = []
         self.extensions = []
-        # self.events = []
-
-    def addDeploymentManager(self,
-                             deploymentManager: DeploymentManager):
-
-        deploymentManager.oCloudId = self.oCloudId
-        old = filter(
-            lambda x: x.deploymentManagerId ==
-            deploymentManager.deploymentManagerId,
-            self.deploymentManagers)
-        for o in old or []:
-            self.deploymentManagers.remove(o)
-        self.deploymentManagers.append(deploymentManager)
+
+    # def addDeploymentManager(self,
+    #                          deploymentManager: DeploymentManager):
+
+    #     deploymentManager.oCloudId = self.oCloudId
+    #     old = filter(
+    #         lambda x: x.deploymentManagerId ==
+    #         deploymentManager.deploymentManagerId,
+    #         self.deploymentManagers)
+    #     for o in old or []:
+    #         self.deploymentManagers.remove(o)
+    #     self.deploymentManagers.append(deploymentManager)