X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=o2ims%2Fservice%2Fauditor%2Fpserver_if_handler.py;h=1b003990d251351c773efa1b4010558e1409f264;hb=e0e63509e5d7bf6195b8d7f40b44c75dce7e4306;hp=7ee2df26af41e4611efa607f014a21f740b0788f;hpb=44f01a560347914798d8f913696d0e495ee076f8;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_if_handler.py b/o2ims/service/auditor/pserver_if_handler.py
index 7ee2df2..1b00399 100644
--- a/o2ims/service/auditor/pserver_if_handler.py
+++ b/o2ims/service/auditor/pserver_if_handler.py
@@ -15,13 +15,14 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
+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__)
@@ -43,18 +44,21 @@ def update_pserver_if(
         res = uow.session.execute(
             '''
             SELECT "resourceTypeId", "oCloudId", "name"
-            FROM resourcetype
+            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())
+            res_type_name = 'pserver_if'
+            resourcetype_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL, res_type_name))
             uow.resource_types.add(ResourceType(
                 resourcetype_id,
-                'pserver_if', stxobj.type,
-                resourcepool.oCloudId))
+                res_type_name, stxobj.type,
+                resourcepool.oCloudId,
+                description='An Interface resource type of Physical Server'))
         else:
             resourcetype_id = first['resourceTypeId']
 
@@ -95,10 +99,21 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
     resourcepool_id = parent.resourcePoolId
     parent_id = parent.resourceId
     gAssetId = ''  # TODO: global ID
-    description = "An interface resource of the physical server"
+    # description = "%s : An interface resource of the physical server"\
+    #     % stxobj.name
+    content = json.loads(stxobj.content)
+    selected_keys = [
+        "ifname", "iftype", "imac", "vlan_id", "imtu",
+        "ifclass", "uses", "max_tx_rate",
+        "sriov_vf_driver", "sriov_numvfs", "ptp_role"
+        ]
+    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)
+                        description, extensions)
     resource.createtime = stxobj.createtime
     resource.updatetime = stxobj.updatetime
     resource.hash = stxobj.hash
@@ -114,4 +129,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
+    ))