diff options
| author |   boucherv <valentin.boucher@orange.com> | 2016-01-13 14:41:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-13 14:41:23 +0000 |
| commit | 4f705ea7b3f4eae366446d74e2f768c876d6cba4 (patch) | |
| tree | b5108553956a614d34440a2d314e8f2916c65e29 /testcases/vIMS | |
| parent | 7293a8faf40846d66d68a3ca8ae5359b28662d0e (diff) | |
| parent | 5f49a3982fdd8c8addac8b3b5d3b23327de3d077 (diff) | |
Merge "Fix dns problem on E/// pod"
Diffstat (limited to 'testcases/vIMS')
| -rw-r--r-- | testcases/vIMS/CI/orchestrator.py | 8 | ||||
| -rw-r--r-- | testcases/vIMS/CI/vIMS.py | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/testcases/vIMS/CI/orchestrator.py b/testcases/vIMS/CI/orchestrator.py index ab0b448fa..382fbd139 100644 --- a/testcases/vIMS/CI/orchestrator.py +++ b/testcases/vIMS/CI/orchestrator.py @@ -47,6 +47,12 @@ class orchestrator: def set_ssh_user(self, ssh_user): self.config['ssh_user'] = ssh_user + def set_nameservers(self, nameservers): + if 0 < len(nameservers): + self.config['dns_subnet_1'] = nameservers[0] + if 1 < len(nameservers): + self.config['dns_subnet_2'] = nameservers[1] + def set_logger(self, logger): self.logger = logger @@ -91,7 +97,7 @@ class orchestrator: if self.logger: self.logger.info("Launching the cloudify-manager deployment") - script = "set -e; " + script = "set -e; " script += "source " + self.testcase_dir + "venv_cloudify/bin/activate; " script += "cd " + self.testcase_dir + "; " script += "cfy init -r; " diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py index 74cce9793..d2b6567d8 100644 --- a/testcases/vIMS/CI/vIMS.py +++ b/testcases/vIMS/CI/vIMS.py @@ -138,10 +138,13 @@ def test_clearwater(): logger.info("vIMS functional test Start Time:'%s'" % ( datetime.datetime.fromtimestamp(start_time_ts).strftime( '%Y-%m-%d %H:%M:%S'))) + nameservers = functest_utils.get_resolvconf_ns() + resolvconf = "" + for ns in nameservers: + resolvconf += "\nnameserver " + ns if dns_ip != "": - script = 'echo -e "nameserver ' + dns_ip + \ - '\nnameserver 8.8.8.8\nnameserver 8.8.4.4" > /etc/resolv.conf; ' + script = 'echo -e "nameserver ' + dns_ip + resolvconf + '" > /etc/resolv.conf; ' script += 'source /etc/profile.d/rvm.sh; ' script += 'cd ' + VIMS_TEST_DIR + '; ' script += 'rake test[' + \ @@ -343,6 +346,10 @@ def main(): cfy.set_external_network_name(ext_net) + ns = functest_utils.get_resolvconf_ns() + if ns: + cfy.set_nameservers(ns) + logger.info("Prepare virtualenv for cloudify-cli") cmd = "chmod +x " + VIMS_DIR + "create_venv.sh" functest_utils.execute_command(cmd, logger) |