You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/25 17:19:09 UTC
[1/3] git commit: updated refs/heads/4.4 to 86aff86
Repository: cloudstack
Updated Branches:
refs/heads/4.4 3cdcf7793 -> 86aff86b7
CLOUDSTACK-6747 test to allow all cidrs on other end of vpc, public or
private
(cherry picked from commit 018b471ad300ea0987e52d6b42dde71387de8c5b)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce69bd70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce69bd70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce69bd70
Branch: refs/heads/4.4
Commit: ce69bd707d73d6a6baea0e9e19bb7f97135e297a
Parents: 3cdcf77
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jun 25 14:59:14 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 25 17:17:39 2014 +0200
----------------------------------------------------------------------
utils/src/com/cloud/utils/net/NetUtils.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce69bd70/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index 97a66f1..efb5ae5 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -1175,6 +1175,15 @@ public class NetUtils {
return true;
}
+ public static boolean isValidCidrList(String cidrList) {
+ for (String guestCidr : cidrList.split(",")) {
+ if (!isValidCIDR(guestCidr)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
public static boolean validateGuestCidrList(String guestCidrList) {
for (String guestCidr : guestCidrList.split(",")) {
if (!validateGuestCidr(guestCidr)) {
[3/3] git commit: updated refs/heads/4.4 to 86aff86
Posted by da...@apache.org.
CLOUDSTACK-6747: call a more forgiving test on the supplied peer
cidr-list
(cherry picked from commit 17850c7aff432a504d65a34d2f22ca7e1952a770)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86aff86b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86aff86b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86aff86b
Branch: refs/heads/4.4
Commit: 86aff86b7872485d7068c4b8ee2c759d54b2112f
Parents: 8cb2a87
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Jun 25 15:45:28 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 25 17:18:45 2014 +0200
----------------------------------------------------------------------
.../api/command/user/vpn/CreateVpnCustomerGatewayCmd.java | 4 ++--
.../com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86aff86b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
index 6967ff4..46ad92f 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/CreateVpnCustomerGatewayCmd.java
@@ -48,7 +48,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
private String gatewayIp;
@Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.STRING, required = true, description = "guest cidr list of the customer gateway")
- private String guestCidrList;
+ private String peerCidrList;
@Parameter(name = ApiConstants.IPSEC_PSK, type = CommandType.STRING, required = true, description = "IPsec Preshared-Key of the customer gateway")
private String ipsecPsk;
@@ -97,7 +97,7 @@ public class CreateVpnCustomerGatewayCmd extends BaseAsyncCmd {
}
public String getGuestCidrList() {
- return guestCidrList;
+ return peerCidrList;
}
public String getGatewayIp() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86aff86b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index 8edab62..a470ba1 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -185,9 +185,9 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
if (name == null) {
name = "VPN-" + gatewayIp;
}
- String guestCidrList = cmd.getGuestCidrList();
- if (!NetUtils.validateGuestCidrList(guestCidrList)) {
- throw new InvalidParameterValueException("The customer gateway guest cidr list " + guestCidrList + " is invalid guest cidr!");
+ String peerCidrList = cmd.getGuestCidrList();
+ if (!NetUtils.isValidCidrList(peerCidrList)) {
+ throw new InvalidParameterValueException("The customer gateway peer cidr list " + peerCidrList + " contains an invalid cidr!");
}
String ipsecPsk = cmd.getIpsecPsk();
String ikePolicy = cmd.getIkePolicy();
@@ -228,10 +228,10 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
throw new InvalidParameterValueException("The customer gateway with name " + name + " already existed!");
}
- checkCustomerGatewayCidrList(guestCidrList);
+ checkCustomerGatewayCidrList(peerCidrList);
Site2SiteCustomerGatewayVO gw =
- new Site2SiteCustomerGatewayVO(name, accountId, owner.getDomainId(), gatewayIp, guestCidrList, ipsecPsk, ikePolicy, espPolicy, ikeLifetime, espLifetime, dpd);
+ new Site2SiteCustomerGatewayVO(name, accountId, owner.getDomainId(), gatewayIp, peerCidrList, ipsecPsk, ikePolicy, espPolicy, ikeLifetime, espLifetime, dpd);
_customerGatewayDao.persist(gw);
return gw;
}
[2/3] git commit: updated refs/heads/4.4 to 86aff86
Posted by da...@apache.org.
CLOUDSTACK-6747 test for test to allow all cidrs on other end of a vpc
(cherry picked from commit 3268f5bd1f2175ccd919ee7195d69b05d5b3f3e2)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8cb2a878
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8cb2a878
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8cb2a878
Branch: refs/heads/4.4
Commit: 8cb2a878156b5a78991869a565e84ff62b61da93
Parents: ce69bd7
Author: Daan Hoogland <da...@onecht.net>
Authored: Wed Jun 25 17:09:19 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 25 17:18:07 2014 +0200
----------------------------------------------------------------------
utils/test/com/cloud/utils/net/NetUtilsTest.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8cb2a878/utils/test/com/cloud/utils/net/NetUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/test/com/cloud/utils/net/NetUtilsTest.java b/utils/test/com/cloud/utils/net/NetUtilsTest.java
index cd5109c..96c3baf 100644
--- a/utils/test/com/cloud/utils/net/NetUtilsTest.java
+++ b/utils/test/com/cloud/utils/net/NetUtilsTest.java
@@ -231,6 +231,17 @@ public class NetUtilsTest {
}
@Test
+ public void testIsValidCidrList() throws Exception {
+ String cidrFirst = "10.0.144.0/20,1.2.3.4/32,5.6.7.8/24";
+ String cidrSecond = "10.0.151.0/20,129.0.0.0/4";
+ String cidrThird = "10.0.144.0/21";
+
+ assertTrue(NetUtils.isValidCidrList(cidrFirst));
+ assertTrue(NetUtils.isValidCidrList(cidrSecond));
+ assertTrue(NetUtils.isValidCidrList(cidrThird));
+ }
+
+ @Test
public void testIsSameIpRange() {
String cidrFirst = "10.0.144.0/20";
String cidrSecond = "10.0.151.0/20";