cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 7563ed4
Date Wed, 27 May 2015 13:00:25 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d406e5b83 -> 7563ed46f


CLOUDSTACK-8506 extra check on unknown vlan

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>

This closes #306


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbebd2d3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbebd2d3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbebd2d3

Branch: refs/heads/master
Commit: bbebd2d314edc429b4a2172cb5550782f959f7b3
Parents: 646e0d9
Author: Daan Hoogland <daan.hoogland@gmail.com>
Authored: Tue May 26 16:22:28 2015 +0200
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Wed May 27 14:39:16 2015 +0200

----------------------------------------------------------------------
 .../com/cloud/configuration/ConfigurationManagerImpl.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbebd2d3/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 6c22ded..445ffde 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -37,6 +37,8 @@ import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroup;
 import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -85,7 +87,6 @@ import org.apache.cloudstack.region.dao.RegionDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.log4j.Logger;
 
 import com.cloud.alert.AlertManager;
 import com.cloud.api.ApiDBUtils;
@@ -3178,9 +3179,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                                 + otherVlanGateway + " ,and netmask " + otherVlanNetmask
                                 + ", Please specify the gateway/netmask if you want to extend
ip range" );
                     }
-                    if (NetUtils.ipRangesOverlap(startIP, endIP, otherVlanStartIP, otherVlanEndIP))
{
-                        throw new InvalidParameterValueException("The IP range already has
IPs that overlap with the new range." +
+                    if (!NetUtils.is31PrefixCidr(newCidr)) {
+                        if (NetUtils.ipRangesOverlap(startIP, endIP, otherVlanStartIP, otherVlanEndIP))
{
+                            throw new InvalidParameterValueException("The IP range already
has IPs that overlap with the new range." +
                                 " Please specify a different start IP/end IP.");
+                        }
                     }
                 }
             }


Mime
View raw message