X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_handler.py;h=1ab1189ea9691eb0cd2811094ba026a524579712;hb=60034d77380cf7d11ca28d292df3f93a601d1568;hp=4d9da9c4b8aa050eafc6ab0fb869c07a54ecd8d3;hpb=c34ab47848138150a1456be2fa9f82d7260e37b8;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py
index 4d9da9c..1ab1189 100644
--- a/o2ims/service/auditor/pserver_handler.py
+++ b/o2ims/service/auditor/pserver_handler.py
@@ -15,7 +15,7 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
+import json
 from typing import Callable
 
 from o2ims.domain import commands, events
@@ -40,13 +40,13 @@ def update_pserver(
 ):
     stxobj = cmd.data
     with uow:
-        resourcepool = uow.resource_pools.get(cmd.parentid)
+        # resourcepool = uow.resource_pools.get(cmd.parentid)
 
         # res = uow.session.execute(select(resourcetype).where(
         #     resourcetype.c.resourceTypeEnum == stxobj.type))
         res = uow.session.execute(
             '''
-            SELECT "resourceTypeId", "oCloudId", "name"
+            SELECT "resourceTypeId", "name"
             FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
@@ -57,11 +57,17 @@ def update_pserver(
             res_type_name = 'pserver'
             resourcetype_id = str(uuid.uuid3(
                 uuid.NAMESPACE_URL, res_type_name))
-            uow.resource_types.add(ResourceType(
+            res_type = ResourceType(
                 resourcetype_id,
                 res_type_name, stxobj.type,
-                resourcepool.oCloudId,
-                description='The Physical Server resource type'))
+                description='The Physical Server resource type')
+            dict_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL,
+                str(f"{res_type_name}_alarmdictionary")))
+            alarm_dictionary = uow.alarm_dictionaries.get(dict_id)
+            if alarm_dictionary:
+                res_type.alarmDictionary = alarm_dictionary
+            uow.resource_types.add(res_type)
         else:
             resourcetype_id = first['resourceTypeId']
 
@@ -102,10 +108,22 @@ def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \
     resourcepool_id = parentid
     parent_id = None  # the root of the resource has no parent id
     gAssetId = ''  # TODO: global ID
-    description = "%s : A physical server resource" % stxobj.name
+    # description = "%s : A physical server resource" % stxobj.name
+    content = json.loads(stxobj.content)
+    selected_keys = [
+        "hostname", "personality", "id", "mgmt_ip", "mgmt_mac",
+        "software_load", "capabilities",
+        "operational", "availability", "administrative",
+        "boot_device", "rootfs_device", "install_state", "subfunctions",
+        "clock_synchronization", "max_cpu_mhz_allowed"
+        ]
+    filtered = dict(
+        filter(lambda item: item[0] in selected_keys, content.items()))
+    extensions = json.dumps(filtered)
+    description = ";".join([f"{k}:{v}" for k, v in filtered.items()])
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
-                        stxobj.name, parent_id, gAssetId, stxobj.content,
-                        description)
+                        parent_id, gAssetId, stxobj.content, description,
+                        extensions)
     resource.createtime = stxobj.createtime
     resource.updatetime = stxobj.updatetime
     resource.hash = stxobj.hash