X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fauditor%2Fpserver_handler.py;h=4d9da9c4b8aa050eafc6ab0fb869c07a54ecd8d3;hb=d639eecedfed31ca751dfddb23526c499c694c01;hp=d18d3c3e52e289b4cbfc99960dffea0681a4762d;hpb=7b80a6162b616d1cd33d3af4367abfb8d56622d8;p=pti%2Fo2.git diff --git a/o2ims/service/auditor/pserver_handler.py b/o2ims/service/auditor/pserver_handler.py index d18d3c3..4d9da9c 100644 --- a/o2ims/service/auditor/pserver_handler.py +++ b/o2ims/service/auditor/pserver_handler.py @@ -47,18 +47,21 @@ def update_pserver( 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' + resourcetype_id = str(uuid.uuid3( + uuid.NAMESPACE_URL, res_type_name)) uow.resource_types.add(ResourceType( resourcetype_id, - 'pserver', stxobj.type, - resourcepool.oCloudId)) + res_type_name, stxobj.type, + resourcepool.oCloudId, + description='The Physical Server resource type')) else: resourcetype_id = first['resourceTypeId'] @@ -99,7 +102,7 @@ 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 = "A physical server resource" + description = "%s : A physical server resource" % stxobj.name resource = Resource(stxobj.id, resourcetype_id, resourcepool_id, stxobj.name, parent_id, gAssetId, stxobj.content, description)