From 682e05a97a5dedd556a173bda941da9da5598234 Mon Sep 17 00:00:00 2001 From: "Zhang Rong(Jon)" Date: Tue, 8 Nov 2022 15:22:46 +0800 Subject: [PATCH] Fix INF-341 refactor name of resource pool to region id Issue-ID: INF-341 Signed-off-by: Zhang Rong(Jon) Change-Id: I78c92df96a93e69e0fe1c359f434b1d4715e8d83 (cherry picked from commit a425b1b3426dd9a3bca6ba07506e5f21c27c3822) --- o2ims/adapter/clients/ocloud_client.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/o2ims/adapter/clients/ocloud_client.py b/o2ims/adapter/clients/ocloud_client.py index 35188aa..8b73614 100644 --- a/o2ims/adapter/clients/ocloud_client.py +++ b/o2ims/adapter/clients/ocloud_client.py @@ -284,7 +284,8 @@ class StxClientImp(object): if systems[0].distributed_cloud_role is None or \ systems[0].distributed_cloud_role != 'systemcontroller': return [ocloudModel.StxGenericModel( - ResourceTypeEnum.RESOURCE_POOL, systems[0])] + ResourceTypeEnum.RESOURCE_POOL, + self._respoolconverter(systems[0]))] pools = [] if config.get_system_controller_as_respool(): @@ -306,7 +307,8 @@ class StxClientImp(object): return [ocloudModel.StxGenericModel( ResourceTypeEnum.RESOURCE_POOL, - respool) for respool in pools if respool] + self._respoolconverter( + respool)) for respool in pools if respool] def getResourcePoolDetail(self, id): self.setStxClient(id) @@ -525,6 +527,11 @@ class StxClientImp(object): 'more than one system exists in the account.') return isystems[0] + @ staticmethod + def _respoolconverter(res_pool): + setattr(res_pool, 'name', res_pool.region_name) + return res_pool + @ staticmethod def _hostconverter(host): setattr(host, 'name', host.hostname) -- 2.16.6