From 938f0bedaa9d00509406436110ee8a76e4b5510f Mon Sep 17 00:00:00 2001 From: "Zhang Rong(Jon)" Date: Sun, 13 Nov 2022 21:07:00 +0800 Subject: [PATCH] Fix the watcher not add the host resource in subcloud Signed-off-by: Zhang Rong(Jon) Change-Id: Ida9f43d64708068c5f41ead82adca67d7d10d875 --- o2ims/adapter/clients/ocloud_client.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/o2ims/adapter/clients/ocloud_client.py b/o2ims/adapter/clients/ocloud_client.py index 8b73614..9af3b7a 100644 --- a/o2ims/adapter/clients/ocloud_client.py +++ b/o2ims/adapter/clients/ocloud_client.py @@ -89,7 +89,6 @@ class StxPserverClient(BaseClient): return self.driver.getPserver(id) def _list(self, **filters) -> List[ocloudModel.StxGenericModel]: - filters['resourcepoolid'] return self.driver.getPserverList(**filters) def _set_stx_client(self): @@ -315,7 +314,8 @@ class StxClientImp(object): systems = self.stxclient.isystem.list() logger.debug('systems:' + str(systems[0].to_dict())) return ocloudModel.StxGenericModel( - ResourceTypeEnum.RESOURCE_POOL, systems[0]) if systems else None + ResourceTypeEnum.RESOURCE_POOL, + self._respoolconverter(systems[0])) if systems else None def getPserverList(self, **filters) -> List[ocloudModel.StxGenericModel]: hosts = self.stxclient.ihost.list() @@ -323,6 +323,7 @@ class StxClientImp(object): return [ocloudModel.StxGenericModel( ResourceTypeEnum.PSERVER, self._hostconverter(host)) for host in hosts if host and (host.availability == 'available' + or host.availability == 'online' or host.availability == 'degraded')] def getPserver(self, id) -> ocloudModel.StxGenericModel: -- 2.16.6