You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/07/04 00:25:41 UTC
[02/50] [abbrv] git commit: updated refs/heads/vmsync to 78fa5e1
CLOUDSTACK-3168: Resolved 'Object NoneType' issue.
Replaces ipaddress by ipaddress.ipaddress wherever required
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8d876ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8d876ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8d876ff
Branch: refs/heads/vmsync
Commit: b8d876fff806e33e859016c252bd208c1ea28c2d
Parents: 2da3be7
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon Jul 1 22:54:55 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 15:33:20 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8d876ff/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 6788dca..ca67121 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -551,9 +551,9 @@ class TestPortForwarding(cloudstackTestCase):
self.debug("SSHing into VM with IP address %s with NAT IP %s" %
(
self.virtual_machine.ipaddress,
- ip_address.ipaddress
+ ip_address.ipaddress.ipaddress
))
- self.virtual_machine.get_ssh_client(ip_address.ipaddress)
+ self.virtual_machine.get_ssh_client(ip_address.ipaddress.ipaddress)
except Exception as e:
self.fail(
"SSH Access failed for %s: %s" % \
@@ -577,7 +577,7 @@ class TestPortForwarding(cloudstackTestCase):
self.virtual_machine.ipaddress)
remoteSSHClient(
- ip_address.ipaddress,
+ ip_address.ipaddress.ipaddress,
self.virtual_machine.ssh_port,
self.virtual_machine.username,
self.virtual_machine.password
@@ -956,11 +956,11 @@ class TestLoadBalancingRule(cloudstackTestCase):
)
try:
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(
@@ -985,7 +985,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
# Making host list empty
hostnames[:] = []
- 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,
hostnames,