aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vnf/vIMS
diff options
context:
space:
mode:
authorJose Lausuch <jose.lausuch@ericsson.com>2016-09-01 08:30:09 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-01 08:30:09 +0000
commitc94a1c01e46b21f0139a8b1419f26c8b9f867a41 (patch)
tree0b1c11a9d286aefd1c015dac90d5acea94206678 /testcases/vnf/vIMS
parent5fbdcb8d13e63cec2614a9703f0b3f640f05aa49 (diff)
parentf4d0a05011e961a363c6d99522684ecdeb959716 (diff)
Merge "unify functest_yaml obtain process"
Diffstat (limited to 'testcases/vnf/vIMS')
-rwxr-xr-xtestcases/vnf/vIMS/vIMS.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index bf534f68f..634a17952 100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/testcases/vnf/vIMS/vIMS.py
@@ -11,28 +11,25 @@
# http://www.apache.org/licenses/LICENSE-2.0
########################################################################
-import argparse
import datetime
import json
import os
import pprint
-import requests
import subprocess
import time
-import yaml
+import argparse
+import functest.utils.functest_logger as ft_logger
+import functest.utils.functest_utils as functest_utils
+import functest.utils.openstack_utils as os_utils
import keystoneclient.v2_0.client as ksclient
import novaclient.client as nvclient
+import requests
from neutronclient.v2_0 import client as ntclient
from clearwater import clearwater
from orchestrator import orchestrator
-import functest.utils.functest_logger as ft_logger
-import functest.utils.functest_utils as functest_utils
-import functest.utils.openstack_utils as os_utils
-
-
pp = pprint.PrettyPrinter(indent=4)
@@ -54,9 +51,7 @@ if not os.path.exists(REPO_PATH):
logger.error("Functest repository directory not found '%s'" % REPO_PATH)
exit(-1)
-with open(os.environ["CONFIG_FUNCTEST_YAML"]) as f:
- functest_yaml = yaml.safe_load(f)
-f.close()
+functest_yaml = functest_utils.get_functest_yaml()
# Cloudify parameters
VIMS_DIR = (REPO_PATH +