cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [3/6] git commit: updated refs/heads/master to 18fbbcf
Date Mon, 22 Jul 2013 17:22:56 GMT
CLOUDSTACK-3679: Added subsequent change that was needed after change in try_ssh function

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


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

Branch: refs/heads/master
Commit: e245718837c30caa651d3d5017256adb810602b9
Parents: d2c1ed4
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Sun Jul 21 21:34:12 2013 -0400
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jul 22 19:36:27 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_loadbalance.py | 54 ++++++++++++-------------
 1 file changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2457188/test/integration/smoke/test_loadbalance.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py
index 4e1f0c1..f5405da 100644
--- a/test/integration/smoke/test_loadbalance.py
+++ b/test/integration/smoke/test_loadbalance.py
@@ -323,11 +323,11 @@ class TestLoadBalance(cloudstackTestCase):
 
 
         hostnames = []
-        self.try_ssh(src_nat_ip_addr, hostnames)
-        self.try_ssh(src_nat_ip_addr, hostnames)
-        self.try_ssh(src_nat_ip_addr, hostnames)
-        self.try_ssh(src_nat_ip_addr, hostnames)
-        self.try_ssh(src_nat_ip_addr, hostnames)
+        self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
+        self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
+        self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
+        self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
+        self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
 
         self.debug("Hostnames: %s" % str(hostnames))
         self.assertIn(
@@ -354,7 +354,7 @@ class TestLoadBalance(cloudstackTestCase):
                                              self.vm_2.id
                                              ))
 
-            self.try_ssh(src_nat_ip_addr, hostnames)
+            self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
             self.assertIn(
                           self.vm_1.name,
                           hostnames,
@@ -368,7 +368,7 @@ class TestLoadBalance(cloudstackTestCase):
 
         with self.assertRaises(Exception):
             self.debug("Removed all VMs, trying to SSH")
-            self.try_ssh(src_nat_ip_addr, hostnames)
+            self.try_ssh(src_nat_ip_addr.ipaddress, hostnames)
         return
 
     @attr(tags = ["advanced", "advancedns", "smoke"])
@@ -440,11 +440,11 @@ class TestLoadBalance(cloudstackTestCase):
         )
         try:
             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.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
 
             self.debug("Hostnames: %s" % str(hostnames))
             self.assertIn(
@@ -468,7 +468,7 @@ class TestLoadBalance(cloudstackTestCase):
             # Making host list empty
             hostnames[:] = []
 
-            self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
             self.assertIn(
                 self.vm_1.name,
                 hostnames,
@@ -486,7 +486,7 @@ class TestLoadBalance(cloudstackTestCase):
                            self.non_src_nat_ip.ipaddress.ipaddress,
                            self.vm_1.id
                            ))
-            self.try_ssh(self.non_src_nat_ip, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
         return
 
     @attr(tags = ["advanced", "advancedns", "smoke"])
@@ -535,11 +535,11 @@ class TestLoadBalance(cloudstackTestCase):
         lb_rule.assign(self.apiclient, [self.vm_1, self.vm_2])
 
         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.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
 
         self.debug("Hostnames: %s" % str(hostnames))
         self.assertIn(
@@ -561,10 +561,10 @@ class TestLoadBalance(cloudstackTestCase):
         try:
             self.debug("SSHing again into IP address: %s with VM (ID: %s) added to LB rule"
%
                                             (
-                                             self.non_src_nat_ip.ipaddress,
+                                             self.non_src_nat_ip.ipaddress.ipaddress,
                                              self.vm_1.id,
                                              ))
-            self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+            self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
 
             self.assertIn(
                           self.vm_1.name,
@@ -573,17 +573,17 @@ class TestLoadBalance(cloudstackTestCase):
                           )
         except Exception as e:
             self.fail("SSH failed for VM with IP: %s" %
-                                    self.non_src_nat_ip.ipaddress)
+                                    self.non_src_nat_ip.ipaddress.ipaddress)
 
         lb_rule.assign(self.apiclient, [self.vm_3])
 
 #        # Making hostnames list empty
         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.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
+        self.try_ssh(self.non_src_nat_ip.ipaddress.ipaddress, hostnames)
         self.debug("Hostnames: %s" % str(hostnames))
         self.assertIn(
                   self.vm_1.name,


Mime
View raw message