From 84f63c9dc8ef2a097412d80117a224532a7b60f6 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Tue, 16 Apr 2013 17:22:42 +0200
Subject: [PATCH] CLOUDSTACK-2048 Add NiciraNvp as provider for the
 Connectivity service

Will be replaced by commit 836ce6c1 in later versions
---
 .../src/com/cloud/network/vpc/VpcManagerImpl.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index a09ddee12a1..e42d1e9141e 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;
             }