aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vIMS/CI/vIMS.py
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2016-01-13 14:41:23 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-13 14:41:23 +0000
commit4f705ea7b3f4eae366446d74e2f768c876d6cba4 (patch)
treeb5108553956a614d34440a2d314e8f2916c65e29 /testcases/vIMS/CI/vIMS.py
parent7293a8faf40846d66d68a3ca8ae5359b28662d0e (diff)
parent5f49a3982fdd8c8addac8b3b5d3b23327de3d077 (diff)
Merge "Fix dns problem on E/// pod"
Diffstat (limited to 'testcases/vIMS/CI/vIMS.py')
-rw-r--r--testcases/vIMS/CI/vIMS.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index 74cce979..d2b6567d 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)