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

CS-16187: don't allow vpc offering creation with unsupported services (Firewall, SecurityGroup)

Browse Source 
Conflicts:

	server/src/com/cloud/network/vpc/VpcManagerImpl.java
This commit is contained in:
Alena Prokharchyk 2012-09-11 16:59:43 -07:00 committed by Alex Huang
parent 331598243c
commit 9445c9e73b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -17,6 +17,7 @@
package com.cloud.network.vpc; package com.cloud.network.vpc;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -53,7 +54,6 @@ import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.ResourceUnavailableException;
import com.cloud.exception.UnsupportedServiceException;
import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.network.IPAddressVO; import com.cloud.network.IPAddressVO;
import com.cloud.network.IpAddress; import com.cloud.network.IpAddress;
@ -167,7 +167,8 @@ public class VpcManagerImpl implements VpcManager, Manager{
private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker")); private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
private VpcProvider vpcElement = null; private VpcProvider vpcElement = null;
private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
String _name; String _name;
int _cleanupInterval; int _cleanupInterval;
int _maxNetworks; int _maxNetworks;
@ -265,14 +266,10 @@ public class VpcManagerImpl implements VpcManager, Manager{
for (String serviceName : supportedServices) { for (String serviceName : supportedServices) {
// validate if the service is supported // validate if the service is supported
Service service = Network.Service.getService(serviceName); Service service = Network.Service.getService(serviceName);
if (service == null || service == Service.Gateway) { if (service == null || nonSupportedServices.contains(service)) {
throw new InvalidParameterValueException("Invalid service " + serviceName); throw new InvalidParameterValueException("Service " + serviceName + " is not supported in VPC");
} }
//don't allow security group service for vpc
if (service == Service.SecurityGroup) {
throw new UnsupportedServiceException("Service " + Service.SecurityGroup.getName() + " is not supported by VPC");
}
svcProviderMap.put(service, defaultProviders); svcProviderMap.put(service, defaultProviders);
if (service == Service.NetworkACL) { if (service == Service.NetworkACL) {
firewallSvs = true; firewallSvs = true;