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>

2 files changed, 20 insertions, 12 deletions

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 94c8af85d..a2dadb759 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -17,7 +17,6 @@ from functest.opnfv_tests.openstack.snaps import snaps_utils
 from functest.utils.constants import CONST
 
 from snaps.openstack import create_flavor
-from snaps.openstack.tests import openstack_tests
 
 
 class SnapsTestRunner(unit.Suite):
@@ -29,17 +28,7 @@ class SnapsTestRunner(unit.Suite):
     def __init__(self, **kwargs):
         super(SnapsTestRunner, self).__init__(**kwargs)
         self.logger = logging.getLogger(__name__)
-        if 'os_creds' in kwargs:
-            self.os_creds = kwargs['os_creds']
-        else:
-            creds_override = None
-            if hasattr(CONST, 'snaps_os_creds_override'):
-                creds_override = CONST.__getattribute__(
-                    'snaps_os_creds_override')
-            self.os_creds = openstack_tests.get_credentials(
-                os_env_file=CONST.__getattribute__('openstack_creds'),
-                proxy_settings_str=None, ssh_proxy_cmd=None,
-                overrides=creds_override)
+        self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
 
         if 'ext_net_name' in kwargs:
             self.ext_net_name = kwargs['ext_net_name']
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py
index 1153b63df..6b0ee497c 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