#
# http://www.apache.org/licenses/LICENSE-2.0
-"""Some common utils wrapping snaps functions """
-
-from functest.utils.constants import CONST
-from functest.utils import env
+"""Some common utils wrapping snaps functions"""
from snaps.openstack.tests import openstack_tests
-from snaps.openstack.utils import neutron_utils, nova_utils
+from snaps.openstack.utils import neutron_utils
+from snaps.openstack.utils import nova_utils
+
+from functest.utils import config
+from functest.utils import constants
+from functest.utils import env
def get_ext_net_name(os_creds):
:return: an instance of snaps OSCreds object
"""
creds_override = None
- if hasattr(CONST, 'snaps_os_creds_override'):
- creds_override = getattr(CONST, 'snaps_os_creds_override')
+ if hasattr(config.CONF, 'snaps_os_creds_override'):
+ creds_override = getattr(config.CONF, 'snaps_os_creds_override')
os_creds = openstack_tests.get_credentials(
- os_env_file=getattr(CONST, 'env_file'),
- proxy_settings_str=proxy_settings_str, ssh_proxy_cmd=ssh_proxy_cmd,
- overrides=creds_override)
+ os_env_file=constants.ENV_FILE, proxy_settings_str=proxy_settings_str,
+ ssh_proxy_cmd=ssh_proxy_cmd, overrides=creds_override)
return os_creds