Make the VpcManager check a list of supported providers
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b9b1076d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b9b1076d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b9b1076d Branch: refs/heads/vpc-with-nicira-l2 Commit: b9b1076d7272c397dc6401f90b3cd34b814d98a9 Parents: 1e40551 Author: Hugo Trippaers <[email protected]> Authored: Tue Jan 29 08:29:25 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Jan 29 08:29:25 2013 +0100 ---------------------------------------------------------------------- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b9b1076d/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 fa6bd30..4311255 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -175,6 +175,7 @@ public class VpcManagerImpl implements VpcManager, Manager{ private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker")); private VpcProvider vpcElement = null; private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall); + private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp); String _name; int _cleanupInterval; @@ -1001,9 +1002,9 @@ public class VpcManagerImpl implements VpcManager, Manager{ //1) in current release, only vpc provider is supported by Vpc offering List<Provider> providers = _ntwkModel.getNtwkOffDistinctProviders(guestNtwkOff.getId()); for (Provider provider : providers) { - if (provider != Provider.VPCVirtualRouter) { - throw new InvalidParameterValueException("Only provider of type " + Provider.VPCVirtualRouter.getName() - + " is supported for network offering that can be used in VPC"); + if (!supportedProviders.contains(provider) ) { + throw new InvalidParameterValueException("Provider of type " + provider.getName() + + " is not supported for network offerings that can be used in VPC"); } }
