Skip to content

Commit ab124a1

Browse files
author
Sheng Yang
committed
Remove Network Parameter for VPN service provider
It's unnecessary since RemoteAccessVpnVO already have network ID binding with it.
1 parent dad27aa commit ab124a1

5 files changed

Lines changed: 13 additions & 47 deletions

File tree

‎api/src/com/cloud/network/element/RemoteAccessVPNServiceProvider.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@
1919
import java.util.List;
2020

2121
import com.cloud.exception.ResourceUnavailableException;
22-
import com.cloud.network.Network;
2322
import com.cloud.network.RemoteAccessVpn;
2423
import com.cloud.network.VpnUser;
2524
import com.cloud.utils.component.Adapter;
2625

2726
public interface RemoteAccessVPNServiceProvider extends Adapter {
2827
String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException;
2928

30-
boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
29+
boolean startVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException;
3130

32-
boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
31+
boolean stopVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException;
3332
}

‎plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
PortForwardingServiceProvider.class, IpDeployer.class,
9696
SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class})
9797
public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceManagerImpl implements SourceNatServiceProvider, FirewallServiceProvider,
98-
PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider {
98+
PortForwardingServiceProvider, IpDeployer, JuniperSRXFirewallElementService, StaticNatServiceProvider {
9999

100100
private static final Logger s_logger = Logger.getLogger(JuniperSRXExternalFirewallElement.class);
101101

@@ -225,42 +225,6 @@ public boolean applyFWRules(Network config, List<? extends FirewallRule> rules)
225225
return applyFirewallRules(config, rules);
226226
}
227227

228-
@Override
229-
public boolean startVpn(Network config, RemoteAccessVpn vpn) throws ResourceUnavailableException {
230-
if (!canHandle(config, Service.Vpn)) {
231-
return false;
232-
}
233-
234-
return manageRemoteAccessVpn(true, config, vpn);
235-
236-
}
237-
238-
@Override
239-
public boolean stopVpn(Network config, RemoteAccessVpn vpn) throws ResourceUnavailableException {
240-
if (!canHandle(config, Service.Vpn)) {
241-
return false;
242-
}
243-
244-
return manageRemoteAccessVpn(false, config, vpn);
245-
}
246-
247-
@Override
248-
public String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users) throws ResourceUnavailableException {
249-
Network config = _networksDao.findById(vpn.getNetworkId());
250-
251-
if (!canHandle(config, Service.Vpn)) {
252-
return null;
253-
}
254-
255-
boolean result = manageRemoteAccessVpnUsers(config, vpn, users);
256-
String[] results = new String[users.size()];
257-
for (int i = 0; i < results.length; i++) {
258-
results[i] = String.valueOf(result);
259-
}
260-
261-
return results;
262-
}
263-
264228
@Override
265229
public Provider getProvider() {
266230
return Provider.JuniperSRX;

‎server/src/com/cloud/network/element/VirtualRouterElement.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ public String[] applyVpnUsers(RemoteAccessVpn vpn, List<? extends VpnUser> users
404404
}
405405

406406
@Override
407-
public boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException {
407+
public boolean startVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
408+
Network network = _networksDao.findById(vpn.getNetworkId());
409+
408410
if (canHandle(network, Service.Vpn)) {
409411
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);
410412
if (routers == null || routers.isEmpty()) {
@@ -420,7 +422,9 @@ public boolean startVpn(Network network, RemoteAccessVpn vpn) throws ResourceUna
420422
}
421423

422424
@Override
423-
public boolean stopVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException {
425+
public boolean stopVpn(RemoteAccessVpn vpn) throws ResourceUnavailableException {
426+
Network network = _networksDao.findById(vpn.getNetworkId());
427+
424428
if (canHandle(network, Service.Vpn)) {
425429
List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER);
426430
if (routers == null || routers.isEmpty()) {

‎server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws Resour
247247
boolean success = false;
248248
try {
249249
for (RemoteAccessVPNServiceProvider element : _vpnServiceProviders) {
250-
if (element.stopVpn(network, vpn)) {
250+
if (element.stopVpn(vpn)) {
251251
success = true;
252252
break;
253253
}
@@ -397,7 +397,7 @@ public RemoteAccessVpnVO startRemoteAccessVpn(long ipAddressId, boolean openFire
397397

398398
if (firewallOpened) {
399399
for (RemoteAccessVPNServiceProvider element : _vpnServiceProviders) {
400-
if (element.startVpn(network, vpn)) {
400+
if (element.startVpn(vpn)) {
401401
started = true;
402402
break;
403403
}

‎server/test/com/cloud/network/vpn/MockRemoteAccessVPNServiceProvider.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import javax.naming.ConfigurationException;
2424

2525
import com.cloud.exception.ResourceUnavailableException;
26-
import com.cloud.network.Network;
2726
import com.cloud.network.RemoteAccessVpn;
2827
import com.cloud.network.VpnUser;
2928
import com.cloud.network.element.RemoteAccessVPNServiceProvider;
@@ -63,14 +62,14 @@ public String[] applyVpnUsers(RemoteAccessVpn vpn,
6362
}
6463

6564
@Override
66-
public boolean startVpn(Network network, RemoteAccessVpn vpn)
65+
public boolean startVpn(RemoteAccessVpn vpn)
6766
throws ResourceUnavailableException {
6867
// TODO Auto-generated method stub
6968
return false;
7069
}
7170

7271
@Override
73-
public boolean stopVpn(Network network, RemoteAccessVpn vpn)
72+
public boolean stopVpn(RemoteAccessVpn vpn)
7473
throws ResourceUnavailableException {
7574
// TODO Auto-generated method stub
7675
return false;

0 commit comments

Comments
 (0)