apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-18 11:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 12821: no VPN support on Juniper

Browse Source 
status 12821: resolved fixed
This commit is contained in:
Alena Prokharchyk 2012-01-30 15:06:35 -08:00
parent d1b0b0954a
commit 0196eb5679
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -5783,6 +5783,15 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
requiredServices.remove(Network.Service.Gateway); requiredServices.remove(Network.Service.Gateway);
} }
//Remove firewall from the list of services-to-compare
if (requiredServices.contains(Network.Service.Firewall)) {
requiredServices.remove(Network.Service.Firewall);
}
if (enabledServices.contains(Network.Service.Firewall)) {
enabledServices.remove(Network.Service.Firewall);
}
//exclude gateway service //exclude gateway service
if(enabledServices.size() != requiredServices.size()){ if(enabledServices.size() != requiredServices.size()){
StringBuilder servicesSet = new StringBuilder(); StringBuilder servicesSet = new StringBuilder();

3
server/src/com/cloud/network/element/ExternalDhcpElement.java
View File

@ -72,8 +72,9 @@ public class ExternalDhcpElement extends AdapterBase implements NetworkElement,
} }
private static Map<Service, Map<Capability, String>> setCapabilities() { private static Map<Service, Map<Capability, String>> setCapabilities() {
//No external dhcp support for Acton release
Map<Service, Map<Capability, String>> capabilities = new HashMap<Service, Map<Capability, String>>(); Map<Service, Map<Capability, String>> capabilities = new HashMap<Service, Map<Capability, String>>();
capabilities.put(Service.Dhcp, null); // capabilities.put(Service.Dhcp, null);
return capabilities; return capabilities;
} }

9
server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
View File

@ -253,10 +253,11 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan
firewallCapabilities.put(Capability.TrafficStatistics, "per public ip"); firewallCapabilities.put(Capability.TrafficStatistics, "per public ip");
capabilities.put(Service.Firewall, firewallCapabilities); capabilities.put(Service.Firewall, firewallCapabilities);
// Set VPN capabilities //Disabling VPN for Juniper in Acton as it 1) Was never tested 2) probably just doesn't work
Map<Capability, String> vpnCapabilities = new HashMap<Capability, String>(); // // Set VPN capabilities
vpnCapabilities.put(Capability.SupportedVpnTypes, "ipsec"); // Map<Capability, String> vpnCapabilities = new HashMap<Capability, String>();
capabilities.put(Service.Vpn, vpnCapabilities); // vpnCapabilities.put(Capability.SupportedVpnTypes, "ipsec");
// capabilities.put(Service.Vpn, vpnCapabilities);
capabilities.put(Service.Gateway, null); capabilities.put(Service.Gateway, null);