You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/12/23 12:21:47 UTC
[18/19] git commit: updated refs/heads/4.9 to 20986ba
CLOUDSTACK-9688: Fix VR smoke test failure in vpc_vpn
The test_vpc_vpn uses a cidr that overlaps with the base test environment's
CIDR causing intermittent failure. This changes the cidr to not overlap
with underlying infra and avoid future failures.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b25bb10c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b25bb10c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b25bb10c
Branch: refs/heads/4.9
Commit: b25bb10c5905506f37d5ddf9576aa40247a25d18
Parents: cdbe847
Author: Murali Reddy <mu...@shapeblue.com>
Authored: Fri Dec 23 14:46:36 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Dec 23 14:46:36 2016 +0530
----------------------------------------------------------------------
test/integration/smoke/test_vpc_vpn.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b25bb10c/test/integration/smoke/test_vpc_vpn.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_vpc_vpn.py b/test/integration/smoke/test_vpc_vpn.py
index 966f40d..ddf7693 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -168,7 +168,7 @@ class Services:
"vpc2": {
"name": "TestVPC",
"displaytext": "VPC2",
- "cidr": '10.2.0.0/16'
+ "cidr": '10.3.0.0/16'
},
"network_1": {
"name": "Test Network",
@@ -180,13 +180,13 @@ class Services:
"name": "Test Network",
"displaytext": "Test Network",
"netmask": '255.255.255.0',
- "gateway": "10.2.1.1"
+ "gateway": "10.3.1.1"
},
"vpn": {
"vpn_user": "root",
"vpn_pass": "Md1s#dc",
"vpn_pass_fail": "abc!123", # too short
- "iprange": "10.2.2.1-10.2.2.10",
+ "iprange": "10.3.2.1-10.3.2.10",
"fordisplay": "true"
},
"vpncustomergateway": {