From 9c887a3038703e7883450677f9d1ece4d40acd3d Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Thu, 17 Nov 2022 15:16:32 +0800 Subject: [PATCH] Update resource details update pserver, cpu, interface, memory resource details Issue-ID: INF-358 Signed-off-by: Bin Yang Change-Id: I23b81a47d5513041c1c168c8d8dcd8b55f49ebed --- o2ims/service/auditor/pserver_cpu_handler.py | 15 ++++++++++++--- o2ims/service/auditor/pserver_handler.py | 18 +++++++++++++++--- o2ims/service/auditor/pserver_if_handler.py | 18 ++++++++++++++---- o2ims/service/auditor/pserver_mem_handler.py | 21 +++++++++++++++++---- 4 files changed, 58 insertions(+), 14 deletions(-) diff --git a/o2ims/service/auditor/pserver_cpu_handler.py b/o2ims/service/auditor/pserver_cpu_handler.py index 3e965b7..33f0bc0 100644 --- a/o2ims/service/auditor/pserver_cpu_handler.py +++ b/o2ims/service/auditor/pserver_cpu_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 @@ -99,10 +99,19 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\ resourcepool_id = parent.resourcePoolId parent_id = parent.resourceId gAssetId = '' # TODO: global ID - description = "%s : A CPU resource of the physical server" % stxobj.name + # description = "%s : A CPU resource of the physical server" % stxobj.name + content = json.loads(stxobj.content) + selected_keys = [ + "cpu", "core", "thread", "allocated_function", "numa_node", + "cpu_model", "cpu_family" + ] + 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 diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py index 4d9da9c..48692c8 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 @@ -102,10 +102,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) + description, extensions) resource.createtime = stxobj.createtime resource.updatetime = stxobj.updatetime resource.hash = stxobj.hash diff --git a/o2ims/service/auditor/pserver_if_handler.py b/o2ims/service/auditor/pserver_if_handler.py index 481c055..1b00399 100644 --- a/o2ims/service/auditor/pserver_if_handler.py +++ b/o2ims/service/auditor/pserver_if_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 @@ -99,11 +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 = "%s : An interface resource of the physical server"\ - % stxobj.name + # 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 diff --git a/o2ims/service/auditor/pserver_mem_handler.py b/o2ims/service/auditor/pserver_mem_handler.py index 4072daf..3ae4037 100644 --- a/o2ims/service/auditor/pserver_mem_handler.py +++ b/o2ims/service/auditor/pserver_mem_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 @@ -99,11 +99,24 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\ resourcepool_id = parent.resourcePoolId parent_id = parent.resourceId gAssetId = '' # TODO: global ID - description = "%s : A memory resource of the physical server"\ - % stxobj.name + # description = "%s : A memory resource of the physical server"\ + # % stxobj.name + content = json.loads(stxobj.content) + selected_keys = [ + "memtotal_mib", "memavail_mib", "vm_hugepages_use_1G", + "vm_hugepages_possible_1G", "hugepages_configured", + "vm_hugepages_avail_1G", "vm_hugepages_nr_1G", + "vm_hugepages_nr_4K", "vm_hugepages_nr_2M", + "vm_hugepages_possible_2M", "vm_hugepages_avail_2M", + "platform_reserved_mib", "numa_node" + ] + 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 -- 2.16.6