Fix externaldns and faliover k8s tests.
Reduce load when retrying by adding interval parameter to retry
helper.
Implement controller_name caching that will reduce load on salt
and will allow to renew controller if it needed (like for
failover test)
Change-Id: I4172f9cac1f1aeac8c356f338d50299f31ed0b66
diff --git a/tcp_tests/helpers/utils.py b/tcp_tests/helpers/utils.py
index 480a646..a16a3a3 100644
--- a/tcp_tests/helpers/utils.py
+++ b/tcp_tests/helpers/utils.py
@@ -176,7 +176,7 @@
shutil.rmtree(dirpath)
-def retry(tries_number=2, exception=Exception):
+def retry(tries_number=2, exception=Exception, interval=0):
def _retry(func):
assert tries_number >= 1, 'ERROR! @retry is called with no tries!'
@@ -195,6 +195,9 @@
LOG.debug('Failed to execute function "{0}" with {1} '
'tries!'.format(func.__name__, tries_number))
raise e
+ else:
+ if interval > 0:
+ time.sleep(interval)
iter_number += 1
return wrapper
return _retry
diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index d1a9a87..0e57c89 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -39,6 +39,7 @@
self.__underlay = underlay
self._salt = salt
self._api = None
+ self._controller_name = None
self.kubectl = K8SKubectlCli(self)
self.virtlet = K8SVirtlet(self)
self.conformance_node = None
@@ -105,13 +106,28 @@
return [self.__underlay.host_by_node_name(node_name=v)
for pillar in masters_fqdn for k, v in pillar.items()]
+ def renew_controller(self, controller_node_name=None):
+ """ Changes controller returned by controller_name property """
+ if controller_node_name is not None:
+ self._controller_name = controller_node_name
+ return self._controller_name
+ names = [node['node_name'] for node in self.get_controllers()]
+ if len(names) == 1 and names[0] == self._controller_name:
+ LOG.warn(
+ "Cannot change controller because there is only 1 of them")
+ return
+ else:
+ for name in names:
+ if name != self._controller_name:
+ self._controller_name = name
+ return
+
@property
def controller_name(self):
""" Return node name of controller node that used for all actions """
- names = [node['node_name'] for node in self.get_controllers()]
- # we want to return same controller name every time
- names.sort()
- return names[0]
+ if self._controller_name is None:
+ self.renew_controller()
+ return self._controller_name
@property
def controller_minion_id(self):
@@ -479,12 +495,12 @@
self.controller_check_call(cmd, raise_on_err=False)
- @retry(300, exception=DevopsCalledProcessError)
+ @retry(100, exception=DevopsCalledProcessError, interval=20)
def nslookup(self, host, src):
""" Run nslookup on controller and return result """
return self.controller_check_call("nslookup {0} {1}".format(host, src))
- @retry(300, exception=DevopsCalledProcessError)
+ @retry(100, exception=DevopsCalledProcessError, interval=20)
def curl(self, url, *args):
"""
Run curl on controller and return stdout
diff --git a/tcp_tests/tests/system/test_failover_k8s.py b/tcp_tests/tests/system/test_failover_k8s.py
index b872c36..7382bb9 100644
--- a/tcp_tests/tests/system/test_failover_k8s.py
+++ b/tcp_tests/tests/system/test_failover_k8s.py
@@ -71,5 +71,7 @@
host=config.salt.salt_master_host, raise_on_err=False)['stdout'])
assert "apiVersion" in curl_output
+ k8s_actions.renew_controller(controller_node_name=new_minion_vip)
+
show_step(8)
- k8s_actions.run_conformance(node_name=new_minion_vip)
+ k8s_actions.start_conformance_inside_pod()