Add tox

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

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