Add: flask api include resource type, resource pool, resource and deployment manager

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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 68e304e..e86e45c 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -20,53 +20,82 @@ from .resource_type import ResourceTypeEnum
 # from uuid import UUID\r
 \r
 \r
+class Subscription:\r
+    def __init__(self, id: str, callback: str, consumersubid: list = [],\r
+                 filter: list = []) -> None:\r
+        self.subscriptionId = id\r
+        self.callback = callback\r
+        self.consumerSubscriptionId = consumersubid\r
+        self.filter = filter\r
+\r
+\r
 class DeploymentManager:\r
     def __init__(self, id: str, name: str, ocloudid: str,\r
-                 dmsendpoint: str) -> None:\r
+                 dmsendpoint: str, description: str = '',\r
+                 supportedLocations: str = '', capabilities: str = '',\r
+                 capacity: str = '') -> None:\r
         self.deploymentManagerId = id\r
-        self.name = name\r
         self.oCloudId = ocloudid\r
+        self.name = name\r
+        self.description = description\r
         self.deploymentManagementServiceEndpoint = dmsendpoint\r
+        self.supportedLocations = supportedLocations\r
+        self.capabilities = capabilities\r
+        self.capacity = capacity\r
         self.extensions = []\r
 \r
 \r
 class ResourcePool:\r
     def __init__(self, id: str, name: str, location: str,\r
-                 ocloudid: str) -> None:\r
+                 ocloudid: str, gLocationId: str = '',\r
+                 description: str = '') -> None:\r
         self.resourcePoolId = id\r
+        self.oCloudId = ocloudid\r
+        self.globalLocationId = gLocationId\r
         self.name = name\r
         self.location = location\r
-        self.oCloudId = ocloudid\r
+        self.description = description\r
         self.extensions = []\r
 \r
 \r
 class ResourceType:\r
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,\r
-                 ocloudid: str) -> None:\r
+                 ocloudid: str, vender: str = '', model: str = '',\r
+                 version: str = '',\r
+                 description: str = '') -> None:\r
         self.resourceTypeId = typeid\r
+        self.oCloudId = ocloudid\r
         self.resourceTypeEnum = typeEnum.value\r
         self.name = name\r
-        self.oCloudId = ocloudid\r
+        self.vender = vender\r
+        self.model = model\r
+        self.version = version\r
+        self.description = description\r
         self.extensions = []\r
 \r
 \r
 class Resource:\r
     def __init__(self, resourceId: str, resourceTypeId: str,\r
-                 resourcePoolId: str) -> None:\r
+                 resourcePoolId: str, oCloudId: str = '',\r
+                 parentId: str = '', elements: list = [],\r
+                 description: str = '') -> None:\r
         self.resourceId = resourceId\r
-        self.oCloudId = None  # tbd\r
+        self.oCloudId = oCloudId\r
         self.resourceTypeId = resourceTypeId\r
         self.resourcePoolId = resourcePoolId\r
-        self.parentId = None\r
-        self.elements = []\r
+        self.parentId = parentId\r
+        self.elements = elements\r
+        self.description = description\r
         self.extensions = []\r
 \r
 \r
 class Ocloud:\r
     def __init__(self, ocloudid: str, name: str, imsendpoint: str,\r
+                 globalcloudId: str = '',\r
                  description: str = '', version_number: int = 0) -> None:\r
 \r
         self.oCloudId = ocloudid\r
+        self.globalcloudId = globalcloudId\r
         self.version_number = version_number\r
         self.name = name\r
         self.description = description\r