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

CS-15512: Fix delete vpn connection

Browse Source
This commit is contained in:
Sheng Yang 2012-07-10 10:57:04 -07:00
parent c2f9417de4
commit ade3ae4e3c
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/com/cloud/api/commands/DeleteVpnConnectionCmd.java
View File

@ -100,8 +100,8 @@ public class DeleteVpnConnectionCmd extends BaseAsyncCmd {
@Override
public void execute(){
try {
Site2SiteVpnConnection result = _s2sVpnService.deleteVpnConnection(this);
if (result != null) {
boolean result = _s2sVpnService.deleteVpnConnection(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {

4
api/src/com/cloud/api/commands/DeleteVpnCustomerGatewayCmd.java
View File

@ -98,8 +98,8 @@ public class DeleteVpnCustomerGatewayCmd extends BaseAsyncCmd {
@Override
public void execute(){
Site2SiteCustomerGateway result = _s2sVpnService.deleteCustomerGateway(this);
if (result != null) {
boolean result = _s2sVpnService.deleteCustomerGateway(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {

4
api/src/com/cloud/api/commands/DeleteVpnGatewayCmd.java
View File

@ -100,8 +100,8 @@ public class DeleteVpnGatewayCmd extends BaseAsyncCmd {
@Override
public void execute(){
Site2SiteVpnGateway result = _s2sVpnService.deleteVpnGateway(this);
if (result != null) {
boolean result = _s2sVpnService.deleteVpnGateway(this);
if (result) {
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {

6
api/src/com/cloud/network/vpn/Site2SiteVpnService.java
View File

@ -38,9 +38,9 @@ public interface Site2SiteVpnService {
Site2SiteVpnConnection startVpnConnection(long id) throws ResourceUnavailableException;
IpAddress getVpnGatewayIp(Long vpnGatewayId);
Site2SiteVpnConnection createVpnConnection(CreateVpnConnectionCmd cmd) throws NetworkRuleConflictException;
Site2SiteCustomerGateway deleteCustomerGateway(DeleteVpnCustomerGatewayCmd deleteVpnCustomerGatewayCmd);
Site2SiteVpnGateway deleteVpnGateway(DeleteVpnGatewayCmd deleteVpnGatewayCmd);
Site2SiteVpnConnection deleteVpnConnection(DeleteVpnConnectionCmd deleteVpnConnectionCmd) throws ResourceUnavailableException;
boolean deleteCustomerGateway(DeleteVpnCustomerGatewayCmd deleteVpnCustomerGatewayCmd);
boolean deleteVpnGateway(DeleteVpnGatewayCmd deleteVpnGatewayCmd);
boolean deleteVpnConnection(DeleteVpnConnectionCmd deleteVpnConnectionCmd) throws ResourceUnavailableException;
Site2SiteVpnConnection resetVpnConnection(ResetVpnConnectionCmd resetVpnConnectionCmd) throws ResourceUnavailableException;
List<Site2SiteCustomerGateway> searchForCustomerGateways(ListVpnCustomerGatewaysCmd listVpnCustomerGatewaysCmd);
List<Site2SiteVpnGateway> searchForVpnGateways(ListVpnGatewaysCmd listVpnGatewaysCmd);

12
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
View File

@ -183,25 +183,25 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
}
@Override
public Site2SiteCustomerGateway deleteCustomerGateway(DeleteVpnCustomerGatewayCmd cmd) {
public boolean deleteCustomerGateway(DeleteVpnCustomerGatewayCmd cmd) {
Long id = cmd.getId();
Site2SiteCustomerGateway customerGateway = _customerGatewayDao.findById(id);
if (customerGateway == null) {
throw new InvalidParameterValueException("Fail to find customer gateway with " + id + " !");
}
_customerGatewayDao.remove(id);
return customerGateway;
return true;
}
@Override
public Site2SiteVpnGateway deleteVpnGateway(DeleteVpnGatewayCmd cmd) {
public boolean deleteVpnGateway(DeleteVpnGatewayCmd cmd) {
Long id = cmd.getId();
Site2SiteVpnGateway vpnGateway = _vpnGatewayDao.findById(id);
if (vpnGateway == null) {
throw new InvalidParameterValueException("Fail to find vpn gateway with " + id + " !");
}
_vpnGatewayDao.remove(id);
return vpnGateway;
return true;
}
@Override
@ -252,7 +252,7 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
}
@Override
public Site2SiteVpnConnection deleteVpnConnection(DeleteVpnConnectionCmd cmd) throws ResourceUnavailableException {
public boolean deleteVpnConnection(DeleteVpnConnectionCmd cmd) throws ResourceUnavailableException {
Long id = cmd.getId();
Site2SiteVpnConnectionVO conn = _vpnConnectionDao.findById(id);
if (conn == null) {
@ -262,7 +262,7 @@ public class Site2SiteVpnManagerImpl implements Site2SiteVpnService, Manager {
stopVpnConnection(id);
}
_vpnConnectionDao.remove(id);
return conn;
return true;
}
private void stopVpnConnection(Long id) throws ResourceUnavailableException {