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

Remove Network Parameter for VPN service provider 

It's unnecessary since RemoteAccessVpnVO already have network ID binding with it.
This commit is contained in:
Sheng Yang 2013-10-17 11:35:21 -07:00
parent dad27aaf40
commit ab124a17fa
5 changed files with 13 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java
View File

@ -19,7 +19,6 @@ package com.cloud.network.element;
import java.util.List;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.VpnUser;
import com.cloud.utils.component.Adapter;
@ -27,7 +26,7 @@ import com.cloud.utils.component.Adapter;
public interface RemoteAccessVPNServiceProvider extends Adapter {
String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException;
boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
boolean startVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException;
boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
boolean stopVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException;
}

38
plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
View File

@ -95,7 +95,7 @@ import com.cloud.vm.VirtualMachineProfile;
PortForwardingServiceProvider.class, IpDeployer.class,
SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class})
public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider,
PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider {
PortForwardingServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider {
private static final Logger s_logger = Logger.getLogger(JuniperSRXExternalFirewallElement.class);
@ -225,42 +225,6 @@ PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, Junip
return applyFirewallRules(config, rules);
}
@Override
public boolean startVpn(Network config, RemoteAccessVpn vpn) throws ResourceUnavailableException {
if (!canHandle(config, Service.Vpn)) {
return false;
}
return manageRemoteAccessVpn(true, config, vpn);
}
@Override
public boolean stopVpn(Network config, RemoteAccessVpn vpn) throws ResourceUnavailableException {
if (!canHandle(config, Service.Vpn)) {
return false;
}
return manageRemoteAccessVpn(false, config, vpn);
}
@Override
public String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException {
Network config = _networksDao.findById(vpn.getNetworkId());
if (!canHandle(config, Service.Vpn)) {
return null;
}
boolean result = manageRemoteAccessVpnUsers(config, vpn, users);
String[] results = new String[users.size()];
for (int i = 0; i < results.length; i++) {
results[i] = String.valueOf(result);
}
return results;
}
@Override
public Provider getProvider() {
return Provider.JuniperSRX;

8
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -404,7 +404,9 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
}
@Override
public boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException {
public boolean startVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
Network network = _networksDao.findById(vpn.getNetworkId());
if (canHandle(network, Service.Vpn)) {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {
@ -420,7 +422,9 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl
}
@Override
public boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException {
public boolean stopVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
Network network = _networksDao.findById(vpn.getNetworkId());
if (canHandle(network, Service.Vpn)) {
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);
if (routers == null || routers.isEmpty()) {

4
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
View File

@ -247,7 +247,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
boolean success = false;
try {
for (RemoteAccessVPNServiceProvider element : _vpnServiceProviders) {
if (element.stopVpn(network, vpn)) {
if (element.stopVpn(vpn)) {
success = true;
break;
}
@ -397,7 +397,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
if (firewallOpened) {
for (RemoteAccessVPNServiceProvider element : _vpnServiceProviders) {
if (element.startVpn(network, vpn)) {
if (element.startVpn(vpn)) {
started = true;
break;
}

5
server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java
View File

@ -23,7 +23,6 @@ import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.network.Network;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.VpnUser;
import com.cloud.network.element.RemoteAccessVPNServiceProvider;
@ -63,14 +62,14 @@ public class MockRemoteAccessVPNServiceProvider extends ManagerBase implements
}
@Override
public boolean startVpn(Network network, RemoteAccessVpn vpn)
public boolean startVpn(RemoteAccessVpn vpn)
throws ResourceUnavailableException {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean stopVpn(Network network, RemoteAccessVpn vpn)
public boolean stopVpn(RemoteAccessVpn vpn)
throws ResourceUnavailableException {
// TODO Auto-generated method stub
return false;