summaryrefslogtreecommitdiffstats
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
parentf5108107df27939ab60ba219cb918acc54dce190 (diff)
Bug fixes after the Functest refactor
Change-Id: I20b9629bd3c9945e98edb94056f459d9f75eec5d Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--sdnvpn/lib/config.py14
-rw-r--r--sdnvpn/test/functest/run_tests.py2
-rw-r--r--sdnvpn/test/functest/testcase_1.py2
-rw-r--r--sdnvpn/test/functest/testcase_2.py2
-rw-r--r--sdnvpn/test/functest/testcase_4.py2
-rw-r--r--sdnvpn/test/functest/testcase_7.py2
6 files changed, 10 insertions, 14 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):
diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py
index 15fe1d0..924a0e5 100644
--- a/sdnvpn/test/functest/run_tests.py
+++ b/sdnvpn/test/functest/run_tests.py
@@ -25,10 +25,10 @@ parser.add_argument("-r", "--report",
action="store_true")
args = parser.parse_args()
-TEST_DB_URL = ft_utils.get_functest_config('results.test_db_url')
logger = ft_logger.Logger("sdnvpn-run-tests").getLogger()
COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TEST_DB_URL = COMMON_CONFIG.test_db
def push_results(testname, start_time, end_time, criteria, details):
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
index a2817db..b2ef6d2 100644
--- a/sdnvpn/test/functest/testcase_1.py
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -48,7 +48,7 @@ def main():
COMMON_CONFIG.image_path,
disk=COMMON_CONFIG.image_format,
container="bare",
- public=True)
+ public='public')
network_1_id = test_utils.create_net(neutron_client,
TESTCASE_CONFIG.net_1_name)
test_utils.create_subnet(neutron_client,
diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
index 2df518c..5bf2c0f 100644
--- a/sdnvpn/test/functest/testcase_2.py
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -56,7 +56,7 @@ def main():
COMMON_CONFIG.image_path,
disk=COMMON_CONFIG.image_format,
container="bare",
- public=True)
+ public='public')
network_1_id = test_utils.create_net(
neutron_client,
TESTCASE_CONFIG.net_1_name)
diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
index df3c48d..1cadc51 100644
--- a/sdnvpn/test/functest/testcase_4.py
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -48,7 +48,7 @@ def main():
COMMON_CONFIG.image_path,
disk=COMMON_CONFIG.image_format,
container="bare",
- public=True)
+ public='public')
network_1_id, _, router_1_id = test_utils.create_network(
neutron_client,
TESTCASE_CONFIG.net_1_name,
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
index c377848..05d40fa 100644
--- a/sdnvpn/test/functest/testcase_7.py
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -57,7 +57,7 @@ def main():
COMMON_CONFIG.image_path,
disk=COMMON_CONFIG.image_format,
container="bare",
- public=True)
+ public='public')
network_1_id, _, _ = test_utils.create_network(
neutron_client,
TESTCASE_CONFIG.net_1_name,