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:10 UTC
[03/20] git commit: updated refs/heads/master to a9f45df
CLOUDSTACK-9639: Unable to create shared network with vLan isolation
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25efc1ac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25efc1ac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25efc1ac
Branch: refs/heads/master
Commit: 25efc1acd6ee5b14244b5000643f388b5414c300
Parents: f03015b
Author: Nitin Kumar Maharana <ni...@accelerite.com>
Authored: Wed Dec 7 13:29:30 2016 +0530
Committer: Nitin Kumar Maharana <ni...@accelerite.com>
Committed: Fri Dec 9 12:55:31 2016 +0530
----------------------------------------------------------------------
.../com/cloud/configuration/ConfigurationManagerImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25efc1ac/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index f8a1fac..c70d7a1 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3052,12 +3052,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// Check if the new VLAN's subnet conflicts with the guest network
// in
// the specified zone (guestCidr is null for basic zone)
+ // when adding shared network with same cidr of zone guest cidr,
+ // if the specified vlan is not present in zone, physical network, allow to create the network as the isolation is based on VLAN.
final String guestNetworkCidr = zone.getGuestNetworkCidr();
- if (guestNetworkCidr != null) {
- if (NetUtils.isNetworksOverlap(newCidr, guestNetworkCidr)) {
- throw new InvalidParameterValueException("The new IP range you have specified has overlapped with the guest network in zone: " + zone.getName()
- + ". Please specify a different gateway/netmask.");
- }
+ if (guestNetworkCidr != null && NetUtils.isNetworksOverlap(newCidr, guestNetworkCidr) && _zoneDao.findVnet(zoneId, physicalNetworkId, vlanId).isEmpty() != true) {
+ throw new InvalidParameterValueException("The new IP range you have specified has overlapped with the guest network in zone: " + zone.getName()
+ + "along with existing Vlan also. Please specify a different gateway/netmask");
}
// Check if there are any errors with the IP range