From deca6d35cd4ba0c6444b92d15b07ade1169d0ef3 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 14 Dec 2017 12:13:19 +0100 Subject: Migrate to SNAPs openstack library Functest is deprecating its openstack library which we were using extensively We need then to move to an alternative and the best appears to be SNAPs Change-Id: Icaa0b9f1ec580545b9d0faa88be2080a310deaf7 Signed-off-by: Manuel Buil --- sfc/lib/config.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'sfc/lib/config.py') diff --git a/sfc/lib/config.py b/sfc/lib/config.py index fe95e983..bc955d8b 100644 --- a/sfc/lib/config.py +++ b/sfc/lib/config.py @@ -13,7 +13,7 @@ import yaml import sfc import functest -import sfc.lib.utils as test_utils +import sfc.lib.test_utils as test_utils from functest.utils.constants import CONST import logging import functest.utils.functest_utils as ft_utils @@ -83,16 +83,12 @@ class CommonConfig(object): "defaults.vcpu_count", self.config_file) self.image_name = ft_utils.get_parameter_from_yaml( "defaults.image_name", self.config_file) - self.image_file_name = ft_utils.get_parameter_from_yaml( - "defaults.image_file_name", self.config_file) self.image_format = ft_utils.get_parameter_from_yaml( "defaults.image_format", self.config_file) - self.url = ft_utils.get_parameter_from_yaml( - "defaults.url", self.config_file) + self.image_url = ft_utils.get_parameter_from_yaml( + "defaults.image_url", self.config_file) self.dir_functest_data = ft_utils.get_functest_config( "general.dir.functest_data") - self.image_path = os.path.join( - self.dir_functest_data, self.image_file_name) class TestcaseConfig(object): -- cgit 1.2.3-korg