Refactor watchers

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

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index e86e45c..847ce4c 100644 (file)
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -13,6 +13,8 @@
 #  limitations under the License.\r
 \r
 from __future__ import annotations\r
+\r
+from o2ims.domain.base import AgRoot\r
 # from dataclasses import dataclass\r
 # from datetime import date\r
 # from typing import Optional, List, Set\r
@@ -20,10 +22,11 @@ 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
+class Subscription(AgRoot):\r
+    def __init__(self, id: str, callback: str, consumersubid: str = '',\r
+                 filter: str = '') -> None:\r
         self.subscriptionId = id\r
+        self.version_number = 0\r
         self.callback = callback\r
         self.consumerSubscriptionId = consumersubid\r
         self.filter = filter\r
@@ -35,6 +38,7 @@ class DeploymentManager:
                  supportedLocations: str = '', capabilities: str = '',\r
                  capacity: str = '') -> None:\r
         self.deploymentManagerId = id\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
         self.name = name\r
         self.description = description\r
@@ -45,11 +49,12 @@ class DeploymentManager:
         self.extensions = []\r
 \r
 \r
-class ResourcePool:\r
+class ResourcePool(AgRoot):\r
     def __init__(self, id: str, name: str, location: str,\r
                  ocloudid: str, gLocationId: str = '',\r
                  description: str = '') -> None:\r
         self.resourcePoolId = id\r
+        self.version_number = 0\r
         self.oCloudId = ocloudid\r
         self.globalLocationId = gLocationId\r
         self.name = name\r
@@ -58,7 +63,7 @@ class ResourcePool:
         self.extensions = []\r
 \r
 \r
-class ResourceType:\r
+class ResourceType(AgRoot):\r
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,\r
                  ocloudid: str, vender: str = '', model: str = '',\r
                  version: str = '',\r
@@ -74,12 +79,13 @@ class ResourceType:
         self.extensions = []\r
 \r
 \r
-class Resource:\r
+class Resource(AgRoot):\r
     def __init__(self, resourceId: str, resourceTypeId: str,\r
                  resourcePoolId: str, oCloudId: str = '',\r
                  parentId: str = '', elements: list = [],\r
                  description: str = '') -> None:\r
         self.resourceId = resourceId\r
+        self.version_number = 0\r
         self.oCloudId = oCloudId\r
         self.resourceTypeId = resourceTypeId\r
         self.resourcePoolId = resourcePoolId\r
@@ -89,11 +95,11 @@ class Resource:
         self.extensions = []\r
 \r
 \r
-class Ocloud:\r
+class Ocloud(AgRoot):\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,7 +110,7 @@ class Ocloud:
         self.deploymentManagers = []\r
         self.resourceTypes = []\r
         self.extensions = []\r
-        self.events = []\r
+        # self.events = []\r
 \r
     def addDeploymentManager(self,\r
                              deploymentManager: DeploymentManager):\r