X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_mem_handler.py;h=4072dafcc6d6642ac631b597eaf5f17a171b74a7;hb=45f6aa19191f366a05aa6df0902536c225c6d970;hp=683475ea6764594244468250f4fa55e2b113fc0b;hpb=b37a7d8e36bd9fdf862cb1aad29f9a29052e725f;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/pserver_mem_handler.py b/o2ims/service/auditor/pserver_mem_handler.py index 683475e..4072daf 100644 --- a/o2ims/service/auditor/pserver_mem_handler.py +++ b/o2ims/service/auditor/pserver_mem_handler.py @@ -44,18 +44,21 @@ def update_pserver_mem( 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_mem' + resourcetype_id = str(uuid.uuid3( + uuid.NAMESPACE_URL, res_type_name)) uow.resource_types.add(ResourceType( resourcetype_id, - 'pserver_mem', stxobj.type, - resourcepool.oCloudId)) + res_type_name, stxobj.type, + resourcepool.oCloudId, + description='A Memory resource type of Physical Server')) else: resourcetype_id = first['resourceTypeId'] @@ -96,7 +99,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 memory resource of the physical server" + description = "%s : A memory resource of the physical server"\ + % stxobj.name resource = Resource(stxobj.id, resourcetype_id, resourcepool_id, stxobj.name, parent_id, gAssetId, stxobj.content, description)