Merge "Corrected project lead"

[functest.git] / testcases / vIMS / CI / vIMS.py

diff --git a/testcases/vIMS/CI/vIMS.py b/testcases/vIMS/CI/vIMS.py
index 98cc009..eae821a 100644 (file)
--- a/testcases/vIMS/CI/vIMS.py
+++ b/testcases/vIMS/CI/vIMS.py
@@ -63,7 +63,7 @@ if not os.path.exists(REPO_PATH):
 sys.path.append(REPO_PATH + "testcases/")
 import functest_utils
 
-with open(REPO_PATH + "testcases/config_functest.yaml") as f:
+with open("/home/opnfv/functest/conf/config_functest.yaml") as f:
     functest_yaml = yaml.safe_load(f)
 f.close()
 
@@ -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[' + \
@@ -176,7 +179,7 @@ def test_clearwater():
                 logger.debug("Pushing results to DB....")
                 git_version = functest_utils.get_git_branch(REPO_PATH)
                 functest_utils.push_results_to_db(db_url=TEST_DB, case_name="vIMS",
-                                                  logger=logger, pod_name="opnfv-jump-2", git_version=git_version,
+                                                  logger=logger, pod_name=functest_utils.get_pod_name(logger), git_version=git_version,
                                                   payload={'orchestrator': {'duration': CFY_DEPLOYMENT_DURATION,
                                                                             'result': ""},
                                                            'vIMS': {'duration': CW_DEPLOYMENT_DURATION,
@@ -288,7 +291,7 @@ def main():
                                         creds_cinder['project_id'],
                                         creds_cinder['auth_url'],
                                         service_type="volume")
-    if not functest_utils.update_cinder_quota(cinder_client, tenant_id, 20, 50, 1500):
+    if not functest_utils.update_cinder_quota(cinder_client, tenant_id, 20, 10, 150):
         logger.error("Failed to update cinder quota for tenant %s" %
                      TENANT_NAME)
         exit(-1)
@@ -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)