You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/24 18:24:07 UTC
[43/50] [abbrv] git commit: updated refs/heads/internallb to ca2fc30
LOUDSTACK-751: changed the way the code retrieves the blacklisted.routes config. Now it always reads it from the DB while before we used to load it only on the management server start, and the update happened only after MS restart
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba4b8f17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba4b8f17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba4b8f17
Branch: refs/heads/internallb
Commit: ba4b8f170569ea5e04cfdae37cee043aaa3ee3a6
Parents: 2712ddd
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Apr 23 12:19:14 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Apr 23 12:22:04 2013 -0700
----------------------------------------------------------------------
.../configuration/ConfigurationManagerImpl.java | 3 +-
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 53 ++++++---------
2 files changed, 22 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba4b8f17/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 a2a6291..d5e405d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -590,7 +590,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (route != null) {
String routeToVerify = route.trim();
if (!NetUtils.isValidCIDR(routeToVerify)) {
- throw new InvalidParameterValueException("Invalid value for blacklisted route: " + route);
+ throw new InvalidParameterValueException("Invalid value for blacklisted route: " + route + ". Valid format is list" +
+ " of cidrs separated by coma. Example: 10.1.1.0/24,192.168.0.0/24");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba4b8f17/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 425f551..224a680 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -39,11 +39,9 @@ import org.springframework.stereotype.Component;
import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager;
-import com.cloud.configuration.ConfigurationVO;
import com.cloud.configuration.Resource.ResourceType;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.dc.DataCenter;
-import com.cloud.dc.DataCenterVO;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.DataCenterDao;
@@ -187,9 +185,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
private List<VpcProvider> vpcElements = null;
private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp);
-
- private Map<Long, Set<String>> zoneBlackListedRoutes;
-
+
int _cleanupInterval;
int _maxNetworks;
SearchBuilder<IPAddressVO> IpAddressSearch;
@@ -240,26 +236,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
IpAddressSearch.join("virtualNetworkVlanSB", virtualNetworkVlanSB, IpAddressSearch.entity().getVlanId(), virtualNetworkVlanSB.entity().getId(), JoinBuilder.JoinType.INNER);
IpAddressSearch.done();
- //populate blacklisted routes
- List<DataCenterVO> zones = _dcDao.listAllZones();
- zoneBlackListedRoutes = new HashMap<Long, Set<String>>();
- for (DataCenterVO zone : zones) {
- List<ConfigurationVO> confs = _configServer.getConfigListByScope(Config.ConfigurationParameterScope.zone.toString(), zone.getId());
- for (ConfigurationVO conf : confs) {
- String routeStr = conf.getValue();
- if (conf.getName().equalsIgnoreCase(Config.BlacklistedRoutes.key()) && routeStr != null && !routeStr.isEmpty()) {
- String[] routes = routeStr.split(",");
- Set<String> cidrs = new HashSet<String>();
- for (String route : routes) {
- cidrs.add(route);
- }
-
- zoneBlackListedRoutes.put(zone.getId(), cidrs);
- break;
- }
- }
- }
-
return true;
}
@@ -1684,14 +1660,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
}
//3) Verify against blacklisted routes
- Set<String> cidrBlackList = zoneBlackListedRoutes.get(vpc.getZoneId());
-
- if (cidrBlackList != null && !cidrBlackList.isEmpty()) {
- for (String blackListedRoute : cidrBlackList) {
- if (NetUtils.isNetworksOverlap(blackListedRoute, cidr)) {
- throw new InvalidParameterValueException("The static gateway cidr overlaps with one of the blacklisted routes of the VPC zone");
- }
- }
+ if (isCidrBlacklisted(cidr, vpc.getZoneId())) {
+ throw new InvalidParameterValueException("The static gateway cidr overlaps with one of the blacklisted routes of the zone the VPC belongs to");
}
Transaction txn = Transaction.currentTxn();
@@ -1713,6 +1683,23 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
return newRoute;
}
+ protected boolean isCidrBlacklisted(String cidr, long zoneId) {
+ String routesStr = _configServer.getConfigValue(Config.BlacklistedRoutes.key(), Config.ConfigurationParameterScope.zone.toString(), zoneId);
+ if (routesStr != null && !routesStr.isEmpty()) {
+ String[] cidrBlackList = routesStr.split(",");
+
+ if (cidrBlackList != null && cidrBlackList.length > 0) {
+ for (String blackListedRoute : cidrBlackList) {
+ if (NetUtils.isNetworksOverlap(blackListedRoute, cidr)) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
@Override
public Pair<List<? extends StaticRoute>, Integer> listStaticRoutes(ListStaticRoutesCmd cmd) {
Long id = cmd.getId();