Merge "WIP: Cirros TestVM: Allow config of username/password"

4 files changed, 12 insertions, 10 deletions

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 3bad1b8f..7b3d61eb 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -45,6 +45,8 @@ general:
         image_name: Cirros-0.3.4
         image_file_name:  cirros-0.3.4-x86_64-disk.img
         image_disk_format:  qcow2
+        image_username:  cirros
+        image_password:  cubswin:)
 
         flavor_name: opnfv_flavor
         flavor_ram: 512
diff --git a/functest/opnfv_tests/openstack/vping/vping_base.py b/functest/opnfv_tests/openstack/vping/vping_base.py
index a5309bd4..9d57cfae 100644
--- a/functest/opnfv_tests/openstack/vping/vping_base.py
+++ b/functest/opnfv_tests/openstack/vping/vping_base.py
@@ -32,6 +32,8 @@ class VPingBase(testcase_base.TestcaseBase):
         self.image_name = CONST.vping_image_name
         self.image_filename = CONST.openstack_image_file_name
         self.image_format = CONST.openstack_image_disk_format
+        self.image_username = CONST.openstack_image_username
+        self.image_password = CONST.openstack_image_password
         self.image_path = os.path.join(CONST.dir_functest_data,
                                        self.image_filename)
 
diff --git a/functest/opnfv_tests/openstack/vping/vping_ssh.py b/functest/opnfv_tests/openstack/vping/vping_ssh.py
index b032c308..7a58a41f 100755
--- a/functest/opnfv_tests/openstack/vping/vping_ssh.py
+++ b/functest/opnfv_tests/openstack/vping/vping_ssh.py
@@ -61,8 +61,6 @@ class VPingSSH(vping_base.VPingBase):
     def establish_ssh(self, vm, floatip):
         self.logger.info("Trying to establish SSH connection to %s..."
                          % floatip)
-        username = 'cirros'
-        password = 'cubswin:)'
         ssh = paramiko.SSHClient()
         ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
@@ -73,8 +71,8 @@ class VPingSSH(vping_base.VPingBase):
         cidr_first_octet = self.private_subnet_cidr.split('.')[0]
         while timeout > 0:
             try:
-                ssh.connect(floatip, username=username,
-                            password=password, timeout=2)
+                ssh.connect(floatip, username=self.image_username,
+                            password=self.image_password, timeout=2)
                 self.logger.debug("SSH connection established to %s."
                                   % floatip)
                 break
diff --git a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
index 3708742b..c2198690 100644
--- a/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
+++ b/functest/opnfv_tests/sdn/onos/sfc/sfc_onos.py
@@ -10,6 +10,8 @@ from pexpect import pxssh
 
 import functest.utils.functest_logger as ft_logger
 
+from functest.utils.constants import CONST
+
 OK = 200
 CREATED = 201
 ACCEPTED = 202
@@ -99,6 +101,8 @@ class SfcOnos(object):
         self.ip_pool = 0
         self.vm_public_ip = []
         self.vm_public_id = []
+        self.cirros_username = CONST.openstack_image_username
+        self.cirros_password = CONST.openstack_image_password
         self.net_id1 = 0
         self.vm = []
         self.address = 0
@@ -628,9 +632,7 @@ class SfcOnos(object):
 
             s = pxssh.pxssh()
             hostname = self.vm_public_ip[0]
-            username = "cirros"
-            password = "cubswin:)"
-            s.login(hostname,  username,  password)
+            s.login(hostname,  self.cirros_username,  self.cirros_password)
             s.sendline("ping -c 5 " + str(self.port_ip[2]))
             s.prompt()             # match the prompt
 
@@ -644,9 +646,7 @@ class SfcOnos(object):
         def vm1(queue1):
             s = pxssh.pxssh()
             hostname = self.vm_public_ip[1]
-            username = "cirros"
-            password = "cubswin:)"
-            s.login(hostname,  username,  password)
+            s.login(hostname,  self.cirros_username,  self.cirros_password)
             s.sendline('sudo ./firewall')
             s.prompt()
             output_pack = s.before