Updated Branches: refs/heads/4.2 6752641cc -> 812f9442f
ipaddress is included Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit 248bea8b27b2ac0dbe00d7f12c72f0858f83746c) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/812f9442 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/812f9442 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/812f9442 Branch: refs/heads/4.2 Commit: 812f9442ffbac6ce66abb49eff0741168c474325 Parents: 6752641 Author: Prasanna Santhanam <[email protected]> Authored: Thu Jul 4 14:39:11 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Thu Jul 4 14:40:33 2013 +0530 ---------------------------------------------------------------------- test/integration/smoke/test_loadbalance.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/812f9442/test/integration/smoke/test_loadbalance.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py index 97bce10..8dd96e5 100644 --- a/test/integration/smoke/test_loadbalance.py +++ b/test/integration/smoke/test_loadbalance.py @@ -527,11 +527,11 @@ class TestLoadBalance(cloudstackTestCase): lb_rule.assign(self.apiclient, [self.vm_1, self.vm_2]) hostnames = [] - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) self.debug("Hostnames: %s" % str(hostnames)) self.assertIn( @@ -556,7 +556,7 @@ class TestLoadBalance(cloudstackTestCase): self.non_src_nat_ip.ipaddress, self.vm_1.id, )) - self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) self.assertIn( self.vm_1.name, @@ -571,11 +571,11 @@ class TestLoadBalance(cloudstackTestCase): # # Making hostnames list empty hostnames[:] = [] - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) - self.try_ssh(self.non_src_nat_ip, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) + self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames) self.debug("Hostnames: %s" % str(hostnames)) self.assertIn( self.vm_1.name,
