You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/04/17 02:36:53 UTC
[2/4] git commit: updated refs/heads/4.1 to 2c019cc
CLOUDSTACK-2048 Add NiciraNvp as provider for the Connectivity service
Will be replaced by commit 836ce6c1 in later versions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/84f63c9d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/84f63c9d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/84f63c9d
Branch: refs/heads/4.1
Commit: 84f63c9dc8ef2a097412d80117a224532a7b60f6
Parents: d1d00d5
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Apr 16 17:22:42 2013 +0200
Committer: Chip Childers <ch...@gmail.com>
Committed: Wed Apr 17 01:30:21 2013 +0100
----------------------------------------------------------------------
.../src/com/cloud/network/vpc/VpcManagerImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84f63c9d/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 a09ddee..e42d1e9 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -260,7 +260,10 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager{
Map<Network.Service, Set<Network.Provider>> svcProviderMap = new HashMap<Network.Service, Set<Network.Provider>>();
Set<Network.Provider> defaultProviders = new HashSet<Network.Provider>();
defaultProviders.add(Provider.VPCVirtualRouter);
-
+ // Just here for 4.1, replaced by commit 836ce6c1 in newer versions
+ Set<Network.Provider> sdnProviders = new HashSet<Network.Provider>();
+ sdnProviders.add(Provider.NiciraNvp);
+
boolean sourceNatSvc = false;
boolean firewallSvs = false;
// populate the services first
@@ -271,7 +274,13 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager{
throw new InvalidParameterValueException("Service " + serviceName + " is not supported in VPC");
}
- svcProviderMap.put(service, defaultProviders);
+ if (service == Service.Connectivity) {
+ s_logger.debug("Applying Connectivity workaround, setting provider to NiciraNvp" );
+ svcProviderMap.put(service, sdnProviders);
+ }
+ else {
+ svcProviderMap.put(service, defaultProviders);
+ }
if (service == Service.NetworkACL) {
firewallSvs = true;
}