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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 68e304e..ec41c0e 100644
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -13,6 +13,8 @@
 #  limitations under the License.
 
 from __future__ import annotations
+
+from o2common.domain.base import AgRoot
 # from dataclasses import dataclass
 # from datetime import date
 # from typing import Optional, List, Set
@@ -20,53 +22,92 @@ from .resource_type import ResourceTypeEnum
 # from uuid import UUID
 
 
-class DeploymentManager:
+class Subscription(AgRoot):
+    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(AgRoot):
     def __init__(self, id: str, name: str, ocloudid: str,
-                 dmsendpoint: str) -> None:
+                 dmsendpoint: str, description: str = '',
+                 supportedLocations: str = '', capabilities: str = '',
+                 capacity: str = '') -> None:
+        super().__init__()
         self.deploymentManagerId = id
-        self.name = name
+        self.version_number = 0
         self.oCloudId = ocloudid
+        self.name = name
+        self.description = description
         self.deploymentManagementServiceEndpoint = dmsendpoint
+        self.supportedLocations = supportedLocations
+        self.capabilities = capabilities
+        self.capacity = capacity
         self.extensions = []
 
 
-class ResourcePool:
+class ResourcePool(AgRoot):
     def __init__(self, id: str, name: str, location: str,
-                 ocloudid: str) -> None:
+                 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
         self.location = location
-        self.oCloudId = ocloudid
+        self.description = description
         self.extensions = []
 
 
-class ResourceType:
+class ResourceType(AgRoot):
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,
-                 ocloudid: str) -> None:
+                 ocloudid: str, vender: str = '', model: str = '',
+                 version: str = '',
+                 description: str = '') -> None:
+        super().__init__()
         self.resourceTypeId = typeid
-        self.resourceTypeEnum = typeEnum.value
-        self.name = name
+        self.version_number = 0
         self.oCloudId = ocloudid
+        self.resourceTypeEnum = typeEnum
+        self.name = name
+        self.vender = vender
+        self.model = model
+        self.version = version
+        self.description = description
         self.extensions = []
 
 
-class Resource:
+class Resource(AgRoot):
     def __init__(self, resourceId: str, resourceTypeId: str,
-                 resourcePoolId: str) -> None:
+                 resourcePoolId: str, parentId: str = '',
+                 gAssetId: str = '', elements: str = '',
+                 description: str = '') -> None:
+        super().__init__()
         self.resourceId = resourceId
-        self.oCloudId = None  # tbd
+        self.version_number = 0
         self.resourceTypeId = resourceTypeId
         self.resourcePoolId = resourcePoolId
-        self.parentId = None
-        self.elements = []
+        self.globalAssetId = gAssetId
+        self.parentId = parentId
+        self.elements = elements
+        self.description = description
         self.extensions = []
 
 
-class Ocloud:
+class Ocloud(AgRoot):
     def __init__(self, ocloudid: str, name: str, imsendpoint: str,
+                 globalcloudId: str = '',
                  description: str = '', version_number: int = 0) -> None:
-
+        super().__init__()
         self.oCloudId = ocloudid
+        self.globalcloudId = globalcloudId
         self.version_number = version_number
         self.name = name
         self.description = description
@@ -75,16 +116,15 @@ class Ocloud:
         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)