Merge "the recovery action of "baremetal down" should be triggered mandatory"

[yardstick.git] / yardstick / orchestrator / kubernetes.py

diff --git a/yardstick/orchestrator/kubernetes.py b/yardstick/orchestrator/kubernetes.py
index 3e2572f..b0b93a3 100644 (file)
--- a/yardstick/orchestrator/kubernetes.py
+++ b/yardstick/orchestrator/kubernetes.py
@@ -41,6 +41,8 @@ class ContainerObject(object):
         self._resources = kwargs.get('resources', {})
         self._ports = kwargs.get('ports', [])
         self._image_pull_policy = kwargs.get('imagePullPolicy')
+        self._tty = kwargs.get('tty')
+        self._stdin = kwargs.get('stdin')
 
     @staticmethod
     def _parse_commands(command):
@@ -99,6 +101,10 @@ class ContainerObject(object):
             if self._image_pull_policy not in self.IMAGE_PULL_POLICY:
                 raise exceptions.KubernetesContainerWrongImagePullPolicy()
             container['imagePullPolicy'] = self._image_pull_policy
+        if self._stdin is not None:
+            container['stdin'] = self._stdin
+        if self._tty is not None:
+            container['tty'] = self._tty
         return container
 
 
@@ -302,7 +308,7 @@ class ServiceNodePortObject(object):
         k8s_utils.create_service(self.template)
 
     def delete(self):
-        k8s_utils.delete_service(self._name)
+        k8s_utils.delete_service(self._name, skip_codes=[404])
 
 
 class CustomResourceDefinitionObject(object):
@@ -343,7 +349,7 @@ class CustomResourceDefinitionObject(object):
         k8s_utils.create_custom_resource_definition(self._template)
 
     def delete(self):
-        k8s_utils.delete_custom_resource_definition(self._name)
+        k8s_utils.delete_custom_resource_definition(self._name, skip_codes=[404])
 
 
 class NetworkObject(object):
@@ -431,11 +437,11 @@ class NetworkObject(object):
 
     def create(self):
         k8s_utils.create_network(self.scope, self.group, self.version,
-                                 self.plural, self.template)
+                                 self.plural, self.template, self._name)
 
     def delete(self):
         k8s_utils.delete_network(self.scope, self.group, self.version,
-                                 self.plural, self._name)
+                                 self.plural, self._name, skip_codes=[404])
 
 
 class KubernetesTemplate(object):