Merge "kubernetes_utils: avoid 404 error code in delete_custom_resource_definition()"

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

diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py
index 704c4a0..7534c4e 100644 (file)
--- a/yardstick/benchmark/contexts/kubernetes.py
+++ b/yardstick/benchmark/contexts/kubernetes.py
@@ -166,8 +166,8 @@ class KubernetesContext(ctx_base.Context):
     def _get_server(self, name):
         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
+                        if sn_port['port'] == constants.SSH_PORT):
+            node_port = sn_port['node_port']
             break
         else:
             raise exceptions.KubernetesSSHPortNotDefined()
@@ -224,4 +224,11 @@ class KubernetesContext(ctx_base.Context):
         service = k8s_utils.get_service_by_name(service_name)
         if not service:
             raise exceptions.KubernetesServiceObjectNotDefined()
-        return service.ports
+        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