Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
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
704c4a0
..
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):
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:
def _delete_pods(self):
for pod in self.template.pods:
@@
-159,15
+159,15
@@
class KubernetesContext(ctx_base.Context):
k8s_utils.create_config_map(self.ssh_key, {'authorized_keys': key})
def _delete_ssh_key(self):
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)
def _get_server(self, name):
node_ports = self._get_service_ports(name)
for sn_port in (sn_port for sn_port in node_ports
utils.remove_file(self.key_path)
utils.remove_file(self.public_key_path)
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()
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()
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