X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcontexts%2Fkubernetes.py;h=7534c4ea56478433aa7910559f6ff96039a38d03;hb=c581a83ab7e47e71658cb79ac8d25c024742d0e5;hp=4ce7cbc5595f10e608a743f521899336ab101472;hpb=2429ef152b5503d939022fbfd145b88a1df5c23b;p=yardstick.git

diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py
index 4ce7cbc55..7534c4ea5 100644
--- a/yardstick/benchmark/contexts/kubernetes.py
+++ b/yardstick/benchmark/contexts/kubernetes.py
@@ -117,7 +117,7 @@ class KubernetesContext(ctx_base.Context):
             self._delete_pod(pod)
 
     def _delete_pod(self, pod):
-        k8s_utils.delete_pod(pod)
+        k8s_utils.delete_pod(pod, skip_codes=[404])
 
     def _create_crd(self):
         LOG.info('Create Custom Resource Definition elements')
@@ -164,14 +164,10 @@ class KubernetesContext(ctx_base.Context):
         utils.remove_file(self.public_key_path)
 
     def _get_server(self, name):
-        service_name = '{}-service'.format(name)
-        service = k8s_utils.get_service_by_name(service_name)
-        if not service:
-            raise exceptions.KubernetesServiceObjectNotDefined()
-
-        for sn_port in (sn_port for sn_port in service.ports
-                        if sn_port.port == constants.SSH_PORT):
-            node_port = sn_port.node_port
+        node_ports = self._get_service_ports(name)
+        for sn_port in (sn_port for sn_port in node_ports
+                        if sn_port['port'] == constants.SSH_PORT):
+            node_port = sn_port['node_port']
             break
         else:
             raise exceptions.KubernetesSSHPortNotDefined()
@@ -183,7 +179,8 @@ class KubernetesContext(ctx_base.Context):
             'ssh_port': node_port,
             'user': 'root',
             'key_filename': self.key_path,
-            'interfaces': self._get_interfaces(name)
+            'interfaces': self._get_interfaces(name),
+            'service_ports': node_ports
         }
 
     def _get_network(self, net_name):
@@ -221,3 +218,17 @@ class KubernetesContext(ctx_base.Context):
 
     def _get_physical_node_for_server(self, server_name):
         return None
+
+    def _get_service_ports(self, name):
+        service_name = '{}-service'.format(name)
+        service = k8s_utils.get_service_by_name(service_name)
+        if not service:
+            raise exceptions.KubernetesServiceObjectNotDefined()
+        ports = []
+        for port in service.ports:
+            ports.append({'name': port.name,
+                          'node_port': port.node_port,
+                          'port': port.port,
+                          'protocol': port.protocol,
+                          'target_port': port.target_port})
+        return ports