From a3e6bce8e626920f0a496f7971cb302a22233e40 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Mon, 20 Feb 2017 16:26:45 +0530 Subject: [PATCH] Revert "CLOUDSTACK-9711: Fixed error reporting while adding vpn user" This reverts commit d7b792c3f91e8a3038d53a51fae700a158f92740. --- .../com/cloud/network/vpn/RemoteAccessVpnService.java | 2 +- .../cloudstack/api/command/user/vpn/AddVpnUserCmd.java | 8 ++------ .../api/command/user/vpn/RemoveVpnUserCmd.java | 9 ++------- .../cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 10 +--------- 4 files changed, 6 insertions(+), 23 deletions(-) diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java index 5426d181e70..d089b852449 100644 --- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java +++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java @@ -43,7 +43,7 @@ public interface RemoteAccessVpnService { List listVpnUsers(long vpnOwnerId, String userName); - boolean applyVpnUsers(long vpnOwnerId, String userName) throws ResourceUnavailableException; + boolean applyVpnUsers(long vpnOwnerId, String userName); Pair, Integer> searchForRemoteAccessVpns(ListRemoteAccessVpnsCmd cmd); diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java index f6a30b3cbe2..9993102eca1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/AddVpnUserCmd.java @@ -119,12 +119,8 @@ public class AddVpnUserCmd extends BaseAsyncCreateCmd { public void execute() { VpnUser vpnUser = _entityMgr.findById(VpnUser.class, getEntityId()); Account account = _entityMgr.findById(Account.class, vpnUser.getAccountId()); - try { - if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add vpn user"); - } - }catch (Exception ex) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add vpn user due to resource unavailable"); + if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add vpn user"); } VpnUsersResponse vpnResponse = new VpnUsersResponse(); diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java index 140bdad717f..f552b14fbf1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vpn/RemoveVpnUserCmd.java @@ -115,14 +115,9 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove vpn user"); } - try { - if (!_ravService.applyVpnUsers(owner.getId(), userName)) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to apply vpn user removal"); - } - }catch (Exception ex) { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to remove vpn user due to resource unavailable"); + if (!_ravService.applyVpnUsers(owner.getId(), userName)) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to apply vpn user removal"); } - SuccessResponse response = new SuccessResponse(getCommandName()); setResponseObject(response); } diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java index 2e234746487..065c097f0f8 100644 --- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java +++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java @@ -501,14 +501,13 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc @DB @Override - public boolean applyVpnUsers(long vpnOwnerId, String userName) throws ResourceUnavailableException { + public boolean applyVpnUsers(long vpnOwnerId, String userName) { Account caller = CallContext.current().getCallingAccount(); Account owner = _accountDao.findById(vpnOwnerId); _accountMgr.checkAccess(caller, null, true, owner); s_logger.debug("Applying vpn users for " + owner); List vpns = _remoteAccessVpnDao.findByAccount(vpnOwnerId); - RemoteAccessVpnVO vpnTemp = null; List users = _vpnUsersDao.listByAccount(vpnOwnerId); @@ -538,14 +537,12 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc } else { finals[i] = false; success = false; - vpnTemp = vpn; } } } } catch (Exception e) { s_logger.warn("Unable to apply vpn users ", e); success = false; - vpnTemp = vpn; for (int i = 0; i < finals.length; i++) { finals[i] = false; @@ -578,11 +575,6 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc } } - if (!success) { - throw new ResourceUnavailableException("Failed add vpn user due to Resource unavailable ", - RemoteAccessVPNServiceProvider.class, vpnTemp.getId()); - } - return success; }