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

diff --git a/src/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
similarity index 68%
rename from src/o2ims/domain/ocloud.py
rename to o2ims/domain/ocloud.py
index ddd2646..68e304e 100644
--- a/src/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -13,39 +13,16 @@
 #  limitations under the License.
 
 from __future__ import annotations
-from dataclasses import dataclass
-from datetime import date
-from typing import Optional, List, Set
+# from dataclasses import dataclass
+# from datetime import date
+# from typing import Optional, List, Set
 from .resource_type import ResourceTypeEnum
 # from uuid import UUID
 
-class Ocloud:
-    def __init__(
-        self, ocloudid: str, name: str, imsendpoint: str,
-        description: str = '', version_number: int = 0) -> None:
-
-        self.oCloudId = ocloudid
-        self.version_number = version_number
-        self.name = name
-        self.description = description
-        self.infrastructureManagementServiceEndpoint = imsendpoint
-        self.resourcePools = []
-        self.deploymentManagers = []
-        self.resourceTypes = []
-        self.extensions = []
-        self.events = []
-    
-    def addDeploymentManager(self, deploymentManager: DeploymentManager) -> None:
-        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)
 
 class DeploymentManager:
-    def __init__(self, id: str, name: str, ocloudid: str, dmsendpoint: str) -> None:
+    def __init__(self, id: str, name: str, ocloudid: str,
+                 dmsendpoint: str) -> None:
         self.deploymentManagerId = id
         self.name = name
         self.oCloudId = ocloudid
@@ -54,7 +31,8 @@ class DeploymentManager:
 
 
 class ResourcePool:
-    def __init__(self, id: str, name: str, location: str, ocloudid: str) -> None:
+    def __init__(self, id: str, name: str, location: str,
+                 ocloudid: str) -> None:
         self.resourcePoolId = id
         self.name = name
         self.location = location
@@ -63,7 +41,8 @@ class ResourcePool:
 
 
 class ResourceType:
-    def __init__(self, typeid: str, name:str, typeEnum: ResourceTypeEnum, ocloudid: str) -> None:
+    def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,
+                 ocloudid: str) -> None:
         self.resourceTypeId = typeid
         self.resourceTypeEnum = typeEnum.value
         self.name = name
@@ -72,12 +51,40 @@ class ResourceType:
 
 
 class Resource:
-    def __init__(self, resourceId:str, resourceTypeId: str, resourcePoolId: str) -> None:
+    def __init__(self, resourceId: str, resourceTypeId: str,
+                 resourcePoolId: str) -> None:
         self.resourceId = resourceId
-        self.oCloudId = None # tbd
+        self.oCloudId = None  # tbd
         self.resourceTypeId = resourceTypeId
         self.resourcePoolId = resourcePoolId
         self.parentId = None
         self.elements = []
         self.extensions = []
 
+
+class Ocloud:
+    def __init__(self, ocloudid: str, name: str, imsendpoint: str,
+                 description: str = '', version_number: int = 0) -> None:
+
+        self.oCloudId = ocloudid
+        self.version_number = version_number
+        self.name = name
+        self.description = description
+        self.infrastructureManagementServiceEndpoint = imsendpoint
+        self.resourcePools = []
+        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)