Add subscription and notification for resource changes; fix a bug while pserver node...

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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index e86e45c..1323134 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -13,6 +13,9 @@
 #  limitations under the License.\r
 \r
 from __future__ import annotations\r
+import json\r
+\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
@@ -20,21 +23,14 @@ 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
+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
                  capacity: str = '') -> None:\r
+        super().__init__()\r
         self.deploymentManagerId = id\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
         self.name = name\r
         self.description = description\r
@@ -45,11 +41,13 @@ class DeploymentManager:
         self.extensions = []\r
 \r
 \r
-class ResourcePool:\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
+        super().__init__()\r
         self.resourcePoolId = id\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
         self.globalLocationId = gLocationId\r
         self.name = name\r
@@ -58,14 +56,16 @@ class ResourcePool:
         self.extensions = []\r
 \r
 \r
-class ResourceType:\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
@@ -74,26 +74,48 @@ class ResourceType:
         self.extensions = []\r
 \r
 \r
-class Resource:\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.oCloudId = oCloudId\r
+        self.version_number = 0\r
         self.resourceTypeId = resourceTypeId\r
         self.resourcePoolId = resourcePoolId\r
+        self.name = name\r
+        self.globalAssetId = gAssetId\r
         self.parentId = parentId\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
-class Ocloud:\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, Serializer):\r
     def __init__(self, ocloudid: str, name: str, imsendpoint: str,\r
                  globalcloudId: str = '',\r
                  description: str = '', version_number: int = 0) -> None:\r
-\r
+        super().__init__()\r
         self.oCloudId = ocloudid\r
         self.globalcloudId = globalcloudId\r
         self.version_number = version_number\r
@@ -104,16 +126,15 @@ class Ocloud:
         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
+\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