From e94b71934725781a4c01f242264fad3a24d84595 Mon Sep 17 00:00:00 2001
From: danikov <dan.lobianco@cloudsoftcorp.com>
Date: Mon, 12 Mar 2012 11:41:05 +0000
Subject: [PATCH] user unlock action (pseudo-impl only)

---
 .../director/v1_5/features/UserAsyncClient.java   | 10 +++++++++-
 .../vcloud/director/v1_5/features/UserClient.java |  9 ++++++++-
 .../v1_5/features/UserClientLiveTest.java         | 15 +++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java
index a0fc05fc2b..82c41560b3 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserAsyncClient.java
@@ -88,5 +88,13 @@ public interface UserAsyncClient {
    @ExceptionParser(ThrowVCloudErrorOn4xx.class)
    ListenableFuture<Void> deleteUser(@EndpointParam URI userRef);
  
-// POST /admin/user/{id}/action/unlock
+   /**
+    * @see UserClient#unlockUser(URI)
+    */
+   @POST
+   @Path("/action/unlock")
+   @Consumes
+   @JAXBResponseParser
+   @ExceptionParser(ThrowVCloudErrorOn4xx.class)
+   ListenableFuture<Void> unlockUser(@EndpointParam URI userRef);
 }
diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java
index d812bb1bb7..350e03af21 100644
--- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java
+++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/features/UserClient.java
@@ -79,5 +79,12 @@ public interface UserClient {
     */
    void deleteUser(URI userRef);
    
-//   POST /admin/user/{id}/action/unlock
+   /**
+    * Unlocks a user.
+    * 
+    * <pre>
+    * POST /admin/user/{id}/action/unlock
+    * </pre>
+    */
+   void unlockUser(URI userRef);
 }
diff --git a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java
index 1634dfaa9c..a635d4ed6c 100644
--- a/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java
+++ b/labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/UserClientLiveTest.java
@@ -162,10 +162,21 @@ public class UserClientLiveTest extends BaseVCloudDirectorClientLiveTest {
       }
    }
  
-// POST /admin/user/{id}/action/unlock
+// 
+
+   
+   @Test(testName = "POST /admin/user/{id}/action/unlock",
+         dependsOnMethods = { "testUpdateUser" } )
+   public void testUnlockUser() {
+      //TODO: check previous tests a) enabled lockout, b) set password
+      //TODO: attempt too many times with the wrong password
+      //TODO: verify access is denied
+      //TODO: unlock user
+      //TODO: verify access is renewed
+   }
  
    @Test(testName = "DELETE /admin/user/{id}",
-         dependsOnMethods = { "testUpdateUser" } )
+         dependsOnMethods = { "testUnlockUser" } )
    public void testDeleteUser() {
       userClient.deleteUser(user.getHref());