Merge "NSB NFVi PROX Missing VNF Statistics for CPU Utilization"

[yardstick.git] / yardstick / benchmark / contexts / kubernetes.py

diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py
index 7534c4e..e1553c7 100644 (file)
--- a/yardstick/benchmark/contexts/kubernetes.py
+++ b/yardstick/benchmark/contexts/kubernetes.py
@@ -110,7 +110,7 @@ class KubernetesContext(ctx_base.Context):
             self._delete_rc(rc)
 
     def _delete_rc(self, rc):
-        k8s_utils.delete_replication_controller(rc)
+        k8s_utils.delete_replication_controller(rc, skip_codes=[404])
 
     def _delete_pods(self):
         for pod in self.template.pods:
@@ -159,7 +159,7 @@ class KubernetesContext(ctx_base.Context):
         k8s_utils.create_config_map(self.ssh_key, {'authorized_keys': key})
 
     def _delete_ssh_key(self):
-        k8s_utils.delete_config_map(self.ssh_key)
+        k8s_utils.delete_config_map(self.ssh_key, skip_codes=[404])
         utils.remove_file(self.key_path)
         utils.remove_file(self.public_key_path)