You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/09/04 23:47:42 UTC
git commit: updated refs/heads/master to 06b96d1
Repository: cloudstack
Updated Branches:
refs/heads/master 78ce5ea2d -> 06b96d1cc
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06b96d1c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06b96d1c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06b96d1c
Branch: refs/heads/master
Commit: 06b96d1ccf85455587d5098402de14c2930328f0
Parents: 78ce5ea
Author: Alex Brett <al...@citrix.com>
Authored: Fri Aug 29 15:45:31 2014 +0100
Committer: Sangeetha Hariharan <sa...@citrix.com>
Committed: Thu Sep 4 17:19:08 2014 -0700
----------------------------------------------------------------------
.../component/test_lb_secondary_ip.py | 48 ++++++++++----------
tools/marvin/marvin/config/test_data.py | 2 +-
2 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06b96d1c/test/integration/component/test_lb_secondary_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_lb_secondary_ip.py b/test/integration/component/test_lb_secondary_ip.py
index f54caa6..b1cb78a 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
)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06b96d1c/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 5dee783..990496c 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": {