diff options
Diffstat (limited to 'test/functest/utils.py')
| -rw-r--r-- | test/functest/utils.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/test/functest/utils.py b/test/functest/utils.py index b75cb3b..351797b 100644 --- a/test/functest/utils.py +++ b/test/functest/utils.py @@ -9,21 +9,16 @@ # import sys import time -import os import functest.utils.functest_logger as ft_logger -import functest.utils.functest_utils as ft_utils import functest.utils.openstack_utils as os_utils import re +import config as sdnvpn_config logger = ft_logger.Logger("sndvpn_test_utils").getLogger() -REPO_PATH = os.environ['repos_dir'] + '/sdnvpn/' -config_file = REPO_PATH + 'test/functest/config.yaml' - -DEFAULT_FLAVOR = ft_utils.get_parameter_from_yaml( - "defaults.flavor", config_file) +common_config = sdnvpn_config.CommonConfig() def create_net(neutron_client, name): @@ -94,7 +89,7 @@ def create_instance(nova_client, **kwargs ): if 'flavor' not in kwargs: - kwargs['flavor'] = DEFAULT_FLAVOR + kwargs['flavor'] = common_config.default_flavor logger.info("Creating instance '%s'..." % name) logger.debug( |