diff options
| author |   Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com> | 2018-07-19 09:04:06 +0100 |
|---|---|---|
| committer | Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com> | 2018-07-25 10:17:57 +0100 |
| commit | e067b0c8d11f8e1c9e0935268ac93a4f2dbe8636 (patch) | |
| tree | 2903054aecc0d755c68ebfb9d58e5524258ba3e8 /yardstick/common | |
| parent | 305b69cc6b840ced701a09bca0435937dcb42723 (diff) | |
kubernetes_utils: avoid 404 error code in delete_replication_controller()
JIRA: YARDSTICK-1319
Change-Id: I8370c5ef4e43e58a8bb9c3aac60a089b0981dda0
Signed-off-by: Mytnyk, Volodymyr <volodymyrx.mytnyk@intel.com>
Diffstat (limited to 'yardstick/common')
| -rw-r--r-- | yardstick/common/kubernetes_utils.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/yardstick/common/kubernetes_utils.py b/yardstick/common/kubernetes_utils.py index c90f73e43..03d38784c 100644 --- a/yardstick/common/kubernetes_utils.py +++ b/yardstick/common/kubernetes_utils.py @@ -121,8 +121,10 @@ def create_replication_controller(template, def delete_replication_controller(name, namespace='default', wait=False, - **kwargs): # pragma: no cover + skip_codes=None, + **kwargs): # pylint: disable=unused-argument + skip_codes = [] if not skip_codes else skip_codes core_v1_api = get_core_api() body = kwargs.get('body', client.V1DeleteOptions()) kwargs.pop('body', None) @@ -131,9 +133,12 @@ def delete_replication_controller(name, namespace, body, **kwargs) - except ApiException: - LOG.exception('Delete replication controller failed') - raise + except ApiException as e: + if e.status in skip_codes: + LOG.info(e.reason) + else: + raise exceptions.KubernetesApiException( + action='delete', resource='ReplicationController') def delete_pod(name, |