From 6f3ab6de5d1b08b37593bace13f1fc517ed8d4bf Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Mon, 23 Apr 2012 11:57:40 +0100
Subject: [PATCH] Removing basic connectivity provider and OVS network offering
 as not needed for Bonita

---
 .../cloud/server/ConfigurationServerImpl.java | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index fbabf335109..78346a8b0d5 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -890,9 +890,6 @@ public class ConfigurationServerImpl implements ConfigurationServer {
         defaultIsolatedSourceNatEnabledNetworkOfferingProviders.put(Service.PortForwarding, Provider.VirtualRouter);
         defaultIsolatedSourceNatEnabledNetworkOfferingProviders.put(Service.Vpn, Provider.VirtualRouter);
 
-        Map<Network.Service, Network.Provider> ovsIsolatedSourceNatEnabledNetworkOfferingProviders = 
-        		new HashMap<Network.Service, Network.Provider>(defaultIsolatedSourceNatEnabledNetworkOfferingProviders);
-        ovsIsolatedSourceNatEnabledNetworkOfferingProviders.put(Service.Connectivity, Provider.OvsConnectivityProvider);
         Map<Network.Service, Network.Provider> netscalerServiceProviders = new HashMap<Network.Service, Network.Provider>();
         netscalerServiceProviders.put(Service.Dhcp, Provider.VirtualRouter);
         netscalerServiceProviders.put(Service.Dns, Provider.VirtualRouter);
@@ -991,24 +988,6 @@ public class ConfigurationServerImpl implements ConfigurationServer {
             s_logger.trace("Added service for the network offering: " + offService);
         }
         
-        // Offering #6 - OVS
-        s_logger.debug("Adding network offering for OVS networks");
-        NetworkOfferingVO ovsIsolatedSourceNatEnabledNetworkOffering = new NetworkOfferingVO(
-                NetworkOffering.OvsIsolatedNetworkOfferingWithSourceNatService,
-                "Offering for OVS-based Isolated networks with Source Nat service enabled",
-                TrafficType.Guest,
-                false, false, null, null, true, Availability.Optional,
-                null, Network.GuestType.Isolated, true, false);
-
-        ovsIsolatedSourceNatEnabledNetworkOffering.setState(NetworkOffering.State.Enabled);
-        ovsIsolatedSourceNatEnabledNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(ovsIsolatedSourceNatEnabledNetworkOffering);
-
-        for (Service service : ovsIsolatedSourceNatEnabledNetworkOfferingProviders.keySet()) {
-            NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(ovsIsolatedSourceNatEnabledNetworkOffering.getId(), service, ovsIsolatedSourceNatEnabledNetworkOfferingProviders.get(service));
-            _ntwkOfferingServiceMapDao.persist(offService);
-            s_logger.debug("Added service for the OVS network offering: " + offService);
-        }
-        
         txn.commit();
     }