X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_port_handler.py;h=045b8f5b4b04f2f50684ba4d57ed42dd3b2923df;hb=refs%2Fchanges%2F16%2F9716%2F1;hp=bfb2e1dae250c9edf8783db71d22ed0e80b8a1d6;hpb=b37a7d8e36bd9fdf862cb1aad29f9a29052e725f;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_port_handler.py b/o2ims/service/auditor/pserver_port_handler.py
index bfb2e1d..045b8f5 100644
--- a/o2ims/service/auditor/pserver_port_handler.py
+++ b/o2ims/service/auditor/pserver_port_handler.py
@@ -39,23 +39,32 @@ def update_pserver_port(
     stxobj = cmd.data
     with uow:
         p_resource = uow.resources.get(cmd.parentid)
-        resourcepool = uow.resource_pools.get(p_resource.resourcePoolId)
+        # resourcepool = uow.resource_pools.get(p_resource.resourcePoolId)
 
         res = uow.session.execute(
             '''
-            SELECT "resourceTypeId", "oCloudId", "name"
-            FROM resourcetype
+            SELECT "resourceTypeId", "name"
+            FROM "resourceType"
             WHERE "resourceTypeEnum" = :resource_type_enum
             ''',
             dict(resource_type_enum=stxobj.type.name)
         )
         first = res.first()
         if first is None:
-            resourcetype_id = str(uuid.uuid4())
-            uow.resource_types.add(ResourceType(
+            res_type_name = 'pserver_if_port'
+            resourcetype_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL, res_type_name))
+            res_type = ResourceType(
                 resourcetype_id,
-                'pserver_if_port', stxobj.type,
-                resourcepool.oCloudId))
+                res_type_name, stxobj.type,
+                description='A Port resource type of Physical Server')
+            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']
 
@@ -96,7 +105,8 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
     resourcepool_id = parent.resourcePoolId
     parent_id = parent.resourceId
     gAssetId = ''  # TODO: global ID
-    description = "A port resource of the interface"
+    description = "%s : A port resource of the interface"\
+        % stxobj.name
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
                         stxobj.name, parent_id, gAssetId, stxobj.content,
                         description)