summaryrefslogtreecommitdiffstats
path: root/sdnvpn/lib
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-12-21 16:25:53 +0100
committerJose Lausuch <jose.lausuch@ericsson.com>2016-12-22 08:40:21 +0000
commit9d112e4b1a00063f79b088dab93d1700bfb9c0dd (patch)
tree55ad472c227578a2ab6efb901662b860d8e74683 /sdnvpn/lib
parentf5108107df27939ab60ba219cb918acc54dce190 (diff)
Bug fixes after the Functest refactor
Change-Id: I20b9629bd3c9945e98edb94056f459d9f75eec5d Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'sdnvpn/lib')
-rw-r--r--sdnvpn/lib/config.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/sdnvpn/lib/config.py b/sdnvpn/lib/config.py
index 16a19b6..f6206cf 100644
--- a/sdnvpn/lib/config.py
+++ b/sdnvpn/lib/config.py
@@ -19,19 +19,15 @@ class CommonConfig(object):
'sdnvpn/test/functest/config.yaml')
self.keyfile_path = os.path.join(self.repo_path,
'sdnvpn/artifacts/id_rsa')
- self.test_db = ft_utils.get_functest_config("results.test_db_url")
+ self.test_db = CONST.results_test_db_url
self.line_length = 90 # length for the summary table
self.vm_boot_timeout = 180
self.default_flavor = ft_utils.get_parameter_from_yaml(
"defaults.flavor", self.config_file)
- self.image_filename = ft_utils.get_functest_config(
- "general.openstack.image_file_name")
- self.image_format = ft_utils.get_functest_config(
- "general.openstack.image_disk_format")
- self.image_path = '{0}/{1}'.format(
- ft_utils.get_functest_config(
- "general.directories.dir_functest_data"),
- self.image_filename)
+ self.image_filename = CONST.openstack_image_file_name
+ self.image_format = CONST.openstack_image_disk_format
+ self.image_path = '{0}/{1}'.format(CONST.dir_functest_data,
+ self.image_filename)
class TestcaseConfig(object):