apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

no default route sent for direct network

Browse Source
This commit is contained in:
Alex Huang 2010-12-30 17:20:48 -08:00
parent 0919b54488
commit 62702a2f41
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/com/cloud/configuration/Config.java
View File

@ -211,7 +211,7 @@ public enum Config {
SSOAuthTolerance("Advanced", ManagementServer.class, Long.class, "security.singlesignon.tolerance.millis", "300000", "The allowable clock difference in milliseconds between when an SSO login request is made and when it is received.", null),
//NetworkType("Hidden", ManagementServer.class, String.class, "network.type", "vlan", "The type of network that this deployment will use.", "vlan,direct"),
HashKey("Hidden", ManagementServer.class, String.class, "security.hash.key", null, "for generic key-ed hash", null),
UseNewNetwork("Hidden", NetworkManager.class, Boolean.class, "use.new.networking", "true", null, null);
DirectNetworkNoDefaultRoute("Hidden", ManagementServer.class, Boolean.class, "direct.network.no.default.route", "false", "Direct Network Dhcp Server should not send a default route", "true/false");
private final String _category;
private final Class<?> _componentClass;

36
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -133,6 +133,7 @@ import com.cloud.network.rules.FirewallRule;
import com.cloud.network.rules.PortForwardingRule;
import com.cloud.network.rules.RulesManager;
import com.cloud.offering.NetworkOffering;
import com.cloud.offering.NetworkOffering.GuestIpType;
import com.cloud.offerings.NetworkOfferingVO;
import com.cloud.offerings.dao.NetworkOfferingDao;
import com.cloud.service.ServiceOfferingVO;
@ -297,13 +298,13 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
private int _networkRate;
private int _multicastRate;
String _networkDomain;
boolean _noDefaultRouteForDirectNetwork;
private VMTemplateVO _template;
ScheduledExecutorService _executor;
Account _systemAcct;
boolean _useNewNetworking;
@Override
public DomainRouterVO getRouter(long accountId, long dataCenterId) {
@ -631,28 +632,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
@Override
public VirtualRouter stopRouter(StopRouterCmd cmd) throws InvalidParameterValueException, PermissionDeniedException,
ResourceUnavailableException, ConcurrentOperationException {
if (_useNewNetworking) {
return stopDomainRouter(cmd.getId());
}
Long routerId = cmd.getId();
Account account = UserContext.current().getCaller();
// verify parameters
DomainRouterVO router = _routerDao.findById(routerId);
if (router == null) {
throw new InvalidParameterValueException("Unable to find router with id " + routerId);
}
if ((account != null) && !_domainDao.isChildDomain(account.getDomainId(), router.getDomainId())) {
throw new PermissionDeniedException("Unable to stop router with id " + routerId + ". Permission denied");
}
boolean success = stopRouter(routerId);
if (success) {
return _routerDao.findById(routerId);
}
return null;
return stopDomainRouter(cmd.getId());
}
@DB
@ -872,9 +852,9 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
_routerTemplateId = _template.getId();
}
_useNewNetworking = Boolean.parseBoolean(configs.get("use.new.networking"));
_systemAcct = _accountService.getSystemAccount();
_noDefaultRouteForDirectNetwork = Boolean.parseBoolean(configs.get(Config.DirectNetworkNoDefaultRoute.key()));
s_logger.info("DomainRouterManager is configured.");
@ -1488,6 +1468,12 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
if (domain != null) {
buf.append(" domain=" + router.getDomain());
}
if (_noDefaultRouteForDirectNetwork && network.getGuestType() == GuestIpType.Direct) {
buf.append(" defaultroute=false");
} else {
buf.append(" defaultroute=true");
}
if (s_logger.isDebugEnabled()) {
s_logger.debug("Boot Args for " + profile + ": " + buf.toString());