From 06b96d1ccf85455587d5098402de14c2930328f0 Mon Sep 17 00:00:00 2001 From: Alex Brett Date: Fri, 29 Aug 2014 15:45:31 +0100 Subject: [PATCH] CLOUDSTACK-7448 Fix test_delete_account and test_releaseIP CLOUDSTACK-4840 changed test_data.py to make the lbrule publicport be 22, instead of 2222. In doing so, this caused the following tests to fail, as they hit a problem where they tried to use port 22 for both the lbrule and for other purposes: integration.smoke.test_network.TestDeleteAccount.test_delete_account integration.smoke.test_network.TestReleaseIP.test_releaseIP The reason the change appears to have been made was that in test_lb_secondary_ip.py, despite setting up the load balancer using lbrule, the tests then used the SSH port from natrule to try and access the VM. By changing lbrule to use port 22 (the same as natrule) this avoided the problem. This patch updates test_lb_secondary_ip.py to use the SSH port in lbrule where necessary to access the VMs, and reverts the change to test_data.py --- .../component/test_lb_secondary_ip.py | 48 +++++++++---------- tools/marvin/marvin/config/test_data.py | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/test/integration/component/test_lb_secondary_ip.py b/test/integration/component/test_lb_secondary_ip.py index f54caa6678f..b1cb78a01ae 100644 --- a/test/integration/component/test_lb_secondary_ip.py +++ b/test/integration/component/test_lb_secondary_ip.py @@ -947,7 +947,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -982,7 +982,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -996,7 +996,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): with self.assertRaises(Exception): SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1027,7 +1027,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1038,7 +1038,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): with self.assertRaises(Exception): SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1072,7 +1072,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1087,7 +1087,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1123,7 +1123,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1138,7 +1138,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1172,7 +1172,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1190,7 +1190,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): with self.assertRaises(Exception): SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1223,7 +1223,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1251,7 +1251,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1284,7 +1284,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1295,7 +1295,7 @@ class TestLbRuleFunctioning(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1442,7 +1442,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1459,7 +1459,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1496,7 +1496,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1513,7 +1513,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1550,7 +1550,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1567,7 +1567,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1609,7 +1609,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1649,7 +1649,7 @@ class TestNetworkOperations(cloudstackTestCase): try: SshClient(self.public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) @@ -1812,7 +1812,7 @@ class TestExternalLoadBalancer(cloudstackTestCase): try: SshClient(public_ip.ipaddress.ipaddress, - self.testdata['natrule']["publicport"], + self.testdata['lbrule']["publicport"], self.virtual_machine.username, self.virtual_machine.password ) diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 5dee7833790..990496c2db3 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -715,7 +715,7 @@ test_data = { "name": "SSH", "alg": "roundrobin", "privateport": 22, - "publicport": 22, + "publicport": 2222, "protocol": 'TCP' }, "icmprule": {