X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud.py;h=a2047afe35a69d9606d2d7dfd7394f6fae0b49bf;hb=4f9eafd85b51688708f6bf24e9334c532a331d8f;hp=ce55aee472beb6c8ed91eb5dd3ed9d97e7bca440;hpb=9ee90ffa2414326c26fd10edc59bf315204254e2;p=pti%2Fo2.git

diff --git a/o2ims/domain/ocloud.py b/o2ims/domain/ocloud.py
index ce55aee..a2047af 100644
--- a/o2ims/domain/ocloud.py
+++ b/o2ims/domain/ocloud.py
@@ -16,10 +16,11 @@ from __future__ import annotations
 import json
 
 from o2common.domain.base import AgRoot, Serializer
+from o2common.config import conf as CONF
 # from dataclasses import dataclass
 # from datetime import date
 # from typing import Optional, List, Set
-from .resource_type import ResourceTypeEnum
+from .resource_type import ResourceKindEnum, ResourceTypeEnum
 # from uuid import UUID
 
 
@@ -35,19 +36,19 @@ class DeploymentManager(AgRoot, Serializer):
                  capacity: str = '', profile: str = '') -> None:
         super().__init__()
         self.deploymentManagerId = id
-        self.version_number = 0
-        self.oCloudId = ocloudid
         self.name = name
         self.description = description
-        self.deploymentManagementServiceEndpoint = dmsendpoint
+        self.oCloudId = ocloudid
+        self.serviceUri = dmsendpoint
         self.supportedLocations = supportedLocations
         self.capabilities = capabilities
         self.capacity = capacity
         self.profile = profile
         self.extensions = []
 
+        self.version_number = 0
+
     def serialize(self):
-        print(self.__dict__)
         d = Serializer.serialize(self)
 
         if 'profile' in d and d['profile'] != '':
@@ -67,32 +68,44 @@ class ResourcePool(AgRoot, Serializer):
                  description: str = '') -> None:
         super().__init__()
         self.resourcePoolId = id
-        self.version_number = 0
-        self.oCloudId = ocloudid
         self.globalLocationId = gLocationId
         self.name = name
-        self.location = location
         self.description = description
+        self.oCloudId = ocloudid
+        self.location = location
+        self.resources = ''
         self.extensions = []
 
+        self.version_number = 0
+
 
 class ResourceType(AgRoot, Serializer):
     def __init__(self, typeid: str, name: str, typeEnum: ResourceTypeEnum,
-                 ocloudid: str, vender: str = '', model: str = '',
+                 ocloudid: str, vendor: str = '', model: str = '',
                  version: str = '',
                  description: str = '') -> None:
         super().__init__()
         self.resourceTypeId = typeid
-        self.version_number = 0
-        self.oCloudId = ocloudid
         self.resourceTypeEnum = typeEnum
         self.name = name
-        self.vender = vender
+        self.description = description
+        self.vendor = vendor
         self.model = model
         self.version = version
-        self.description = description
+        self.alarmDictionary = {}
+        self.resourceKind = ResourceKindEnum.UNDEFINED
+        self.resourceClass = ResourceTypeEnum.UNDEFINED
         self.extensions = []
 
+        self.version_number = 0
+
+    def serialize(self):
+        d = Serializer.serialize(self)
+
+        d["alarmDictionary"] = CONF.alarm_dictionaries.get(
+            d['name']).serialize()
+        return d
+
 
 class Resource(AgRoot, Serializer):
     def __init__(self, resourceId: str, resourceTypeId: str,
@@ -101,16 +114,18 @@ class Resource(AgRoot, Serializer):
                  description: str = '') -> None:
         super().__init__()
         self.resourceId = resourceId
-        self.version_number = 0
+        self.description = description
         self.resourceTypeId = resourceTypeId
+        self.globalAssetId = gAssetId
         self.resourcePoolId = resourcePoolId
+        self.elements = elements
+        self.extensions = []
+
         self.name = name
-        self.globalAssetId = gAssetId
         self.parentId = parentId
-        self.elements = elements
-        self.description = description
         self.children = []
-        self.extensions = []
+
+        self.version_number = 0
 
     def set_children(self, children: list):
         self.children = children
@@ -140,16 +155,18 @@ class Ocloud(AgRoot, Serializer):
                  description: str = '', version_number: int = 0) -> None:
         super().__init__()
         self.oCloudId = ocloudid
-        self.globalcloudId = globalcloudId
-        self.version_number = version_number
+        self.globalCloudId = globalcloudId
         self.name = name
         self.description = description
         self.serviceUri = imsendpoint
+        self.resourceTypes = []
         self.resourcePools = []
         self.deploymentManagers = []
-        self.resourceTypes = []
+        self.smoRegistrationService = ''
         self.extensions = []
 
+        self.version_number = version_number
+
     # def addDeploymentManager(self,
     #                          deploymentManager: DeploymentManager):