resolve swift test 401 error code

intel-cloud · Oct 10, 2014 · 36c20b0 · 36c20b0
1 parent e11e9b9
commit 36c20b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/SwiftAuthClient.java
@@ -24,6 +24,7 @@
 import org.apache.http.*;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
 import org.apache.http.util.EntityUtils;
 
 import com.intel.cosbench.client.http.HttpClientUtil;
@@ -83,5 +84,23 @@ public void login() throws IOException, SwiftAuthClientException {
                 EntityUtils.consume(response.getEntity());
         }
     }
+
+    public boolean check() {
+    	       HttpResponse response;
+    	       if(storageURL == null || authToken == null)
+    	    	   return false;
+    	       try {
+    	           HttpHead method = new HttpHead(storageURL);
+    	           method.setHeader(X_AUTH_TOKEN, authToken);
+    	           response = client.execute(method);
+
+    	           if ((response.getStatusLine().getStatusCode() >= HttpStatus.SC_OK) &&
+    	               (response.getStatusLine().getStatusCode() < (HttpStatus.SC_OK + 100)))
+    	              return true;
+    	       } catch (IOException e) {
+    	       }
+    	        return false;
+    }
+
 
 }
diff --git a/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java b/dev/cosbench-swauth/src/com/intel/cosbench/client/swauth/utils/SwiftTokenCacheImpl.java
@@ -40,7 +40,7 @@ public static synchronized void loadSwiftTokenCache(SwiftAuthClient client, Swif
 	}
 
     public static SwiftTokenCache getSwiftTokenCache(SwiftAuthClient client) {
-		if(latestTokenCache.getVersion()==0)
+		if(latestTokenCache.getVersion()==0 || ! client.check())
 			loadSwiftTokenCache(client,latestTokenCache);
             	return latestTokenCache;
     }