X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud.py;h=ce46e96a53b1f2702149e4f9f0471a3dbf62a07a;hb=1afd31661caed07e670d4371d1ac34caa7eb2539;hp=b7c82b58a0accef37d5cb1ffd71b2efa160e23b8;hpb=16dc48fcc6dccc076a68186cfc81ec3f7a2aaafb;p=pti%2Fo2.git

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index b7c82b5..ce46e96 100644
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -15,12 +15,14 @@
 from __future__ import annotations
 import json
 
-from o2common.domain.base import AgRoot, Serializer
-from o2common.config import config, conf as CONF
+from o2common.config import config
+from o2common.domain.base import AgRoot, Serializer, \
+    InfrastructureInventoryObject
 # from dataclasses import dataclass
 # from datetime import date
 # from typing import Optional, List, Set
 from .resource_type import ResourceKindEnum, ResourceTypeEnum
+from .alarm_obj import AlarmDictionary
 
 
 DeploymentManagerProfileDefault = 'native_k8sapi'
@@ -28,7 +30,7 @@ DeploymentManagerProfileSOL018 = 'sol018'
 DeploymentManagerProfileSOL018HelmCLI = 'sol018_helmcli'
 
 
-class DeploymentManager(AgRoot, Serializer):
+class DeploymentManager(InfrastructureInventoryObject, AgRoot, Serializer):
     def __init__(self, id: str, name: str, ocloudid: str,
                  dmsendpoint: str, description: str = '',
                  supportedLocations: str = '', capabilities: str = '',
@@ -62,10 +64,17 @@ class DeploymentManager(AgRoot, Serializer):
             elif profile == DeploymentManagerProfileSOL018HelmCLI:
                 d['profileSupportList'].append(profile)
 
+        if 'capabilities' in d and d['capabilities'] != '':
+            d['capabilities'] = json.loads(d['capabilities'])
         return d
 
+    def get_notification_dict(self):
+        return self.get_fields_as_dict(
+            ['deploymentManagerId', 'name', 'oCloudId', 'serviceUri',
+             'description'])
 
-class ResourcePool(AgRoot, Serializer):
+
+class ResourcePool(InfrastructureInventoryObject, AgRoot, Serializer):
     def __init__(self, id: str, name: str, location: str,
                  ocloudid: str, gLocationId: str = '',
                  description: str = '') -> None:
@@ -81,10 +90,15 @@ class ResourcePool(AgRoot, Serializer):
 
         self.version_number = 0
 
+    def get_notification_dict(self):
+        return self.get_fields_as_dict(
+            ['resourcePoolId', 'oCloudId', 'globalLocationId', 'name',
+             'description'])
+
 
-class ResourceType(AgRoot, Serializer):
+class ResourceType(InfrastructureInventoryObject, AgRoot, Serializer):
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,
-                 ocloudid: str, vendor: str = '', model: str = '',
+                 vendor: str = '', model: str = '',
                  version: str = '',
                  description: str = '') -> None:
         super().__init__()
@@ -95,7 +109,7 @@ class ResourceType(AgRoot, Serializer):
         self.vendor = vendor
         self.model = model
         self.version = version
-        self.alarmDictionary = {}
+        self.alarmDictionary = None
         self.resourceKind = ResourceKindEnum.UNDEFINED
         self.resourceClass = ResourceTypeEnum.UNDEFINED
         self.extensions = []
@@ -104,17 +118,20 @@ class ResourceType(AgRoot, Serializer):
 
     def serialize(self):
         d = Serializer.serialize(self)
-
-        if CONF.alarm_dictionaries.get(d['name']) is not None:
-            d["alarmDictionary"] = CONF.alarm_dictionaries.get(
-                d['name']).serialize()
-
+        if 'alarmDictionary' in d and \
+                type(d['alarmDictionary']) is AlarmDictionary:
+            d['alarmDictionary'] = d['alarmDictionary'].serialize()
         return d
 
+    def get_notification_dict(self):
+        return self.get_fields_as_dict(
+            ['resourceTypeId', 'name', 'description', 'vendor', 'model',
+             'version'])
 
-class Resource(AgRoot, Serializer):
+
+class Resource(InfrastructureInventoryObject, AgRoot, Serializer):
     def __init__(self, resourceId: str, resourceTypeId: str,
-                 resourcePoolId: str, name: str, parentId: str = '',
+                 resourcePoolId: str, parentId: str = '',
                  gAssetId: str = '', elements: str = '',
                  description: str = '', extensions: str = '') -> None:
         super().__init__()
@@ -126,7 +143,6 @@ class Resource(AgRoot, Serializer):
         self.elements = elements
         self.extensions = extensions
 
-        self.name = name
         self.parentId = parentId
         self.children = []
 
@@ -153,8 +169,13 @@ class Resource(AgRoot, Serializer):
             d['children'].append(child.serialize())
         return d
 
+    def get_notification_dict(self):
+        return self.get_fields_as_dict(
+            ['resourceId', 'resourceTypeId', 'resourcePoolId', 'globalAssetId',
+             'description'])
+
 
-class Ocloud(AgRoot, Serializer):
+class Ocloud(InfrastructureInventoryObject, AgRoot, Serializer):
     def __init__(self, ocloudid: str, name: str, imsendpoint: str,
                  globalcloudId: str = '',
                  description: str = '', version_number: int = 0) -> None:
@@ -172,6 +193,10 @@ class Ocloud(AgRoot, Serializer):
 
         self.version_number = version_number
 
+    def get_notification_dict(self):
+        return self.get_fields_as_dict(
+            ['oCloudId', 'globalcloudId', 'globalCloudId', 'name',
+             'description', 'serviceUri'])
     # def addDeploymentManager(self,
     #                          deploymentManager: DeploymentManager):