diff options
Diffstat (limited to 'yardstick/benchmark/contexts/kubernetes.py')
| -rw-r--r-- | yardstick/benchmark/contexts/kubernetes.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/yardstick/benchmark/contexts/kubernetes.py b/yardstick/benchmark/contexts/kubernetes.py index 4ce7cbc55..27a011334 100644 --- a/yardstick/benchmark/contexts/kubernetes.py +++ b/yardstick/benchmark/contexts/kubernetes.py @@ -164,12 +164,8 @@ 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 + 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 @@ -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,10 @@ 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() + return service.ports |