bug CLOUDSTACK-198: VPN user add, on failure remove user currently being added only, other users will remain in Add state

Kishan Kavala · Kishan Kavala · commit 6540ff8fa1db · 2012-09-26T13:54:49.000+05:30
diff --git a/api/src/com/cloud/api/commands/AddVpnUserCmd.java b/api/src/com/cloud/api/commands/AddVpnUserCmd.java
@@ -120,7 +120,7 @@ public String getEventType() {
     public void execute(){
             VpnUser vpnUser = _entityMgr.findById(VpnUser.class, getEntityId());
             Account account = _entityMgr.findById(Account.class, vpnUser.getAccountId());
-            if (!_ravService.applyVpnUsers(vpnUser.getAccountId())) {
+            if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) {
                 throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add vpn user");
             }
             
diff --git a/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/api/src/com/cloud/api/commands/RemoveVpnUserCmd.java
@@ -113,7 +113,7 @@ public void execute(){
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove vpn user");
         }
         
-        if (!_ravService.applyVpnUsers(owner.getId())) {
+        if (!_ravService.applyVpnUsers(owner.getId(), userName)) {
             throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to apply vpn user removal");
         } 
         SuccessResponse response = new SuccessResponse(getCommandName());
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -35,7 +35,7 @@ RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, b
     VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
     boolean removeVpnUser(long vpnOwnerId, String userName);
     List<? extends VpnUser> listVpnUsers(long vpnOwnerId, String userName);
-    boolean applyVpnUsers(long vpnOwnerId);
+    boolean applyVpnUsers(long vpnOwnerId, String userName);
     
     List<? extends RemoteAccessVpn> searchForRemoteAccessVpns(ListRemoteAccessVpnsCmd cmd);
     List<? extends VpnUser> searchForVpnUsers(ListVpnUsersCmd cmd);
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -418,7 +418,7 @@ public RemoteAccessVpnVO startRemoteAccessVpn(long vpnId, boolean openFirewall)
 
     @DB
     @Override
-    public boolean applyVpnUsers(long vpnOwnerId) {
+    public boolean applyVpnUsers(long vpnOwnerId, String userName) {
         Account caller = UserContext.current().getCaller();
         Account owner = _accountDao.findById(vpnOwnerId);
         _accountMgr.checkAccess(caller, null, true, owner);
@@ -481,7 +481,7 @@ public boolean applyVpnUsers(long vpnOwnerId) {
                     _vpnUsersDao.remove(user.getId());
                 }
             } else {
-            	if (user.getState() == State.Add) {
+            	if (user.getState() == State.Add && (user.getUsername()).equals(userName)) {
                     Transaction txn = Transaction.currentTxn();
                     txn.start();            		
                     _vpnUsersDao.remove(user.getId());

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public String getEventType() {`
`120`	`120`	`public void execute(){`
`121`	`121`	`VpnUser vpnUser = _entityMgr.findById(VpnUser.class, getEntityId());`
`122`	`122`	`Account account = _entityMgr.findById(Account.class, vpnUser.getAccountId());`
`123`		`- if (!_ravService.applyVpnUsers(vpnUser.getAccountId())) {`
	`123`	`+ if (!_ravService.applyVpnUsers(vpnUser.getAccountId(), userName)) {`
`124`	`124`	`throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add vpn user");`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public void execute(){`
`113`	`113`	`throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove vpn user");`
`114`	`114`	`}`
`115`	`115`
`116`		`- if (!_ravService.applyVpnUsers(owner.getId())) {`
	`116`	`+ if (!_ravService.applyVpnUsers(owner.getId(), userName)) {`
`117`	`117`	`throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to apply vpn user removal");`
`118`	`118`	`}`
`119`	`119`	`SuccessResponse response = new SuccessResponse(getCommandName());`