X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_port_handler.py;h=30c0dddcb64320d8fff890a5a0a132da1cf16344;hb=516ed2aeb97e09044fb79ca1b6d26e81e2f64edd;hp=df62f14905be61b86afaa265c682a5658ab1c07f;hpb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_port_handler.py b/o2ims/service/auditor/pserver_port_handler.py
index df62f14..30c0ddd 100644
--- a/o2ims/service/auditor/pserver_port_handler.py
+++ b/o2ims/service/auditor/pserver_port_handler.py
@@ -17,11 +17,12 @@ from __future__ import annotations
 import uuid
 # import json
 
-from o2ims.domain import commands
+from o2ims.domain import commands, events
 from o2ims.domain.stx_object import StxGenericModel
 from o2common.service.unit_of_work import AbstractUnitOfWork
 from o2ims.domain.resource_type import MismatchedModel
 from o2ims.domain.ocloud import Resource, ResourceType
+from o2ims.domain.subscription_obj import NotificationEventEnum
 
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
@@ -32,54 +33,63 @@ class InvalidResourceType(Exception):
 
 
 def update_pserver_port(
-    cmd: commands.UpdatePserverPort,
+    cmd: commands.UpdatePserverIfPort,
     uow: AbstractUnitOfWork
 ):
     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_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']
 
         resource = uow.resources.get(stxobj.id)
         if not resource:
-            logger.info("add the port of pserver:" + stxobj.name
+            logger.info("add the port of pserver interface:" + stxobj.name
                         + " update_at: " + str(stxobj.updatetime)
                         + " id: " + str(stxobj.id)
                         + " hash: " + str(stxobj.hash))
             localmodel = create_by(stxobj, p_resource, resourcetype_id)
             uow.resources.add(localmodel)
 
-            logger.info("Add the port of pserver: " + stxobj.id
+            logger.info("Add the port of pserver interface: " + stxobj.id
                         + ", name: " + stxobj.name)
         else:
             localmodel = resource
             if is_outdated(localmodel, stxobj):
-                logger.info("update port of pserver:" + stxobj.name
+                logger.info("update port of pserver interface:" + stxobj.name
                             + " update_at: " + str(stxobj.updatetime)
                             + " id: " + str(stxobj.id)
                             + " hash: " + str(stxobj.hash))
                 update_by(localmodel, stxobj, p_resource)
                 uow.resources.update(localmodel)
 
-            logger.info("Update the port of pserver: " + stxobj.id
+            logger.info("Update the port of pserver interface: " + stxobj.id
                         + ", name: " + stxobj.name)
         uow.commit()
 
@@ -95,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 physical server"
+    description = "%s : A port resource of the interface"\
+        % stxobj.name
     resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
                         parent_id, gAssetId, stxobj.content, description)
     resource.createtime = stxobj.createtime
@@ -113,4 +124,9 @@ def update_by(target: Resource, stxobj: StxGenericModel,
     target.updatetime = stxobj.updatetime
     target.hash = stxobj.hash
     target.version_number = target.version_number + 1
-    target.events = []
+    target.events.append(events.ResourceChanged(
+        id=stxobj.id,
+        resourcePoolId=target.resourcePoolId,
+        notificationEventType=NotificationEventEnum.MODIFY,
+        updatetime=stxobj.updatetime
+    ))