CLOUDSTACK-6578: Fixed issue in delete remote access vpn command

Jayapal · Jayapal · commit 40836344de54 · 2014-05-06T20:08:30.000+05:30
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -33,7 +33,7 @@ public interface RemoteAccessVpnService {
 
     RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall, Boolean forDisplay) throws NetworkRuleConflictException;
 
-    void destroyRemoteAccessVpnForIp(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
+    boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException;
 
     RemoteAccessVpn startRemoteAccessVpn(long vpnServerAddressId, boolean openFirewall) throws ResourceUnavailableException;
 
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
@@ -20,6 +20,8 @@
 
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
@@ -91,7 +93,9 @@ public String getEventType() {
 
     @Override
     public void execute() throws ResourceUnavailableException {
-        _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount());
+        if (! _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount())) {
+                       throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete remote access vpn");
+        }
     }
 
     @Override
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -285,15 +285,16 @@ private void validateRemoteAccessVpnConfiguration() throws ConfigurationExceptio
 
     @Override
     @DB
-    public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
+    public boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
         final RemoteAccessVpnVO vpn = _remoteAccessVpnDao.findByPublicIpAddress(ipId);
         if (vpn == null) {
             s_logger.debug("there are no Remote access vpns for public ip address id=" + ipId);
-            return;
+            return true;
         }
 
         _accountMgr.checkAccess(caller, AccessType.OperateEntry, vpn);
 
+        RemoteAccessVpn.State prevState = vpn.getState();
         vpn.setState(RemoteAccessVpn.State.Removed);
         _remoteAccessVpnDao.update(vpn.getId(), vpn);
 
@@ -305,6 +306,12 @@ public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws Resour
                     break;
                 }
             }
+        }catch (ResourceUnavailableException ex) {
+            vpn.setState(prevState);
+            _remoteAccessVpnDao.update(vpn.getId(), vpn);
+            s_logger.debug("Failed to stop the vpn " + vpn.getId() + " , so reverted state to "+
+                    RemoteAccessVpn.State.Running);
+            success = false;
         } finally {
             if (success) {
                 //Cleanup corresponding ports
@@ -366,6 +373,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                 }
             }
         }
+        return success;
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -285,15 +285,16 @@ private void validateRemoteAccessVpnConfiguration() throws ConfigurationExceptio`
`285`	`285`
`286`	`286`	`@Override`
`287`	`287`	`@DB`
`288`		`- public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {`
	`288`	`+ public boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {`
`289`	`289`	`final RemoteAccessVpnVO vpn = _remoteAccessVpnDao.findByPublicIpAddress(ipId);`
`290`	`290`	`if (vpn == null) {`
`291`	`291`	`s_logger.debug("there are no Remote access vpns for public ip address id=" + ipId);`
`292`		`- return;`
	`292`	`+ return true;`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`_accountMgr.checkAccess(caller, AccessType.OperateEntry, vpn);`
`296`	`296`
	`297`	`+ RemoteAccessVpn.State prevState = vpn.getState();`
`297`	`298`	`vpn.setState(RemoteAccessVpn.State.Removed);`
`298`	`299`	`_remoteAccessVpnDao.update(vpn.getId(), vpn);`
`299`	`300`
`@@ -305,6 +306,12 @@ public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws Resour`
`305`	`306`	`break;`
`306`	`307`	`}`
`307`	`308`	`}`
	`309`	`+ }catch (ResourceUnavailableException ex) {`
	`310`	`+ vpn.setState(prevState);`
	`311`	`+ _remoteAccessVpnDao.update(vpn.getId(), vpn);`
	`312`	`+ s_logger.debug("Failed to stop the vpn " + vpn.getId() + " , so reverted state to "+`
	`313`	`+ RemoteAccessVpn.State.Running);`
	`314`	`+ success = false;`
`308`	`315`	`} finally {`
`309`	`316`	`if (success) {`
`310`	`317`	`//Cleanup corresponding ports`
`@@ -366,6 +373,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {`
`366`	`373`	`}`
`367`	`374`	`}`
`368`	`375`	`}`
	`376`	`+ return success;`
`369`	`377`	`}`
`370`	`378`
`371`	`379`	`@Override`