Merge "Minor fixes in k8s tests"
diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 102da9a..cc0a924 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -450,8 +450,6 @@
def get_pod_dom_uuid(self, pod):
uuid_name_map = self.virtlet_execute(
pod.read().spec.node_name, 'virsh list --uuid --name')['stdout']
- LOG.info("HEHEHEH {}".format(uuid_name_map))
- LOG.info("MDAMDMAD {}".format(pod.name))
for line in uuid_name_map:
if line.rstrip().endswith("-{}".format(pod.name)):
return line.split(" ")[0]
@@ -502,6 +500,7 @@
def expose(self, service_type='ClusterIP'):
service_name = "{0}-s{1}".format(self._deployment.name, self._index)
+ self._index += 1
self._svc = self._manager.kubectl.expose(
self._deployment, port=self._port,
service_name=service_name, service_type=service_type)
@@ -518,3 +517,9 @@
def is_service_available(self, svc=None, external=False):
return "Hello Kubernetes!" in self.curl(svc, external=external)
+
+ def delete(self):
+ for svc in self._manager.api.services.list_all(
+ name_prefix="{}-s".format(self._deployment.name)):
+ svc.delete()
+ self._deployment.delete()
diff --git a/tcp_tests/tests/system/test_k8s_actions.py b/tcp_tests/tests/system/test_k8s_actions.py
index deee430..2fddde6 100644
--- a/tcp_tests/tests/system/test_k8s_actions.py
+++ b/tcp_tests/tests/system/test_k8s_actions.py
@@ -71,7 +71,9 @@
})
show_step(5)
- k8s_deployed.nslookup(hostname, svc.get_ip())
+ dns_svc = k8s_deployed.api.services.get(
+ name='coredns', namespace='kube-system')
+ k8s_deployed.nslookup(hostname, dns_svc.get_ip())
show_step(6)
deployment.delete()