Add get detail of a resource to API; remove the dependency of the domain in the view...

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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index 0829fb9..e3584ed 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -13,8 +13,9 @@
 #  limitations under the License.\r
 \r
 from __future__ import annotations\r
+import json\r
 \r
-from o2common.domain.base import AgRoot\r
+from o2common.domain.base import AgRoot, Serializer\r
 # from dataclasses import dataclass\r
 # from datetime import date\r
 # from typing import Optional, List, Set\r
@@ -22,7 +23,7 @@ from .resource_type import ResourceTypeEnum
 # from uuid import UUID\r
 \r
 \r
-class Subscription(AgRoot):\r
+class Subscription(AgRoot, Serializer):\r
     def __init__(self, id: str, callback: str, consumersubid: str = '',\r
                  filter: str = '') -> None:\r
         super().__init__()\r
@@ -33,7 +34,7 @@ class Subscription(AgRoot):
         self.filter = filter\r
 \r
 \r
-class DeploymentManager(AgRoot):\r
+class DeploymentManager(AgRoot, Serializer):\r
     def __init__(self, id: str, name: str, ocloudid: str,\r
                  dmsendpoint: str, description: str = '',\r
                  supportedLocations: str = '', capabilities: str = '',\r
@@ -51,7 +52,7 @@ class DeploymentManager(AgRoot):
         self.extensions = []\r
 \r
 \r
-class ResourcePool(AgRoot):\r
+class ResourcePool(AgRoot, Serializer):\r
     def __init__(self, id: str, name: str, location: str,\r
                  ocloudid: str, gLocationId: str = '',\r
                  description: str = '') -> None:\r
@@ -66,15 +67,16 @@ class ResourcePool(AgRoot):
         self.extensions = []\r
 \r
 \r
-class ResourceType(AgRoot):\r
+class ResourceType(AgRoot, Serializer):\r
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,\r
                  ocloudid: str, vender: str = '', model: str = '',\r
                  version: str = '',\r
                  description: str = '') -> None:\r
         super().__init__()\r
         self.resourceTypeId = typeid\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
-        self.resourceTypeEnum = typeEnum.value\r
+        self.resourceTypeEnum = typeEnum\r
         self.name = name\r
         self.vender = vender\r
         self.model = model\r
@@ -83,25 +85,44 @@ class ResourceType(AgRoot):
         self.extensions = []\r
 \r
 \r
-class Resource(AgRoot):\r
+class Resource(AgRoot, Serializer):\r
     def __init__(self, resourceId: str, resourceTypeId: str,\r
-                 resourcePoolId: str, oCloudId: str = '',\r
-                 parentId: str = '', elements: list = [],\r
+                 resourcePoolId: str, name: str, parentId: str = '',\r
+                 gAssetId: str = '', elements: str = '',\r
                  description: str = '') -> None:\r
         super().__init__()\r
         self.resourceId = resourceId\r
         self.version_number = 0\r
-        self.oCloudId = oCloudId\r
         self.resourceTypeId = resourceTypeId\r
         self.resourcePoolId = resourcePoolId\r
+        self.name = name\r
+        self.globalAssetId = gAssetId\r
         self.parentId = parentId\r
-        self.path = str()\r
         self.elements = elements\r
         self.description = description\r
+        self.children = []\r
         self.extensions = []\r
 \r
+    def set_children(self, children: list):\r
+        self.children = children\r
+\r
+    def serialize(self):\r
+        d = Serializer.serialize(self)\r
+\r
+        if 'elements' in d and d['elements'] != '':\r
+            d['elements'] = json.loads(d['elements'])\r
+\r
+        if not hasattr(self, 'children') or len(self.children) == 0:\r
+            return d\r
+        else:\r
+            d['children'] = []\r
+\r
+        for child in self.children:\r
+            d['children'].append(child.serialize())\r
+        return d\r
+\r
 \r
-class Ocloud(AgRoot):\r
+class Ocloud(AgRoot, Serializer):\r
     def __init__(self, ocloudid: str, name: str, imsendpoint: str,\r
                  globalcloudId: str = '',\r
                  description: str = '', version_number: int = 0) -> None:\r
@@ -116,7 +137,6 @@ class Ocloud(AgRoot):
         self.deploymentManagers = []\r
         self.resourceTypes = []\r
         self.extensions = []\r
-        # self.events = []\r
 \r
     # def addDeploymentManager(self,\r
     #                          deploymentManager: DeploymentManager):\r