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 2014/01/07 19:25:34 UTC
git commit: updated refs/heads/master to cb0c146
Updated Branches:
refs/heads/master ab3a2c20c -> cb0c14671
CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb0c1467
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb0c1467
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb0c1467
Branch: refs/heads/master
Commit: cb0c14671abd01c91492444ae5c9b6393af2904a
Parents: ab3a2c2
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Tue Jan 7 10:15:06 2014 -0800
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Tue Jan 7 10:20:30 2014 -0800
----------------------------------------------------------------------
.../configuration/ConfigurationManagerImpl.java | 444 +++++++++----------
utils/src/com/cloud/utils/net/NetUtils.java | 42 +-
2 files changed, 236 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb0c1467/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 ee7a660..70ab196 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -36,8 +36,6 @@ 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,6 +83,7 @@ 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;
@@ -403,14 +402,13 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (localCidrs.length > 0) {
s_logger.warn("Management network CIDR is not configured originally. Set it default to " + localCidrs[0]);
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0),
- "Management network CIDR is not configured originally. Set it default to " +
- localCidrs[0], "");
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management network CIDR is not configured originally. Set it default to "
+ + localCidrs[0], "");
_configDao.update(Config.ManagementNetwork.key(), Config.ManagementNetwork.getCategory(), localCidrs[0]);
} else {
s_logger.warn("Management network CIDR is not properly configured and we are not able to find a default setting");
_alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0),
- "Management network CIDR is not properly configured and we are not able to find a default setting", "");
+ "Management network CIDR is not properly configured and we are not able to find a default setting", "");
}
}
@@ -439,53 +437,53 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// global parameter updation
if (scope != null && !scope.isEmpty() && !ConfigKey.Scope.Global.toString().equalsIgnoreCase(scope)) {
switch (ConfigKey.Scope.valueOf(scope)) {
- case Zone:
- DataCenterVO zone = _zoneDao.findById(resourceId);
- if (zone == null) {
- throw new InvalidParameterValueException("unable to find zone by id " + resourceId);
- }
- _dcDetailsDao.addDetail(resourceId, name, value);
- break;
- case Cluster:
- ClusterVO cluster = _clusterDao.findById(resourceId);
- if (cluster == null) {
- throw new InvalidParameterValueException("unable to find cluster by id " + resourceId);
- }
- ClusterDetailsVO clusterDetailsVO = _clusterDetailsDao.findDetail(resourceId, name);
- if (clusterDetailsVO == null) {
- clusterDetailsVO = new ClusterDetailsVO(resourceId, name, value);
- _clusterDetailsDao.persist(clusterDetailsVO);
- } else {
- clusterDetailsVO.setValue(value);
- _clusterDetailsDao.update(clusterDetailsVO.getId(), clusterDetailsVO);
- }
- break;
+ case Zone:
+ DataCenterVO zone = _zoneDao.findById(resourceId);
+ if (zone == null) {
+ throw new InvalidParameterValueException("unable to find zone by id " + resourceId);
+ }
+ _dcDetailsDao.addDetail(resourceId, name, value);
+ break;
+ case Cluster:
+ ClusterVO cluster = _clusterDao.findById(resourceId);
+ if (cluster == null) {
+ throw new InvalidParameterValueException("unable to find cluster by id " + resourceId);
+ }
+ ClusterDetailsVO clusterDetailsVO = _clusterDetailsDao.findDetail(resourceId, name);
+ if (clusterDetailsVO == null) {
+ clusterDetailsVO = new ClusterDetailsVO(resourceId, name, value);
+ _clusterDetailsDao.persist(clusterDetailsVO);
+ } else {
+ clusterDetailsVO.setValue(value);
+ _clusterDetailsDao.update(clusterDetailsVO.getId(), clusterDetailsVO);
+ }
+ break;
- case StoragePool:
- StoragePoolVO pool = _storagePoolDao.findById(resourceId);
- if (pool == null) {
- throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId);
- }
- _storagePoolDetailsDao.addDetail(resourceId, name, value);
+ case StoragePool:
+ StoragePoolVO pool = _storagePoolDao.findById(resourceId);
+ if (pool == null) {
+ throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId);
+ }
+ _storagePoolDetailsDao.addDetail(resourceId, name, value);
- break;
+ break;
- case Account:
- AccountVO account = _accountDao.findById(resourceId);
- if (account == null) {
- throw new InvalidParameterValueException("unable to find account by id " + resourceId);
- }
- AccountDetailVO accountDetailVO = _accountDetailsDao.findDetail(resourceId, name);
- if (accountDetailVO == null) {
- accountDetailVO = new AccountDetailVO(resourceId, name, value);
- _accountDetailsDao.persist(accountDetailVO);
- } else {
- accountDetailVO.setValue(value);
- _accountDetailsDao.update(accountDetailVO.getId(), accountDetailVO);
- }
- break;
- default:
- throw new InvalidParameterValueException("Scope provided is invalid");
+ case Account:
+ AccountVO account = _accountDao.findById(resourceId);
+ if (account == null) {
+ throw new InvalidParameterValueException("unable to find account by id " + resourceId);
+ }
+ AccountDetailVO accountDetailVO = _accountDetailsDao.findDetail(resourceId, name);
+ if (accountDetailVO == null) {
+ accountDetailVO = new AccountDetailVO(resourceId, name, value);
+ _accountDetailsDao.persist(accountDetailVO);
+ } else {
+ accountDetailVO.setValue(value);
+ _accountDetailsDao.update(accountDetailVO.getId(), accountDetailVO);
+ }
+ break;
+ default:
+ throw new InvalidParameterValueException("Scope provided is invalid");
}
return value;
}
@@ -599,8 +597,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
Long clusterId = cmd.getClusterId();
Long storagepoolId = cmd.getStoragepoolId();
Long accountId = cmd.getAccountId();
- CallContext.current().setEventDetails(
- " Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" : (((value == null) ? "" : value))));
+ CallContext.current().setEventDetails(" Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" : (((value == null) ? "" : value))));
// check if config value exists
ConfigurationVO config = _configDao.findByName(name);
String catergory = null;
@@ -781,8 +778,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 + ". Valid format is list" +
- " of cidrs separated by coma. Example: 10.1.1.0/24,192.168.0.0/24");
+ 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");
}
}
}
@@ -862,8 +859,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
String errorMsg = table.get(2);
String dbName;
- if (tableName.equals("event") || tableName.equals("cloud_usage") || tableName.equals("usage_vm_instance") || tableName.equals("usage_ip_address") ||
- tableName.equals("usage_network") || tableName.equals("usage_job") || tableName.equals("account") || tableName.equals("user_statistics")) {
+ if (tableName.equals("event") || tableName.equals("cloud_usage") || tableName.equals("usage_vm_instance") || tableName.equals("usage_ip_address")
+ || tableName.equals("usage_network") || tableName.equals("usage_job") || tableName.equals("account") || tableName.equals("user_statistics")) {
dbName = "cloud_usage";
} else {
dbName = "cloud";
@@ -890,7 +887,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
private void checkPodAttributes(long podId, String podName, long zoneId, String gateway, String cidr, String startIp, String endIp, String allocationStateStr,
- boolean checkForDuplicates, boolean skipGatewayOverlapCheck) {
+ boolean checkForDuplicates, boolean skipGatewayOverlapCheck) {
if (checkForDuplicates) {
// Check if the pod already exists
if (validPod(podName, zoneId)) {
@@ -1180,7 +1177,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
public Pod createPod(long zoneId, String name, String startIp, String endIp, String gateway, String netmask, String allocationState) {
+ // Check if the gateway is a valid IP address
+ if (!NetUtils.isValidIp(gateway)) {
+ throw new InvalidParameterValueException("The gateway is invalid");
+ }
+
+ if (!NetUtils.isValidNetmask(netmask)) {
+ throw new InvalidParameterValueException("The netmask is invalid");
+ }
+
String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask);
+
Long userId = CallContext.current().getCallingUserId();
if (allocationState == null) {
@@ -1191,8 +1198,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
- public HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp,
- String allocationStateStr, boolean skipGatewayOverlapCheck) {
+ public HostPodVO createPod(long userId, String podName, final long zoneId, String gateway, String cidr, final String startIp, String endIp, String allocationStateStr,
+ boolean skipGatewayOverlapCheck) {
// Check if the zone is valid
if (!validZone(zoneId)) {
@@ -1354,7 +1361,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
private void checkZoneParameters(String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, boolean checkForDuplicates, Long domainId,
- String allocationStateStr, String ip6Dns1, String ip6Dns2) {
+ String allocationStateStr, String ip6Dns1, String ip6Dns2) {
if (checkForDuplicates) {
// Check if a zone with the specified name already exists
if (validZone(zoneName)) {
@@ -1541,7 +1548,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
String value = (String)detail.get("value");
if ((key == null) || (value == null)) {
throw new InvalidParameterValueException(
- "Invalid Zone Detail specified, fields 'key' and 'value' cannot be null, please specify details in the form: details[0].key=XXX&details[0].value=YYY");
+ "Invalid Zone Detail specified, fields 'key' and 'value' cannot be null, please specify details in the form: details[0].key=XXX&details[0].value=YYY");
}
// validate the zone detail keys are known keys
/*
@@ -1558,8 +1565,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
for (String dom : dnsSearchOrder) {
if (!NetUtils.verifyDomainName(dom)) {
throw new InvalidParameterValueException(
- "Invalid network domain suffixes. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
- + "and the hyphen ('-'); can't start or end with \"-\"");
+ "Invalid network domain suffixes. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'); can't start or end with \"-\"");
}
}
newDetails.put(ZoneConfig.DnsSearchOrder.getName(), StringUtils.join(dnsSearchOrder, ","));
@@ -1621,8 +1628,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (networkDomain != null && !networkDomain.isEmpty()) {
if (!NetUtils.verifyDomainName(networkDomain)) {
throw new InvalidParameterValueException(
- "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
- + "and the hyphen ('-'); can't start or end with \"-\"");
+ "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'); can't start or end with \"-\"");
}
}
@@ -1683,10 +1690,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} catch (InvalidParameterValueException noStorage) {
PhysicalNetworkTrafficTypeVO mgmtTraffic = _trafficTypeDao.findBy(mgmtPhyNetwork.getId(), TrafficType.Management);
_networkSvc.addTrafficTypeToPhysicalNetwork(mgmtPhyNetwork.getId(), TrafficType.Storage.toString(), mgmtTraffic.getXenNetworkLabel(),
- mgmtTraffic.getKvmNetworkLabel(), mgmtTraffic.getVmwareNetworkLabel(), mgmtTraffic.getSimulatorNetworkLabel(), mgmtTraffic.getVlan(),
- mgmtTraffic.getHypervNetworkLabel());
- s_logger.info("No storage traffic type was specified by admin, create default storage traffic on physical network " +
- mgmtPhyNetwork.getId() + " with same configure of management traffic type");
+ mgmtTraffic.getKvmNetworkLabel(), mgmtTraffic.getVmwareNetworkLabel(), mgmtTraffic.getSimulatorNetworkLabel(), mgmtTraffic.getVlan(),
+ mgmtTraffic.getHypervNetworkLabel());
+ s_logger.info("No storage traffic type was specified by admin, create default storage traffic on physical network " + mgmtPhyNetwork.getId()
+ + " with same configure of management traffic type");
}
} catch (InvalidParameterValueException ex) {
throw new InvalidParameterValueException("Cannot enable this Zone since: " + ex.getMessage());
@@ -1735,8 +1742,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
public DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain,
- final Long domainId, NetworkType zoneType, String allocationStateStr, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled,
- String ip6Dns1, String ip6Dns2) {
+ final Long domainId, NetworkType zoneType, String allocationStateStr, String networkDomain, boolean isSecurityGroupEnabled, boolean isLocalStorageEnabled,
+ String ip6Dns1, String ip6Dns2) {
// checking the following params outside checkzoneparams method as we do
// not use these params for updatezone
@@ -1749,8 +1756,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (networkDomain != null) {
if (!NetUtils.verifyDomainName(networkDomain)) {
throw new InvalidParameterValueException(
- "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
- + "and the hyphen ('-'); can't start or end with \"-\"");
+ "Invalid network domain. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', "
+ + "and the hyphen ('-'); can't start or end with \"-\"");
}
}
@@ -1760,8 +1767,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
String zoneToken = UUID.nameUUIDFromBytes(bytes).toString();
// Create the new zone in the database
- final DataCenterVO zoneFinal =
- new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, guestCidr, domain, domainId, zoneType, zoneToken, networkDomain,
+ final DataCenterVO zoneFinal = new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, guestCidr, domain, domainId, zoneType, zoneToken, networkDomain,
isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2);
if (allocationStateStr != null && !allocationStateStr.isEmpty()) {
Grouping.AllocationState allocationState = Grouping.AllocationState.valueOf(allocationStateStr);
@@ -1912,8 +1918,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
isSecurityGroupEnabled = true;
}
- return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, guestCidr, domainVO != null ? domainVO.getName() : null, domainId, zoneType,
- allocationState, networkDomain, isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2);
+ return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, guestCidr, domainVO != null ? domainVO.getName() : null, domainId, zoneType, allocationState,
+ networkDomain, isSecurityGroupEnabled, isLocalStorageEnabled, ip6Dns1, ip6Dns2);
}
@Override
@@ -1985,8 +1991,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} else if (VirtualMachine.Type.InternalLoadBalancerVm.toString().toLowerCase().equals(vmTypeString)) {
vmType = VirtualMachine.Type.InternalLoadBalancerVm;
} else {
- throw new InvalidParameterValueException("Invalid systemVmType. Supported types are: " + VirtualMachine.Type.DomainRouter + ", " +
- VirtualMachine.Type.ConsoleProxy + ", " + VirtualMachine.Type.SecondaryStorageVm);
+ throw new InvalidParameterValueException("Invalid systemVmType. Supported types are: " + VirtualMachine.Type.DomainRouter + ", " + VirtualMachine.Type.ConsoleProxy
+ + ", " + VirtualMachine.Type.SecondaryStorageVm);
}
} else {
allowNetworkRate = true;
@@ -1994,8 +2000,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
if (cmd.getNetworkRate() != null && !allowNetworkRate) {
- throw new InvalidParameterValueException(
- "Network rate can be specified only for non-System offering and system offerings having \"domainrouter\" systemvmtype");
+ throw new InvalidParameterValueException("Network rate can be specified only for non-System offering and system offerings having \"domainrouter\" systemvmtype");
}
if (cmd.getDeploymentPlanner() != null) {
@@ -2009,19 +2014,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
- return createServiceOffering(userId, cmd.getIsSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(),
- localStorageRequired, offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainId(), cmd.getHostTag(), cmd.getNetworkRate(), cmd.getDeploymentPlanner(),
- cmd.getDetails(), cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate());
+ return createServiceOffering(userId, cmd.getIsSystem(), vmType, cmd.getServiceOfferingName(), cpuNumber, memory, cpuSpeed, cmd.getDisplayText(), localStorageRequired,
+ offerHA, limitCpuUse, volatileVm, cmd.getTags(), cmd.getDomainId(), cmd.getHostTag(), cmd.getNetworkRate(), cmd.getDeploymentPlanner(), cmd.getDetails(),
+ cmd.getBytesReadRate(), cmd.getBytesWriteRate(), cmd.getIopsReadRate(), cmd.getIopsWriteRate());
}
- protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vmType, String name, Integer cpu, Integer ramSize,
- Integer speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String tags, Long domainId,
- String hostTag, Integer networkRate, String deploymentPlanner, Map<String, String> details, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate,
- Long iopsWriteRate) {
+ protected ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMachine.Type vmType, String name, Integer cpu, Integer ramSize, Integer speed,
+ String displayText, boolean localStorageRequired, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String tags, Long domainId, String hostTag,
+ Integer networkRate, String deploymentPlanner, Map<String, String> details, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate, Long iopsWriteRate) {
tags = StringUtils.cleanupTags(tags);
- ServiceOfferingVO offering =
- new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, null, offerHA, limitResourceUse, volatileVm, displayText, localStorageRequired, false, tags,
- isSystem, vmType, domainId, hostTag, deploymentPlanner);
+ ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, null, offerHA, limitResourceUse, volatileVm, displayText, localStorageRequired,
+ false, tags, isSystem, vmType, domainId, hostTag, deploymentPlanner);
if ((bytesReadRate != null) && (bytesReadRate > 0))
offering.setBytesReadRate(bytesReadRate);
if ((bytesWriteRate != null) && (bytesWriteRate > 0))
@@ -2119,9 +2122,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
- protected DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized,
- boolean localStorageRequired, boolean isDisplayOfferingEnabled, Boolean isCustomizedIops, Long minIops, Long maxIops, Long bytesReadRate, Long bytesWriteRate,
- Long iopsReadRate, Long iopsWriteRate, Integer hypervisorSnapshotReserve) {
+ protected DiskOfferingVO createDiskOffering(Long domainId, String name, String description, Long numGibibytes, String tags, boolean isCustomized, boolean localStorageRequired,
+ boolean isDisplayOfferingEnabled, Boolean isCustomizedIops, Long minIops, Long maxIops, Long bytesReadRate, Long bytesWriteRate, Long iopsReadRate, Long iopsWriteRate,
+ Integer hypervisorSnapshotReserve) {
long diskSize = 0;// special case for custom disk offerings
if (numGibibytes != null && (numGibibytes <= 0)) {
throw new InvalidParameterValueException("Please specify a disk size of at least 1 Gb.");
@@ -2239,8 +2242,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
Long iopsWriteRate = cmd.getIopsWriteRate();
Integer hypervisorSnapshotReserve = cmd.getHypervisorSnapshotReserve();
- return createDiskOffering(domainId, name, description, numGibibytes, tags, isCustomized, localStorageRequired, isDisplayOfferingEnabled, isCustomizedIops,
- minIops, maxIops, bytesReadRate, bytesWriteRate, iopsReadRate, iopsWriteRate, hypervisorSnapshotReserve);
+ return createDiskOffering(domainId, name, description, numGibibytes, tags, isCustomized, localStorageRequired, isDisplayOfferingEnabled, isCustomizedIops, minIops,
+ maxIops, bytesReadRate, bytesWriteRate, iopsReadRate, iopsWriteRate, hypervisorSnapshotReserve);
}
@Override
@@ -2369,7 +2372,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@DB
@ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_CREATE, eventDescription = "creating vlan ip range", async = false)
public Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
- ResourceAllocationException {
+ ResourceAllocationException {
Long zoneId = cmd.getZoneId();
Long podId = cmd.getPodId();
String startIP = cmd.getStartIp();
@@ -2547,8 +2550,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (zone.getNetworkType() == DataCenter.NetworkType.Advanced) {
if (network.getTrafficType() == TrafficType.Guest) {
if (network.getGuestType() != GuestType.Shared) {
- throw new InvalidParameterValueException("Can execute createVLANIpRanges on shared guest network, but type of this guest network " + network.getId() +
- " is " + network.getGuestType());
+ throw new InvalidParameterValueException("Can execute createVLANIpRanges on shared guest network, but type of this guest network " + network.getId() + " is "
+ + network.getGuestType());
}
List<VlanVO> vlans = _vlanDao.listVlansByNetworkId(network.getId());
@@ -2557,8 +2560,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (vlanId == null) {
vlanId = vlan.getVlanTag();
} else if (!NetUtils.isSameIsolationId(vlan.getVlanTag(), vlanId)) {
- throw new InvalidParameterValueException("there is already one vlan " + vlan.getVlanTag()
- + " on network :" + +network.getId() + ", only one vlan is allowed on guest network");
+ throw new InvalidParameterValueException("there is already one vlan " + vlan.getVlanTag() + " on network :" + +network.getId()
+ + ", only one vlan is allowed on guest network");
}
}
sameSubnet = validateIpRange(startIP, endIP, newVlanGateway, newVlanNetmask, vlans, ipv4, ipv6, ip6Gateway, ip6Cidr, startIPv6, endIPv6, network);
@@ -2590,24 +2593,23 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
checkOverlapPrivateIpRange(zoneId, startIP, endIP);
}
- return commitVlan(zoneId, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, forVirtualNetwork, networkId, physicalNetworkId, startIPv6, endIPv6,
- ip6Gateway, ip6Cidr, vlanOwner, network, sameSubnet);
+ return commitVlan(zoneId, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId, forVirtualNetwork, networkId, physicalNetworkId, startIPv6, endIPv6, ip6Gateway,
+ ip6Cidr, vlanOwner, network, sameSubnet);
}
- private Vlan commitVlan(final Long zoneId, final Long podId, final String startIP, final String endIP, final String newVlanGatewayFinal,
- final String newVlanNetmaskFinal, final String vlanId, final Boolean forVirtualNetwork, final Long networkId, final Long physicalNetworkId,
- final String startIPv6, final String endIPv6, final String ip6Gateway, final String ip6Cidr, final Account vlanOwner, final Network network,
- final Pair<Boolean, Pair<String, String>> sameSubnet) {
+ private Vlan commitVlan(final Long zoneId, final Long podId, final String startIP, final String endIP, final String newVlanGatewayFinal, final String newVlanNetmaskFinal,
+ final String vlanId, final Boolean forVirtualNetwork, final Long networkId, final Long physicalNetworkId, final String startIPv6, final String endIPv6,
+ final String ip6Gateway, final String ip6Cidr, final Account vlanOwner, final Network network, final Pair<Boolean, Pair<String, String>> sameSubnet) {
return Transaction.execute(new TransactionCallback<Vlan>() {
@Override
public Vlan doInTransaction(TransactionStatus status) {
String newVlanNetmask = newVlanNetmaskFinal;
String newVlanGateway = newVlanGatewayFinal;
- if ((sameSubnet == null || sameSubnet.first() == false) && (network.getTrafficType() == TrafficType.Guest) &&
- (network.getGuestType() == GuestType.Shared) && (_vlanDao.listVlansByNetworkId(networkId) != null)) {
- Map<Capability, String> dhcpCapabilities =
- _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()), Service.Dhcp);
+ if ((sameSubnet == null || sameSubnet.first() == false) && (network.getTrafficType() == TrafficType.Guest) && (network.getGuestType() == GuestType.Shared)
+ && (_vlanDao.listVlansByNetworkId(networkId) != null)) {
+ Map<Capability, String> dhcpCapabilities = _networkSvc.getNetworkOfferingServiceCapabilities(_networkOfferingDao.findById(network.getNetworkOfferingId()),
+ Service.Dhcp);
String supportsMultipleSubnets = dhcpCapabilities.get(Capability.DhcpAccrossMultipleSubnets);
if (supportsMultipleSubnets == null || !Boolean.valueOf(supportsMultipleSubnets)) {
throw new InvalidParameterValueException("The Dhcp serivice provider for this network dose not support the dhcp across multiple subnets");
@@ -2620,8 +2622,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
newVlanGateway = sameSubnet.second().first();
newVlanNetmask = sameSubnet.second().second();
}
- Vlan vlan =
- createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId,
+ Vlan vlan = createVlanAndPublicIpRange(zoneId, networkId, physicalNetworkId, forVirtualNetwork, podId, startIP, endIP, newVlanGateway, newVlanNetmask, vlanId,
vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr);
// create an entry in the nic_secondary table. This will be the new
// gateway that will be configured on the corresponding routervm.
@@ -2657,8 +2658,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
return (NetUtils.isNetowrkASubsetOrSupersetOfNetworkB(cidrnew, existing_cidr));
}
- public Pair<Boolean, Pair<String, String>> validateIpRange(String startIP, String endIP, String newVlanGateway, String newVlanNetmask, List<VlanVO> vlans,
- boolean ipv4, boolean ipv6, String ip6Gateway, String ip6Cidr, String startIPv6, String endIPv6, Network network) {
+ public Pair<Boolean, Pair<String, String>> validateIpRange(String startIP, String endIP, String newVlanGateway, String newVlanNetmask, List<VlanVO> vlans, boolean ipv4,
+ boolean ipv6, String ip6Gateway, String ip6Cidr, String startIPv6, String endIPv6, Network network) {
String vlanGateway = null;
String vlanNetmask = null;
boolean sameSubnet = false;
@@ -2672,8 +2673,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (val == NetUtils.supersetOrSubset.isSuperset) {
// this means that new cidr is a superset of the
// existing subnet.
- throw new InvalidParameterValueException("The subnet you are trying to add is a superset of the existing subnet having gateway" +
- vlan.getVlanGateway() + " and netmask " + vlan.getVlanNetmask());
+ throw new InvalidParameterValueException("The subnet you are trying to add is a superset of the existing subnet having gateway" + vlan.getVlanGateway()
+ + " and netmask " + vlan.getVlanNetmask());
} else if (val == NetUtils.supersetOrSubset.neitherSubetNorSuperset) {
// this implies the user is trying to add a new subnet
// which is not a superset or subset of this subnet.
@@ -2681,8 +2682,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
continue;
} else if (val == NetUtils.supersetOrSubset.isSubset) {
// this means he is trying to add to the same subnet.
- throw new InvalidParameterValueException("The subnet you are trying to add is a subset of the existing subnet having gateway" +
- vlan.getVlanGateway() + " and netmask " + vlan.getVlanNetmask());
+ throw new InvalidParameterValueException("The subnet you are trying to add is a subset of the existing subnet having gateway" + vlan.getVlanGateway()
+ + " and netmask " + vlan.getVlanNetmask());
} else if (val == NetUtils.supersetOrSubset.sameSubnet) {
sameSubnet = true;
//check if the gateway provided by the user is same as that of the subnet.
@@ -2707,8 +2708,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
if (newVlanGateway == null && newVlanNetmask == null && sameSubnet == false) {
- throw new InvalidParameterValueException(
- "The ip range dose not belong to any of the existing subnets, Provide the netmask and gateway if you want to add new subnet");
+ throw new InvalidParameterValueException("The ip range dose not belong to any of the existing subnets, Provide the netmask and gateway if you want to add new subnet");
}
Pair<String, String> vlanDetails = null;
@@ -2729,7 +2729,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
public Vlan createVlanAndPublicIpRange(long zoneId, long networkId, long physicalNetworkId, boolean forVirtualNetwork, Long podId, String startIP, String endIP,
- String vlanGateway, String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) {
+ String vlanGateway, String vlanNetmask, String vlanId, Account vlanOwner, String startIPv6, String endIPv6, String vlanIp6Gateway, String vlanIp6Cidr) {
Network network = _networkModel.getNetwork(networkId);
boolean ipv4 = false, ipv6 = false;
@@ -2771,8 +2771,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
// pod vlans can be created in basic zone only
if (zone.getNetworkType() != NetworkType.Basic || network.getTrafficType() != TrafficType.Guest) {
- throw new InvalidParameterValueException("Pod id can be specified only for the networks of type " + TrafficType.Guest + " in zone of type " +
- NetworkType.Basic);
+ throw new InvalidParameterValueException("Pod id can be specified only for the networks of type " + TrafficType.Guest + " in zone of type " + NetworkType.Basic);
}
}
@@ -2838,8 +2837,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
String newCidr = NetUtils.getCidrFromGatewayAndNetmask(vlanGateway, vlanNetmask);
//Make sure start and end ips are with in the range of cidr calculated for this gateway and netmask {
- if (!NetUtils.isIpWithtInCidrRange(vlanGateway, newCidr) || !NetUtils.isIpWithtInCidrRange(startIP, newCidr) ||
- !NetUtils.isIpWithtInCidrRange(endIP, newCidr)) {
+ if (!NetUtils.isIpWithtInCidrRange(vlanGateway, newCidr) || !NetUtils.isIpWithtInCidrRange(startIP, newCidr) || !NetUtils.isIpWithtInCidrRange(endIP, newCidr)) {
throw new InvalidParameterValueException("Please specify a valid IP range or valid netmask or valid gateway");
}
@@ -2849,8 +2847,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
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.");
+ 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.");
}
}
@@ -2879,13 +2877,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
// from here, subnet overlaps
if (!NetUtils.isSameIsolationId(vlanId, vlan.getVlanTag())) {
- throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag()
- + " in zone " + zone.getName()
+ throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " in zone " + zone.getName()
+ " has overlapped with the subnet. Please specify a different gateway/netmask.");
}
if (vlan.getNetworkId() != networkId) {
- throw new InvalidParameterValueException("This subnet is overlapped with subnet in other network " + vlan.getNetworkId() + " in zone " +
- zone.getName() + " . Please specify a different gateway/netmask.");
+ throw new InvalidParameterValueException("This subnet is overlapped with subnet in other network " + vlan.getNetworkId() + " in zone " + zone.getName()
+ + " . Please specify a different gateway/netmask.");
}
String[] otherVlanIpRange = vlan.getIpRange().split("\\-");
@@ -2897,12 +2894,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
//extend IP range
if (!vlanGateway.equals(otherVlanGateway) || !vlanNetmask.equals(vlan.getVlanNetmask())) {
- throw new InvalidParameterValueException("The IP range has already been added with gateway " + otherVlanGateway + " ,and netmask " +
- otherVlanNetmask + ", Please specify the gateway/netmask if you want to extend ip range");
+ throw new InvalidParameterValueException("The IP range has already been added with gateway " + 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."
- + " Please specify a different start IP/end IP.");
+ throw new InvalidParameterValueException("The IP range already has IPs that overlap with the new range." + " Please specify a different start IP/end IP.");
}
}
}
@@ -2921,13 +2917,13 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
if (NetUtils.isSameIsolationId(vlanId, vlan.getVlanTag())) {
if (NetUtils.isIp6RangeOverlap(ipv6Range, vlan.getIp6Range())) {
- throw new InvalidParameterValueException("The IPv6 range with tag: " + vlan.getVlanTag() +
- " already has IPs that overlap with the new range. Please specify a different start IP/end IP.");
+ throw new InvalidParameterValueException("The IPv6 range with tag: " + vlan.getVlanTag()
+ + " already has IPs that overlap with the new range. Please specify a different start IP/end IP.");
}
if (!vlanIp6Gateway.equals(vlan.getIp6Gateway())) {
- throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " has already been added with gateway " +
- vlan.getIp6Gateway() + ". Please specify a different tag.");
+ throw new InvalidParameterValueException("The IP range with tag: " + vlan.getVlanTag() + " has already been added with gateway " + vlan.getIp6Gateway()
+ + ". Please specify a different tag.");
}
}
}
@@ -2935,8 +2931,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// Check if the vlan is being used
if (_zoneDao.findVnet(zoneId, physicalNetworkId, vlanId).size() > 0) {
- throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone " +
- zone.getName());
+ throw new InvalidParameterValueException("The VLAN tag " + vlanId + " is already being used for dynamic vlan allocation for the guest network in zone "
+ + zone.getName());
}
String ipRange = null;
@@ -2949,21 +2945,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
// Everything was fine, so persist the VLAN
- VlanVO vlan =
- commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, vlanIp6Gateway, vlanIp6Cidr,
+ VlanVO vlan = commitVlanAndIpRange(zoneId, networkId, physicalNetworkId, podId, startIP, endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, vlanIp6Gateway, vlanIp6Cidr,
ipv4, zone, vlanType, ipv6Range, ipRange);
return vlan;
}
- private VlanVO commitVlanAndIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final Long podId, final String startIP,
- final String endIP, final String vlanGateway, final String vlanNetmask, final String vlanId, final Account vlanOwner, final String vlanIp6Gateway,
- final String vlanIp6Cidr, final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange) {
+ private VlanVO commitVlanAndIpRange(final long zoneId, final long networkId, final long physicalNetworkId, final Long podId, final String startIP, final String endIP,
+ final String vlanGateway, final String vlanNetmask, final String vlanId, final Account vlanOwner, final String vlanIp6Gateway, final String vlanIp6Cidr,
+ final boolean ipv4, final DataCenterVO zone, final VlanType vlanType, final String ipv6Range, final String ipRange) {
return Transaction.execute(new TransactionCallback<VlanVO>() {
@Override
public VlanVO doInTransaction(TransactionStatus status) {
- VlanVO vlan =
- new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId, physicalNetworkId, vlanIp6Gateway, vlanIp6Cidr, ipv6Range);
+ VlanVO vlan = new VlanVO(vlanType, vlanId, vlanGateway, vlanNetmask, zone.getId(), ipRange, networkId, physicalNetworkId, vlanIp6Gateway, vlanIp6Cidr, ipv6Range);
s_logger.debug("Saving vlan range " + vlan);
vlan = _vlanDao.persist(vlan);
@@ -2985,8 +2979,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// range
List<IPAddressVO> ips = _publicIpAddressDao.listByVlanId(vlan.getId());
for (IPAddressVO ip : ips) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(),
- ip.getAddress().toString(), ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(),
+ ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
}
// increment resource count for dedicated public ip's
_resourceLimitMgr.incrementResourceCount(vlanOwner.getId(), ResourceType.public_ip, new Long(ips.size()));
@@ -3034,19 +3028,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
for (IPAddressVO ip : ips) {
if (ip.isOneToOneNat()) {
- throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip +
- " belonging to the range is used for static nat purposes. Cleanup the rules first");
+ throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip
+ + " belonging to the range is used for static nat purposes. Cleanup the rules first");
}
if (ip.isSourceNat()) {
- throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip +
- " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId() +
- ". IP range with the source nat ip address can be removed either as a part of Network, or account removal");
+ throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip
+ + " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId()
+ + ". IP range with the source nat ip address can be removed either as a part of Network, or account removal");
}
if (_firewallDao.countRulesByIpId(ip.getId()) > 0) {
- throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip +
- " belonging to the range has firewall rules applied. Cleanup the rules first");
+ throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + " as ip " + ip
+ + " belonging to the range has firewall rules applied. Cleanup the rules first");
}
// release public ip address here
success = success && _ipAddrMgr.disassociatePublicIpAddress(ip.getId(), userId, caller);
@@ -3055,8 +3049,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
s_logger.warn("Some ip addresses failed to be released as a part of vlan " + vlanDbId + " removal");
} else {
for (IPAddressVO ip : ips) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress()
- .toString(), ip.isSourceNat(), vlanRange.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getId(), ip.getDataCenterId(), ip.getId(),
+ ip.getAddress().toString(), ip.isSourceNat(), vlanRange.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
}
}
} finally {
@@ -3066,8 +3060,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(vlanRange.getVlanGateway(), vlanRange.getNetworkId(), NicIpAlias.state.active);
//check if the ipalias belongs to the vlan range being deleted.
if (ipAlias != null && vlanDbId == _publicIpAddressDao.findByIpAndSourceNetworkId(vlanRange.getNetworkId(), ipAlias.getIp4Address()).getVlanId()) {
- throw new InvalidParameterValueException("Cannot delete vlan range " + vlanDbId + " as " + ipAlias.getIp4Address() +
- "is being used for providing dhcp service in this subnet. Delete all VMs in this subnet and try again");
+ throw new InvalidParameterValueException("Cannot delete vlan range " + vlanDbId + " as " + ipAlias.getIp4Address()
+ + "is being used for providing dhcp service in this subnet. Delete all VMs in this subnet and try again");
}
allocIpCount = _publicIpAddressDao.countIPs(vlanRange.getDataCenterId(), vlanDbId, true);
if (allocIpCount > 0) {
@@ -3162,8 +3156,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// generate usage event for dedication of every ip address in the range
for (IPAddressVO ip : ips) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(),
- ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_ASSIGN, vlanOwner.getId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(), ip.isSourceNat(),
+ vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
}
// increment resource count for dedicated public ip's
@@ -3233,8 +3227,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// generate usage events to remove dedication for every ip in the range that has been disassociated
for (IPAddressVO ip : ips) {
if (!ipsInUse.contains(ip)) {
- UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getAccountId(), ip.getDataCenterId(), ip.getId(), ip.getAddress()
- .toString(), ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
+ UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NET_IP_RELEASE, acctVln.get(0).getAccountId(), ip.getDataCenterId(), ip.getId(), ip.getAddress().toString(),
+ ip.isSourceNat(), vlan.getVlanType().toString(), ip.getSystem(), ip.getClass().getName(), ip.getUuid());
}
}
// decrement resource count for dedicated public ip's
@@ -3297,8 +3291,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
private void checkConflictsWithPortableIpRange(long zoneId, String vlanId, String vlanGateway, String vlanNetmask, String startIP, String endIP) {
// check and throw exception if there is portable IP range that overlaps with public ip range being configured
if (checkOverlapPortableIpRange(_regionDao.getRegionId(), startIP, endIP)) {
- throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " +
- _regionDao.getRegionId());
+ throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region "
+ + _regionDao.getRegionId());
}
// verify and throw exception if the VLAN Id is used by any portable IP range
@@ -3380,10 +3374,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (cidrSubnet.equals(guestSubnet)) {
if (podName.equals("newPod")) {
throw new InvalidParameterValueException(
- "The subnet of the pod you are adding conflicts with the subnet of the Guest IP Network. Please specify a different CIDR.");
+ "The subnet of the pod you are adding conflicts with the subnet of the Guest IP Network. Please specify a different CIDR.");
} else {
- throw new InvalidParameterValueException("Warning: The subnet of pod " + podName + " in zone " + zoneName +
- " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management.");
+ throw new InvalidParameterValueException(
+ "Warning: The subnet of pod "
+ + podName
+ + " in zone "
+ + zoneName
+ + " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management.");
}
}
}
@@ -3411,11 +3409,11 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (cidrSubnet.equals(otherCidrSubnet)) {
String otherPodName = getPodName(otherPodId.longValue());
if (podName.equals("newPod")) {
- throw new InvalidParameterValueException("The subnet of the pod you are adding conflicts with the subnet of pod " + otherPodName + " in zone " +
- zoneName + ". Please specify a different CIDR.");
+ throw new InvalidParameterValueException("The subnet of the pod you are adding conflicts with the subnet of pod " + otherPodName + " in zone " + zoneName
+ + ". Please specify a different CIDR.");
} else {
- throw new InvalidParameterValueException("Warning: The pods " + podName + " and " + otherPodName + " in zone " + zoneName +
- " have conflicting CIDR subnets. Please change the CIDR of one of these pods.");
+ throw new InvalidParameterValueException("Warning: The pods " + podName + " and " + otherPodName + " in zone " + zoneName
+ + " have conflicting CIDR subnets. Please change the CIDR of one of these pods.");
}
}
}
@@ -3632,8 +3630,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// Allow to specify more than 1 provider per service only if
// the service is LB
if (!serviceStr.equalsIgnoreCase(Service.Lb.getName()) && svcPrv.get(serviceStr) != null && svcPrv.get(serviceStr).size() > 1) {
- throw new InvalidParameterValueException("In the current release only one provider can be "
- + "specified for the service if the service is not LB");
+ throw new InvalidParameterValueException("In the current release only one provider can be " + "specified for the service if the service is not LB");
}
for (String prvNameStr : svcPrv.get(serviceStr)) {
// check if provider is supported
@@ -3723,10 +3720,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
firewallProviderSet.add(firewallProvider);
serviceProviderMap.put(Service.Firewall, firewallProviderSet);
if (!(firewallProvider.getName().equals(Provider.JuniperSRX.getName()) || firewallProvider.getName().equals(Provider.PaloAlto.getName()) || firewallProvider.getName()
- .equals(Provider.VirtualRouter.getName())) &&
- egressDefaultPolicy == false) {
- throw new InvalidParameterValueException("Firewall egress with default policy " + egressDefaultPolicy + " is not supported by the provider " +
- firewallProvider.getName());
+ .equals(Provider.VirtualRouter.getName())) && egressDefaultPolicy == false) {
+ throw new InvalidParameterValueException("Firewall egress with default policy " + egressDefaultPolicy + " is not supported by the provider "
+ + firewallProvider.getName());
}
}
@@ -3747,8 +3743,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
}
- NetworkOffering offering =
- createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false,
+ NetworkOffering offering = createNetworkOffering(name, displayText, trafficType, tags, specifyVlan, availability, networkRate, serviceProviderMap, false, guestType, false,
serviceOfferingId, conserveMode, serviceCapabilityMap, specifyIpRanges, isPersistent, details, egressDefaultPolicy, maxconn, enableKeepAlive);
CallContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name);
return offering;
@@ -3757,8 +3752,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
void validateLoadBalancerServiceCapabilities(Map<Capability, String> lbServiceCapabilityMap) {
if (lbServiceCapabilityMap != null && !lbServiceCapabilityMap.isEmpty()) {
if (lbServiceCapabilityMap.keySet().size() > 3 || !lbServiceCapabilityMap.containsKey(Capability.SupportedLBIsolation)) {
- throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", " +
- Capability.InlineMode.getName() + " capabilities can be sepcified for LB service");
+ throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", "
+ + Capability.InlineMode.getName() + " capabilities can be sepcified for LB service");
}
for (Capability cap : lbServiceCapabilityMap.keySet()) {
@@ -3788,8 +3783,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
throw new InvalidParameterValueException("Unknown specified value for " + Capability.LbSchemes.getName());
}
} else {
- throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", " +
- Capability.InlineMode.getName() + ", " + Capability.LbSchemes.getName() + " capabilities can be sepcified for LB service");
+ throw new InvalidParameterValueException("Only " + Capability.SupportedLBIsolation.getName() + ", " + Capability.ElasticLb.getName() + ", "
+ + Capability.InlineMode.getName() + ", " + Capability.LbSchemes.getName() + " capabilities can be sepcified for LB service");
}
}
}
@@ -3798,8 +3793,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
void validateSourceNatServiceCapablities(Map<Capability, String> sourceNatServiceCapabilityMap) {
if (sourceNatServiceCapabilityMap != null && !sourceNatServiceCapabilityMap.isEmpty()) {
if (sourceNatServiceCapabilityMap.keySet().size() > 2) {
- throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter +
- " capabilities can be sepcified for source nat service");
+ throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter
+ + " capabilities can be sepcified for source nat service");
}
for (Capability capability : sourceNatServiceCapabilityMap.keySet()) {
@@ -3808,8 +3803,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
boolean perAccount = value.contains("peraccount");
boolean perZone = value.contains("perzone");
if ((perAccount && perZone) || (!perAccount && !perZone)) {
- throw new InvalidParameterValueException("Either peraccount or perzone source NAT type can be specified for " +
- Capability.SupportedSourceNatTypes.getName());
+ throw new InvalidParameterValueException("Either peraccount or perzone source NAT type can be specified for "
+ + Capability.SupportedSourceNatTypes.getName());
}
} else if (capability == Capability.RedundantRouter) {
boolean enabled = value.contains("true");
@@ -3818,8 +3813,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
throw new InvalidParameterValueException("Unknown specified value for " + Capability.RedundantRouter.getName());
}
} else {
- throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter +
- " capabilities can be sepcified for source nat service");
+ throw new InvalidParameterValueException("Only " + Capability.SupportedSourceNatTypes.getName() + " and " + Capability.RedundantRouter
+ + " capabilities can be sepcified for source nat service");
}
}
}
@@ -3839,13 +3834,13 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} else if (capability == Capability.AssociatePublicIP) {
associatePublicIP = value.contains("true");
} else {
- throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName() +
- " capabilitiy can be sepcified for static nat service");
+ throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName()
+ + " capabilitiy can be sepcified for static nat service");
}
}
if ((!eipEnabled) && associatePublicIP) {
- throw new InvalidParameterValueException("Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " +
- Capability.ElasticIp.getName() + " is true");
+ throw new InvalidParameterValueException("Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability "
+ + Capability.ElasticIp.getName() + " is true");
}
}
}
@@ -3853,9 +3848,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
@Override
@DB
public NetworkOfferingVO createNetworkOffering(String name, String displayText, TrafficType trafficType, String tags, boolean specifyVlan, Availability availability,
- Integer networkRate, final Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, Network.GuestType type, boolean systemOnly, Long serviceOfferingId,
- boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,
- final Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, final Integer maxconn, final boolean enableKeepAlive) {
+ Integer networkRate, final Map<Service, Set<Provider>> serviceProviderMap, boolean isDefault, Network.GuestType type, boolean systemOnly, Long serviceOfferingId,
+ boolean conserveMode, Map<Service, Map<Capability, String>> serviceCapabilityMap, boolean specifyIpRanges, boolean isPersistent,
+ final Map<NetworkOffering.Detail, String> details, boolean egressDefaultPolicy, final Integer maxconn, final boolean enableKeepAlive) {
String multicastRateStr = _configDao.getValue("multicast.throttling.rate");
int multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr));
@@ -3890,15 +3885,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (availability == NetworkOffering.Availability.Required) {
boolean canOffBeRequired = (type == GuestType.Isolated && serviceProviderMap.containsKey(Service.SourceNat));
if (!canOffBeRequired) {
- throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type " +
- GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled");
+ throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type "
+ + GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled");
}
// only one network offering in the system can be Required
List<NetworkOfferingVO> offerings = _networkOfferingDao.listByAvailability(Availability.Required, false);
if (!offerings.isEmpty()) {
- throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " +
- Availability.Required);
+ throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + Availability.Required);
}
}
@@ -3956,8 +3950,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if ((sourceNatServiceCapabilityMap != null) && (!sourceNatServiceCapabilityMap.isEmpty())) {
String sourceNatType = sourceNatServiceCapabilityMap.get(Capability.SupportedSourceNatTypes);
if (sourceNatType != null) {
- _networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.SourceNat), Service.SourceNat, Capability.SupportedSourceNatTypes,
- sourceNatType);
+ _networkModel.checkCapabilityForProvider(serviceProviderMap.get(Service.SourceNat), Service.SourceNat, Capability.SupportedSourceNatTypes, sourceNatType);
sharedSourceNat = sourceNatType.contains("perzone");
}
@@ -3986,10 +3979,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
publicLb = true;
}
- final NetworkOfferingVO offeringFinal =
- new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, networkRate, multicastRate, isDefault, availability, tags, type, conserveMode,
- dedicatedLb, sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp, publicLb, internalLb,
- egressDefaultPolicy);
+ final NetworkOfferingVO offeringFinal = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, networkRate, multicastRate, isDefault, availability,
+ tags, type, conserveMode, dedicatedLb, sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp, publicLb,
+ internalLb, egressDefaultPolicy);
if (serviceOfferingId != null) {
offeringFinal.setServiceOfferingId(serviceOfferingId);
@@ -4064,8 +4056,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
}
if (lbProvider == null) {
- throw new InvalidParameterValueException("Invalid value " + details.get(detail) + " for the detail " + detail +
- ". The provider is not supported by the network offering");
+ throw new InvalidParameterValueException("Invalid value " + details.get(detail) + " for the detail " + detail
+ + ". The provider is not supported by the network offering");
}
// 2) validate if the provider supports the scheme
@@ -4331,8 +4323,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
// though)
int networkCount = _networkDao.getNetworkCountByNetworkOffId(offeringId);
if (networkCount > 0) {
- throw new InvalidParameterValueException("Can't delete network offering " + offeringId + " as its used by " + networkCount + " networks. " +
- "To make the network offering unavaiable, disable it");
+ throw new InvalidParameterValueException("Can't delete network offering " + offeringId + " as its used by " + networkCount + " networks. "
+ + "To make the network offering unavaiable, disable it");
}
if (_networkOfferingDao.remove(offeringId)) {
@@ -4404,19 +4396,18 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
throw new InvalidParameterValueException("Invalid value for Availability. Supported types: " + Availability.Required + ", " + Availability.Optional);
} else {
if (availability == NetworkOffering.Availability.Required) {
- boolean canOffBeRequired =
- (offeringToUpdate.getGuestType() == GuestType.Isolated && _networkModel.areServicesSupportedByNetworkOffering(offeringToUpdate.getId(),
- Service.SourceNat));
+ boolean canOffBeRequired = (offeringToUpdate.getGuestType() == GuestType.Isolated && _networkModel.areServicesSupportedByNetworkOffering(
+ offeringToUpdate.getId(), Service.SourceNat));
if (!canOffBeRequired) {
- throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type " +
- GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled");
+ throw new InvalidParameterValueException("Availability can be " + NetworkOffering.Availability.Required + " only for networkOfferings of type "
+ + GuestType.Isolated + " and with " + Service.SourceNat.getName() + " enabled");
}
// only one network offering in the system can be Required
List<NetworkOfferingVO> offerings = _networkOfferingDao.listByAvailability(Availability.Required, false);
if (!offerings.isEmpty() && offerings.get(0).getId() != offeringToUpdate.getId()) {
- throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " +
- Availability.Required);
+ throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability "
+ + Availability.Required);
}
}
offering.setAvailability(availability);
@@ -4656,17 +4647,16 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (!NetUtils.sameSubnet(startIP, gateway, netmask)) {
throw new InvalidParameterValueException("Please ensure that your start IP is in the same subnet as "
- + "your portable IP range's gateway and as per the IP range's netmask.");
+ + "your portable IP range's gateway and as per the IP range's netmask.");
}
if (!NetUtils.sameSubnet(endIP, gateway, netmask)) {
throw new InvalidParameterValueException("Please ensure that your end IP is in the same subnet as "
- + "your portable IP range's gateway and as per the IP range's netmask.");
+ + "your portable IP range's gateway and as per the IP range's netmask.");
}
if (checkOverlapPortableIpRange(regionId, startIP, endIP)) {
- throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " +
- regionId);
+ throw new InvalidParameterValueException("Ip range: " + startIP + "-" + endIP + " overlaps with a portable" + " IP range already configured in the region " + regionId);
}
if (vlanId == null) {
@@ -4681,8 +4671,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
for (DataCenterVO zone : zones) {
// check if there is zone vlan with same id
if (_vlanDao.findByZoneAndVlanId(zone.getId(), vlanId) != null)
- throw new InvalidParameterValueException("Found a VLAN id " + vlanId + " already existing in" + " zone " + zone.getUuid() +
- " that conflicts with VLAN id of the portable ip range being configured");
+ throw new InvalidParameterValueException("Found a VLAN id " + vlanId + " already existing in" + " zone " + zone.getUuid()
+ + " that conflicts with VLAN id of the portable ip range being configured");
//check if there is a public ip range that overlaps with portable ip range being created
checkOverlapPublicIpRange(zone.getId(), startIP, endIP);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb0c1467/utils/src/com/cloud/utils/net/NetUtils.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java
index becca37..0ea015b 100755
--- a/utils/src/com/cloud/utils/net/NetUtils.java
+++ b/utils/src/com/cloud/utils/net/NetUtils.java
@@ -41,13 +41,12 @@ import org.apache.commons.lang.SystemUtils;
import org.apache.commons.net.util.SubnetUtils;
import org.apache.log4j.Logger;
-import com.googlecode.ipv6.IPv6Address;
-import com.googlecode.ipv6.IPv6AddressRange;
-import com.googlecode.ipv6.IPv6Network;
-
import com.cloud.utils.IteratorUtil;
import com.cloud.utils.Pair;
import com.cloud.utils.script.Script;
+import com.googlecode.ipv6.IPv6Address;
+import com.googlecode.ipv6.IPv6AddressRange;
+import com.googlecode.ipv6.IPv6Network;
public class NetUtils {
protected final static Logger s_logger = Logger.getLogger(NetUtils.class);
@@ -458,7 +457,7 @@ public class NetUtils {
StringBuilder result = new StringBuilder(17);
Formatter formatter = new Formatter(result);
formatter.format("%02x:%02x:%02x:%02x:%02x:%02x", (macAddress >> 40) & 0xff, (macAddress >> 32) & 0xff, (macAddress >> 24) & 0xff, (macAddress >> 16) & 0xff,
- (macAddress >> 8) & 0xff, (macAddress & 0xff));
+ (macAddress >> 8) & 0xff, (macAddress & 0xff));
return result.toString();
}
@@ -768,6 +767,14 @@ public class NetUtils {
}
public static String ipAndNetMaskToCidr(String ip, String netmask) {
+ if (!isValidIp(ip)) {
+ return null;
+ }
+
+ if (!isValidNetmask(netmask)) {
+ return null;
+ }
+
long ipAddr = ip2Long(ip);
long subnet = ip2Long(netmask);
long result = ipAddr & subnet;
@@ -1388,39 +1395,28 @@ public class NetUtils {
static final String VLAN_UNTAGGED = "untagged";
- public static boolean isSameIsolationId(String one, String other)
- {
+ public static boolean isSameIsolationId(String one, String other) {
// check nulls
// check empty strings
- if ((one == null || one.equals(""))
- &&
- (other == null || other.equals("")))
- {
+ if ((one == null || one.equals("")) && (other == null || other.equals(""))) {
return true;
}
- if ((one == null || other == null)
- &&
- !(one == null && other == null))
- {
+ if ((one == null || other == null) && !(one == null && other == null)) {
return false;
}
// check 'untagged'
- if (VLAN_UNTAGGED.equalsIgnoreCase(one) && VLAN_UNTAGGED.equalsIgnoreCase(other))
- {
+ if (VLAN_UNTAGGED.equalsIgnoreCase(one) && VLAN_UNTAGGED.equalsIgnoreCase(other)) {
return true;
}
// if one is a number check the other as number and as 'vlan://' + number
- if (one.startsWith(VLAN_PREFIX))
- {
+ if (one.startsWith(VLAN_PREFIX)) {
one = one.substring(VLAN_PREFIX_LENGTH);
}
- if (other.startsWith(VLAN_PREFIX))
- {
+ if (other.startsWith(VLAN_PREFIX)) {
other = other.substring(VLAN_PREFIX_LENGTH);
}
// check valid uris or numbers
- if (one.equalsIgnoreCase(other))
- {
+ if (one.equalsIgnoreCase(other)) {
return true;
}