aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/snaps/snaps_utils.py
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-01-30 14:59:05 +0200
committerJuha Kosonen <juha.kosonen@nokia.com>2018-01-30 14:59:05 +0200
commit3b36c06f9223322e23e3885759355593b3c598a3 (patch)
tree518c1f0c8684beaacc991943870423f73a7a86d0 /functest/opnfv_tests/openstack/snaps/snaps_utils.py
parent8e416aee220bf6959e2e21f18a5ebfec1421858b (diff)
Remove duplicated code related to snaps creds
Add support for providing credentials in snaps_utils. JIRA: FUNCTEST-916 Change-Id: I3e027229d213d3791a115920f7012309cc027712 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/snaps/snaps_utils.py')
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_utils.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index 1153b63d..6b0ee497 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
@@ -11,6 +11,7 @@
from functest.utils.constants import CONST
+from snaps.openstack.tests import openstack_tests
from snaps.openstack.utils import neutron_utils, nova_utils
@@ -40,3 +41,21 @@ def get_active_compute_cnt(os_creds):
nova = nova_utils.nova_client(os_creds)
computes = nova_utils.get_availability_zone_hosts(nova, zone_name='nova')
return len(computes)
+
+
+def get_credentials(proxy_settings_str=None, ssh_proxy_cmd=None):
+ """
+ Returns snaps OSCreds object instance
+ :param: proxy_settings_str: proxy settings string <host>:<port>
+ :param: ssh_proxy_cmd: the SSH proxy command for the environment
+ :return: an instance of snaps OSCreds object
+ """
+ creds_override = None
+ if hasattr(CONST, 'snaps_os_creds_override'):
+ creds_override = CONST.__getattribute__(
+ 'snaps_os_creds_override')
+ os_creds = openstack_tests.get_credentials(
+ os_env_file=CONST.__getattribute__('openstack_creds'),
+ proxy_settings_str=proxy_settings_str, ssh_proxy_cmd=ssh_proxy_cmd,
+ overrides=creds_override)
+ return os_creds