You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/05/27 15:00:25 UTC
[1/2] git commit: updated refs/heads/master to 7563ed4
Repository: cloudstack
Updated Branches:
refs/heads/master d406e5b83 -> 7563ed46f
CLOUDSTACK-8506 extra check on unknown vlan
Signed-off-by: wilderrodrigues <wr...@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 <da...@gmail.com>
Authored: Tue May 26 16:22:28 2015 +0200
Committer: wilderrodrigues <wr...@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.");
+ }
}
}
}
[2/2] git commit: updated refs/heads/master to 7563ed4
Posted by ek...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7563ed46
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7563ed46
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7563ed46
Branch: refs/heads/master
Commit: 7563ed46fe1367b2b6467c9e5b4988b6cdd2fb74
Parents: bbebd2d d406e5b
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Wed May 27 14:59:27 2015 +0200
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed May 27 14:59:27 2015 +0200
----------------------------------------------------------------------
.../maint/testpath_disable_enable_zone.py | 253 +++++++++++--------
1 file changed, 145 insertions(+), 108 deletions(-)
----------------------------------------------------------------------