aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vPing
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-05-26 13:35:58 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-05-26 13:35:58 +0000
commit0b10079d8e6796e4909e461548850dc9d15c8326 (patch)
tree5ab4f8d22731f56404176b47a1d137b1f93a18d7 /testcases/vPing
parent9241dfc62fb0603ee865a944db78b4890c850d6d (diff)
parentd8604ff3fddf2f1ae87d5ece324e8cee281f9679 (diff)
Merge "Refactor functest environment. Bugfixes: arg dependencies"
Diffstat (limited to 'testcases/vPing')
-rw-r--r--testcases/vPing/CI/libraries/vPing.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index 8c365ffa9..5c02d5a32 100644
--- a/testcases/vPing/CI/libraries/vPing.py
+++ b/testcases/vPing/CI/libraries/vPing.py
@@ -18,19 +18,6 @@ import pprint
import novaclient.v2.client as novaclient
pp = pprint.PrettyPrinter(indent=4)
-HOME = os.environ['HOME']+"/"
-with open(args.repo_path+"testcases/config_functest.yaml") as f:
- functest_yaml = yaml.safe_load(f)
-f.close()
-
-VM_BOOT_TIMEOUT = 180
-PING_TIMEOUT = functest_yaml.get("vping").get("ping_timeout")
-NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1")
-NAME_VM_2 = functest_yaml.get("vping").get("vm_name_2")
-GLANCE_IMAGE_NAME = functest_yaml.get("general").get("openstack").get("image_name")
-NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("general").get("openstack").get("neutron_private_net_name")
-FLAVOR = functest_yaml.get("vping").get("vm_flavor")
-
parser = argparse.ArgumentParser()
parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
@@ -50,6 +37,19 @@ ch.setFormatter(formatter)
logger.addHandler(ch)
+HOME = os.environ['HOME']+"/"
+with open(args.repo_path+"testcases/config_functest.yaml") as f:
+ functest_yaml = yaml.safe_load(f)
+f.close()
+
+VM_BOOT_TIMEOUT = 180
+PING_TIMEOUT = functest_yaml.get("vping").get("ping_timeout")
+NAME_VM_1 = functest_yaml.get("vping").get("vm_name_1")
+NAME_VM_2 = functest_yaml.get("vping").get("vm_name_2")
+GLANCE_IMAGE_NAME = functest_yaml.get("general").get("openstack").get("image_name")
+NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("general").get("openstack").get("neutron_private_net_name")
+FLAVOR = functest_yaml.get("vping").get("vm_flavor")
+
def pMsg(value):
"""pretty printing"""