cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [1/4] git commit: updated refs/heads/4.2 to e950b3a
Date Tue, 02 Jul 2013 13:52:48 GMT
Updated Branches:
  refs/heads/4.2 154618b75 -> e950b3a9f


CLOUDSTACK-3168: Resolved 'Object NoneType' issue.

Replaces ipaddress by ipaddress.ipaddress wherever required

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit b8d876fff806e33e859016c252bd208c1ea28c2d)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b275697
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b275697
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b275697

Branch: refs/heads/4.2
Commit: 3b2756974a5028810528f22f8ea2f86067cfbcb7
Parents: 8a41322
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Mon Jul 1 22:54:55 2013 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Tue Jul 2 19:21:14 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/3b275697/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,


Mime
View raw message