etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2048 Add NiciraNvp as provider for the Connectivity service 

Will be replaced by commit 836ce6c1 in later versions
This commit is contained in:
Hugo Trippaers 2013-04-16 17:22:42 +02:00 committed by Chip Childers
parent d1d00d54a1
commit 84f63c9dc8
1 changed files with 11 additions and 2 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

@ -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;
}