X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_eth_handler.py;h=e373dbe97d081d65b920cabdcc6eb6ba7ee4ad72;hb=5f6c39c6bfb90907a289be7d02210be7f2ea22dd;hp=57316180362f78f24904aacdecef2ea66c163095;hpb=a9840e41848cbbffcedf76f0a53ffc5d9bc87c01;p=pti%2Fo2.git

diff --git a/o2ims/service/auditor/pserver_eth_handler.py b/o2ims/service/auditor/pserver_eth_handler.py
index 5731618..e373dbe 100644
--- a/o2ims/service/auditor/pserver_eth_handler.py
+++ b/o2ims/service/auditor/pserver_eth_handler.py
@@ -15,7 +15,7 @@
 # pylint: disable=unused-argument
 from __future__ import annotations
 import uuid
-# import json
+import json
 
 from o2ims.domain import commands, events
 from o2ims.domain.stx_object import StxGenericModel
@@ -51,11 +51,14 @@ def update_pserver_eth(
         )
         first = res.first()
         if first is None:
-            resourcetype_id = str(uuid.uuid4())
+            res_type_name = 'pserver_ethernet'
+            resourcetype_id = str(uuid.uuid3(
+                uuid.NAMESPACE_URL, res_type_name))
             uow.resource_types.add(ResourceType(
                 resourcetype_id,
-                'pserver_ethernet', stxobj.type,
-                resourcepool.oCloudId))
+                res_type_name, stxobj.type,
+                resourcepool.oCloudId,
+                description='An Ethernet resource type of Physical Server'))
         else:
             resourcetype_id = first['resourceTypeId']
 
@@ -96,10 +99,23 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
     resourcepool_id = parent.resourcePoolId
     parent_id = parent.resourceId
     gAssetId = ''  # TODO: global ID
-    description = "An ethernet resource of the physical server"
+    # description = "%s : An ethernet resource of the physical server"\
+    #     % stxobj.name
+    content = json.loads(stxobj.content)
+    selected_keys = [
+        "name", "namedisplay", "dev_id", "pdevice", "capabilities",
+        "type", "driver", "mac", "numa_node",
+        "pciaddr", "pclass", "psvendor", "psdevice",
+        "sriov_totalvfs", "sriov_numvfs", "dpdksupport",
+        "sriov_vf_driver", "sriov_vf_pdevice_id", "interface_uuid"
+        ]
+    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