You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/04/09 23:42:32 UTC
[44/50] [abbrv] git commit: updated refs/heads/vmsync to 2ee8fd2
Make the VpcManager check a list of supported providers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6c9fcb8c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6c9fcb8c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6c9fcb8c
Branch: refs/heads/vmsync
Commit: 6c9fcb8c8f6739c9bad93fea8c28be3a768ca694
Parents: d5d167c
Author: Hugo Trippaers <tr...@gmail.com>
Authored: Tue Jan 29 08:29:25 2013 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Apr 9 18:27:23 2013 +0200
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c9fcb8c/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 3948f2e..dbd36ae 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -179,6 +179,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
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);
int _cleanupInterval;
int _maxNetworks;
@@ -1054,9 +1055,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
//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");
}
}