Merge "Added means to override the RC file credentials."

4 files changed, 34 insertions, 6 deletions

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 37e518e6..cf63e1ed 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -61,6 +61,25 @@ snaps:
         disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
       centos:
         disk_file: /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2
+      # All of these values are optional and will override the values retrieved
+      # by the RC file
+#    os_creds_override:
+#      username: {user}
+#      password: {password}
+#      auth_url: {auth_url}
+#      project_name: {project_name}
+#      identity_api_version: {2|3}
+#      network_api_version: {2}
+#      compute_api_version: {2}
+#      image_api_version: {1|2}
+#      user_domain_id: {user_domain_id}
+#      project_domain_id: {projects_domain_id}
+#      interface: {interface}
+#      cacert: {True|False}
+#      proxy_settings:
+#        host: {proxy_host}
+#        port: {proxy_port}
+#        ssh_proxy_cmd: {OpenSSH -o ProxyCommand value}
 
 vping:
     ping_timeout:   200
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
index 0b87440b..19c6a87f 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_test_runner.py
@@ -28,9 +28,14 @@ class SnapsTestRunner(unit.Suite):
         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)
+                proxy_settings_str=None, ssh_proxy_cmd=None,
+                overrides=creds_override)
 
         if 'ext_net_name' in kwargs:
             self.ext_net_name = kwargs['ext_net_name']
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index f3e0cfe3..40fcb07f 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -43,8 +43,14 @@ class VPingBase(testcase.TestCase):
         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'))
+                os_env_file=CONST.__getattribute__('openstack_creds'),
+                overrides=creds_override)
 
         self.creators = list()
         self.image_creator = None
diff --git a/functest/tests/unit/openstack/vping/test_vping.py b/functest/tests/unit/openstack/vping/test_vping.py
index b229c351..a28c61ae 100644
--- a/functest/tests/unit/openstack/vping/test_vping.py
+++ b/functest/tests/unit/openstack/vping/test_vping.py
@@ -50,8 +50,6 @@ class VPingUserdataTesting(unittest.TestCase):
                 'vm_active', return_value=True)
     def test_vping_userdata(self, deploy_vm, path_exists, create_flavor,
                             get_port_ip, vm_active):
-        os_vm_inst = mock.MagicMock(name='get_console_output')
-        os_vm_inst.get_console_output.return_value = 'vPing OK'
         with mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                         return_value=OpenStackImage(self.os_creds, None)), \
                 mock.patch('snaps.openstack.utils.deploy_utils.create_network',
@@ -67,8 +65,8 @@ class VPingUserdataTesting(unittest.TestCase):
                                        name='foo', network_name='bar')]),
                                None)), \
                 mock.patch('snaps.openstack.create_instance.'
-                           'OpenStackVmInstance.get_os_vm_server_obj',
-                           return_value=os_vm_inst):
+                           'OpenStackVmInstance.get_console_output',
+                           return_value='vPing OK'):
             self.assertEquals(TestCase.EX_OK, self.vping_userdata.run())