CLOUDSTACK-3168: Change in try_ssh function Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit e25cbd66d2b13db684f2f339b05aafa6b119bcfe)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2d9a7b6 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2d9a7b6 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2d9a7b6 Branch: refs/heads/4.2 Commit: f2d9a7b659087e599494ca98f7cfed2721179c49 Parents: af9a8de Author: Gaurav Aradhye <[email protected]> Authored: Tue Jul 16 03:08:55 2013 -0400 Committer: Prasanna Santhanam <[email protected]> Committed: Thu Jul 18 15:06:33 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_loadbalance.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f2d9a7b6/test/integration/smoke/test_loadbalance.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py index 7bf560c..4e1f0c1 100644 --- a/test/integration/smoke/test_loadbalance.py +++ b/test/integration/smoke/test_loadbalance.py @@ -188,17 +188,17 @@ class TestLoadBalance(cloudstackTestCase): cleanup_resources(cls.api_client, cls._cleanup) return - def try_ssh(self, src_nat_ip_addr, hostnames): + def try_ssh(self, ip_addr, hostnames): try: self.debug( "SSH into VM (IPaddress: %s) & NAT Rule (Public IP: %s)" % - (self.vm_1.ipaddress, src_nat_ip_addr.ipaddress) + (self.vm_1.ipaddress, ip_addr) ) # If Round Robin Algorithm is chosen, # each ssh command should alternate between VMs ssh_1 = remoteSSHClient( - src_nat_ip_addr.ipaddress, + ip_addr, self.services['lbrule']["publicport"], self.vm_1.username, self.vm_1.password @@ -207,7 +207,7 @@ class TestLoadBalance(cloudstackTestCase): self.debug(hostnames) except Exception as e: self.fail("%s: SSH failed for VM with IP Address: %s" % - (e, src_nat_ip_addr.ipaddress)) + (e, ip_addr)) time.sleep(self.services["lb_switch_wait"]) return
