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

Removing basic connectivity provider and OVS network offering as not 

needed for Bonita
This commit is contained in:
Salvatore Orlando 2012-04-23 11:57:40 +01:00
parent 2459b16b81
commit 6f3ab6de5d
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/src/com/cloud/server/ConfigurationServerImpl.java
View File

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