http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
----------------------------------------------------------------------
diff --git 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
index 95d4fe1..671d510 100644
--- 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
+++ 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
@@ -74,7 +74,7 @@ public class CredentialStoreService {
 
     public org.apache.airavata.model.credential.store.SSHCredential 
getSSHCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
-    public org.apache.airavata.model.credential.store.SSHCredentialSummary 
getSSHCredentialSummary(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+    public org.apache.airavata.model.credential.store.CredentialSummary 
getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType 
type, String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
     public org.apache.airavata.model.credential.store.CertificateCredential 
getCertificateCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
@@ -84,9 +84,9 @@ public class CredentialStoreService {
 
     public Map<String,String> getAllSSHKeysForGateway(String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getAllGatewaySSHCredentialSummary(String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getAllSSHCredentialSummaryForUserInGateway(String gatewayId, String userId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForUserInGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
     public Map<String,String> getAllPWDCredentialsForGateway(String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
@@ -108,7 +108,7 @@ public class CredentialStoreService {
 
     public void getSSHCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType 
type, String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getCertificateCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -118,9 +118,9 @@ public class CredentialStoreService {
 
     public void getAllSSHKeysForGateway(String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getAllGatewaySSHCredentialSummary(String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getAllCredentialSummaryForGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void getAllSSHCredentialSummaryForUserInGateway(String gatewayId, 
String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void 
getAllCredentialSummaryForUserInGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getAllPWDCredentialsForGateway(String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -277,31 +277,32 @@ public class CredentialStoreService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHCredential failed: unknown result");
     }
 
-    public org.apache.airavata.model.credential.store.SSHCredentialSummary 
getSSHCredentialSummary(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.credential.store.CredentialSummary 
getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType 
type, String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      send_getSSHCredentialSummary(tokenId, gatewayId);
-      return recv_getSSHCredentialSummary();
+      send_getCredentialSummary(type, tokenId, gatewayId);
+      return recv_getCredentialSummary();
     }
 
-    public void send_getSSHCredentialSummary(String tokenId, String gatewayId) 
throws org.apache.thrift.TException
+    public void 
send_getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType
 type, String tokenId, String gatewayId) throws org.apache.thrift.TException
     {
-      getSSHCredentialSummary_args args = new getSSHCredentialSummary_args();
+      getCredentialSummary_args args = new getCredentialSummary_args();
+      args.setType(type);
       args.setTokenId(tokenId);
       args.setGatewayId(gatewayId);
-      sendBase("getSSHCredentialSummary", args);
+      sendBase("getCredentialSummary", args);
     }
 
-    public org.apache.airavata.model.credential.store.SSHCredentialSummary 
recv_getSSHCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public org.apache.airavata.model.credential.store.CredentialSummary 
recv_getCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
-      receiveBase(result, "getSSHCredentialSummary");
+      getCredentialSummary_result result = new getCredentialSummary_result();
+      receiveBase(result, "getCredentialSummary");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.csException != null) {
         throw result.csException;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHCredentialSummary failed: unknown result");
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getCredentialSummary failed: unknown result");
     }
 
     public org.apache.airavata.model.credential.store.CertificateCredential 
getCertificateCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
@@ -410,57 +411,59 @@ public class CredentialStoreService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllSSHKeysForGateway failed: unknown result");
     }
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getAllGatewaySSHCredentialSummary(String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      send_getAllGatewaySSHCredentialSummary(gatewayId);
-      return recv_getAllGatewaySSHCredentialSummary();
+      send_getAllCredentialSummaryForGateway(type, gatewayId);
+      return recv_getAllCredentialSummaryForGateway();
     }
 
-    public void send_getAllGatewaySSHCredentialSummary(String gatewayId) 
throws org.apache.thrift.TException
+    public void 
send_getAllCredentialSummaryForGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId) throws org.apache.thrift.TException
     {
-      getAllGatewaySSHCredentialSummary_args args = new 
getAllGatewaySSHCredentialSummary_args();
+      getAllCredentialSummaryForGateway_args args = new 
getAllCredentialSummaryForGateway_args();
+      args.setType(type);
       args.setGatewayId(gatewayId);
-      sendBase("getAllGatewaySSHCredentialSummary", args);
+      sendBase("getAllCredentialSummaryForGateway", args);
     }
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
recv_getAllGatewaySSHCredentialSummary() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
recv_getAllCredentialSummaryForGateway() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      getAllGatewaySSHCredentialSummary_result result = new 
getAllGatewaySSHCredentialSummary_result();
-      receiveBase(result, "getAllGatewaySSHCredentialSummary");
+      getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
+      receiveBase(result, "getAllCredentialSummaryForGateway");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.csException != null) {
         throw result.csException;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllGatewaySSHCredentialSummary failed: unknown result");
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllCredentialSummaryForGateway failed: unknown result");
     }
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getAllSSHCredentialSummaryForUserInGateway(String gatewayId, String userId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForUserInGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      send_getAllSSHCredentialSummaryForUserInGateway(gatewayId, userId);
-      return recv_getAllSSHCredentialSummaryForUserInGateway();
+      send_getAllCredentialSummaryForUserInGateway(type, gatewayId, userId);
+      return recv_getAllCredentialSummaryForUserInGateway();
     }
 
-    public void send_getAllSSHCredentialSummaryForUserInGateway(String 
gatewayId, String userId) throws org.apache.thrift.TException
+    public void 
send_getAllCredentialSummaryForUserInGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId) throws org.apache.thrift.TException
     {
-      getAllSSHCredentialSummaryForUserInGateway_args args = new 
getAllSSHCredentialSummaryForUserInGateway_args();
+      getAllCredentialSummaryForUserInGateway_args args = new 
getAllCredentialSummaryForUserInGateway_args();
+      args.setType(type);
       args.setGatewayId(gatewayId);
       args.setUserId(userId);
-      sendBase("getAllSSHCredentialSummaryForUserInGateway", args);
+      sendBase("getAllCredentialSummaryForUserInGateway", args);
     }
 
-    public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
recv_getAllSSHCredentialSummaryForUserInGateway() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
recv_getAllCredentialSummaryForUserInGateway() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
     {
-      getAllSSHCredentialSummaryForUserInGateway_result result = new 
getAllSSHCredentialSummaryForUserInGateway_result();
-      receiveBase(result, "getAllSSHCredentialSummaryForUserInGateway");
+      getAllCredentialSummaryForUserInGateway_result result = new 
getAllCredentialSummaryForUserInGateway_result();
+      receiveBase(result, "getAllCredentialSummaryForUserInGateway");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.csException != null) {
         throw result.csException;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllSSHCredentialSummaryForUserInGateway failed: unknown result");
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllCredentialSummaryForUserInGateway failed: unknown result");
     }
 
     public Map<String,String> getAllPWDCredentialsForGateway(String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
@@ -721,38 +724,41 @@ public class CredentialStoreService {
       }
     }
 
-    public void getSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
getCredentialSummary(org.apache.airavata.model.credential.store.SummaryType 
type, String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getSSHCredentialSummary_call method_call = new 
getSSHCredentialSummary_call(tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
+      getCredentialSummary_call method_call = new 
getCredentialSummary_call(type, tokenId, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getSSHCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class getCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private org.apache.airavata.model.credential.store.SummaryType type;
       private String tokenId;
       private String gatewayId;
-      public getSSHCredentialSummary_call(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public 
getCredentialSummary_call(org.apache.airavata.model.credential.store.SummaryType
 type, String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.type = type;
         this.tokenId = tokenId;
         this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getSSHCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getSSHCredentialSummary_args args = new getSSHCredentialSummary_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getCredentialSummary_args args = new getCredentialSummary_args();
+        args.setType(type);
         args.setTokenId(tokenId);
         args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public org.apache.airavata.model.credential.store.SSHCredentialSummary 
getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+      public org.apache.airavata.model.credential.store.CredentialSummary 
getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getSSHCredentialSummary();
+        return (new Client(prot)).recv_getCredentialSummary();
       }
     }
 
@@ -890,70 +896,76 @@ public class CredentialStoreService {
       }
     }
 
-    public void getAllGatewaySSHCredentialSummary(String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
getAllCredentialSummaryForGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getAllGatewaySSHCredentialSummary_call method_call = new 
getAllGatewaySSHCredentialSummary_call(gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
+      getAllCredentialSummaryForGateway_call method_call = new 
getAllCredentialSummaryForGateway_call(type, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllGatewaySSHCredentialSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class getAllCredentialSummaryForGateway_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private org.apache.airavata.model.credential.store.SummaryType type;
       private String gatewayId;
-      public getAllGatewaySSHCredentialSummary_call(String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public 
getAllCredentialSummaryForGateway_call(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.type = type;
         this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllGatewaySSHCredentialSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getAllGatewaySSHCredentialSummary_args args = new 
getAllGatewaySSHCredentialSummary_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllCredentialSummaryForGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllCredentialSummaryForGateway_args args = new 
getAllCredentialSummaryForGateway_args();
+        args.setType(type);
         args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+      public 
List<org.apache.airavata.model.credential.store.CredentialSummary> getResult() 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_getAllGatewaySSHCredentialSummary();
+        return (new Client(prot)).recv_getAllCredentialSummaryForGateway();
       }
     }
 
-    public void getAllSSHCredentialSummaryForUserInGateway(String gatewayId, 
String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void 
getAllCredentialSummaryForUserInGateway(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getAllSSHCredentialSummaryForUserInGateway_call method_call = new 
getAllSSHCredentialSummaryForUserInGateway_call(gatewayId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
+      getAllCredentialSummaryForUserInGateway_call method_call = new 
getAllCredentialSummaryForUserInGateway_call(type, gatewayId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllSSHCredentialSummaryForUserInGateway_call 
extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getAllCredentialSummaryForUserInGateway_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private org.apache.airavata.model.credential.store.SummaryType type;
       private String gatewayId;
       private String userId;
-      public getAllSSHCredentialSummaryForUserInGateway_call(String gatewayId, 
String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public 
getAllCredentialSummaryForUserInGateway_call(org.apache.airavata.model.credential.store.SummaryType
 type, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.type = type;
         this.gatewayId = gatewayId;
         this.userId = userId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllSSHCredentialSummaryForUserInGateway",
 org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getAllSSHCredentialSummaryForUserInGateway_args args = new 
getAllSSHCredentialSummaryForUserInGateway_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllCredentialSummaryForUserInGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllCredentialSummaryForUserInGateway_args args = new 
getAllCredentialSummaryForUserInGateway_args();
+        args.setType(type);
         args.setGatewayId(gatewayId);
         args.setUserId(userId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary> 
getResult() throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
+      public 
List<org.apache.airavata.model.credential.store.CredentialSummary> getResult() 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException {
         if (getState() != 
org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = 
new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = 
client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new 
Client(prot)).recv_getAllSSHCredentialSummaryForUserInGateway();
+        return (new 
Client(prot)).recv_getAllCredentialSummaryForUserInGateway();
       }
     }
 
@@ -1077,13 +1089,13 @@ public class CredentialStoreService {
       processMap.put("addCertificateCredential", new 
addCertificateCredential());
       processMap.put("addPasswordCredential", new addPasswordCredential());
       processMap.put("getSSHCredential", new getSSHCredential());
-      processMap.put("getSSHCredentialSummary", new getSSHCredentialSummary());
+      processMap.put("getCredentialSummary", new getCredentialSummary());
       processMap.put("getCertificateCredential", new 
getCertificateCredential());
       processMap.put("getPasswordCredential", new getPasswordCredential());
       processMap.put("getAllSSHKeysForUser", new getAllSSHKeysForUser());
       processMap.put("getAllSSHKeysForGateway", new getAllSSHKeysForGateway());
-      processMap.put("getAllGatewaySSHCredentialSummary", new 
getAllGatewaySSHCredentialSummary());
-      processMap.put("getAllSSHCredentialSummaryForUserInGateway", new 
getAllSSHCredentialSummaryForUserInGateway());
+      processMap.put("getAllCredentialSummaryForGateway", new 
getAllCredentialSummaryForGateway());
+      processMap.put("getAllCredentialSummaryForUserInGateway", new 
getAllCredentialSummaryForUserInGateway());
       processMap.put("getAllPWDCredentialsForGateway", new 
getAllPWDCredentialsForGateway());
       processMap.put("deleteSSHCredential", new deleteSSHCredential());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -1206,23 +1218,23 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getSSHCredentialSummary<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getSSHCredentialSummary_args> {
-      public getSSHCredentialSummary() {
-        super("getSSHCredentialSummary");
+    public static class getCredentialSummary<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getCredentialSummary_args> {
+      public getCredentialSummary() {
+        super("getCredentialSummary");
       }
 
-      public getSSHCredentialSummary_args getEmptyArgsInstance() {
-        return new getSSHCredentialSummary_args();
+      public getCredentialSummary_args getEmptyArgsInstance() {
+        return new getCredentialSummary_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getSSHCredentialSummary_result getResult(I iface, 
getSSHCredentialSummary_args args) throws org.apache.thrift.TException {
-        getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
+      public getCredentialSummary_result getResult(I iface, 
getCredentialSummary_args args) throws org.apache.thrift.TException {
+        getCredentialSummary_result result = new getCredentialSummary_result();
         try {
-          result.success = iface.getSSHCredentialSummary(args.tokenId, 
args.gatewayId);
+          result.success = iface.getCredentialSummary(args.type, args.tokenId, 
args.gatewayId);
         } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
           result.csException = csException;
         }
@@ -1326,23 +1338,23 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getAllGatewaySSHCredentialSummary<I extends Iface> 
extends org.apache.thrift.ProcessFunction<I, 
getAllGatewaySSHCredentialSummary_args> {
-      public getAllGatewaySSHCredentialSummary() {
-        super("getAllGatewaySSHCredentialSummary");
+    public static class getAllCredentialSummaryForGateway<I extends Iface> 
extends org.apache.thrift.ProcessFunction<I, 
getAllCredentialSummaryForGateway_args> {
+      public getAllCredentialSummaryForGateway() {
+        super("getAllCredentialSummaryForGateway");
       }
 
-      public getAllGatewaySSHCredentialSummary_args getEmptyArgsInstance() {
-        return new getAllGatewaySSHCredentialSummary_args();
+      public getAllCredentialSummaryForGateway_args getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForGateway_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getAllGatewaySSHCredentialSummary_result getResult(I iface, 
getAllGatewaySSHCredentialSummary_args args) throws 
org.apache.thrift.TException {
-        getAllGatewaySSHCredentialSummary_result result = new 
getAllGatewaySSHCredentialSummary_result();
+      public getAllCredentialSummaryForGateway_result getResult(I iface, 
getAllCredentialSummaryForGateway_args args) throws 
org.apache.thrift.TException {
+        getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
         try {
-          result.success = 
iface.getAllGatewaySSHCredentialSummary(args.gatewayId);
+          result.success = iface.getAllCredentialSummaryForGateway(args.type, 
args.gatewayId);
         } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
           result.csException = csException;
         }
@@ -1350,23 +1362,23 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getAllSSHCredentialSummaryForUserInGateway<I extends 
Iface> extends org.apache.thrift.ProcessFunction<I, 
getAllSSHCredentialSummaryForUserInGateway_args> {
-      public getAllSSHCredentialSummaryForUserInGateway() {
-        super("getAllSSHCredentialSummaryForUserInGateway");
+    public static class getAllCredentialSummaryForUserInGateway<I extends 
Iface> extends org.apache.thrift.ProcessFunction<I, 
getAllCredentialSummaryForUserInGateway_args> {
+      public getAllCredentialSummaryForUserInGateway() {
+        super("getAllCredentialSummaryForUserInGateway");
       }
 
-      public getAllSSHCredentialSummaryForUserInGateway_args 
getEmptyArgsInstance() {
-        return new getAllSSHCredentialSummaryForUserInGateway_args();
+      public getAllCredentialSummaryForUserInGateway_args 
getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForUserInGateway_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getAllSSHCredentialSummaryForUserInGateway_result getResult(I 
iface, getAllSSHCredentialSummaryForUserInGateway_args args) throws 
org.apache.thrift.TException {
-        getAllSSHCredentialSummaryForUserInGateway_result result = new 
getAllSSHCredentialSummaryForUserInGateway_result();
+      public getAllCredentialSummaryForUserInGateway_result getResult(I iface, 
getAllCredentialSummaryForUserInGateway_args args) throws 
org.apache.thrift.TException {
+        getAllCredentialSummaryForUserInGateway_result result = new 
getAllCredentialSummaryForUserInGateway_result();
         try {
-          result.success = 
iface.getAllSSHCredentialSummaryForUserInGateway(args.gatewayId, args.userId);
+          result.success = 
iface.getAllCredentialSummaryForUserInGateway(args.type, args.gatewayId, 
args.userId);
         } catch 
(org.apache.airavata.credential.store.exception.CredentialStoreException 
csException) {
           result.csException = csException;
         }
@@ -1466,13 +1478,13 @@ public class CredentialStoreService {
       processMap.put("addCertificateCredential", new 
addCertificateCredential());
       processMap.put("addPasswordCredential", new addPasswordCredential());
       processMap.put("getSSHCredential", new getSSHCredential());
-      processMap.put("getSSHCredentialSummary", new getSSHCredentialSummary());
+      processMap.put("getCredentialSummary", new getCredentialSummary());
       processMap.put("getCertificateCredential", new 
getCertificateCredential());
       processMap.put("getPasswordCredential", new getPasswordCredential());
       processMap.put("getAllSSHKeysForUser", new getAllSSHKeysForUser());
       processMap.put("getAllSSHKeysForGateway", new getAllSSHKeysForGateway());
-      processMap.put("getAllGatewaySSHCredentialSummary", new 
getAllGatewaySSHCredentialSummary());
-      processMap.put("getAllSSHCredentialSummaryForUserInGateway", new 
getAllSSHCredentialSummaryForUserInGateway());
+      processMap.put("getAllCredentialSummaryForGateway", new 
getAllCredentialSummaryForGateway());
+      processMap.put("getAllCredentialSummaryForUserInGateway", new 
getAllCredentialSummaryForUserInGateway());
       processMap.put("getAllPWDCredentialsForGateway", new 
getAllPWDCredentialsForGateway());
       processMap.put("deleteSSHCredential", new deleteSSHCredential());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -1758,20 +1770,20 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getSSHCredentialSummary<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getSSHCredentialSummary_args, 
org.apache.airavata.model.credential.store.SSHCredentialSummary> {
-      public getSSHCredentialSummary() {
-        super("getSSHCredentialSummary");
+    public static class getCredentialSummary<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getCredentialSummary_args, 
org.apache.airavata.model.credential.store.CredentialSummary> {
+      public getCredentialSummary() {
+        super("getCredentialSummary");
       }
 
-      public getSSHCredentialSummary_args getEmptyArgsInstance() {
-        return new getSSHCredentialSummary_args();
+      public getCredentialSummary_args getEmptyArgsInstance() {
+        return new getCredentialSummary_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.model.credential.store.SSHCredentialSummary>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.model.credential.store.SSHCredentialSummary>()
 { 
-          public void 
onComplete(org.apache.airavata.model.credential.store.SSHCredentialSummary o) {
-            getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
+        return new 
AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary>()
 { 
+          public void 
onComplete(org.apache.airavata.model.credential.store.CredentialSummary o) {
+            getCredentialSummary_result result = new 
getCredentialSummary_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -1784,7 +1796,7 @@ public class CredentialStoreService {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getSSHCredentialSummary_result result = new 
getSSHCredentialSummary_result();
+            getCredentialSummary_result result = new 
getCredentialSummary_result();
             if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
                         result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
                         result.setCsExceptionIsSet(true);
@@ -1810,8 +1822,8 @@ public class CredentialStoreService {
         return false;
       }
 
-      public void start(I iface, getSSHCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.SSHCredentialSummary>
 resultHandler) throws TException {
-        iface.getSSHCredentialSummary(args.tokenId, 
args.gatewayId,resultHandler);
+      public void start(I iface, getCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.credential.store.CredentialSummary>
 resultHandler) throws TException {
+        iface.getCredentialSummary(args.type, args.tokenId, 
args.gatewayId,resultHandler);
       }
     }
 
@@ -2043,20 +2055,20 @@ public class CredentialStoreService {
       }
     }
 
-    public static class getAllGatewaySSHCredentialSummary<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllGatewaySSHCredentialSummary_args, 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary>> {
-      public getAllGatewaySSHCredentialSummary() {
-        super("getAllGatewaySSHCredentialSummary");
+    public static class getAllCredentialSummaryForGateway<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllCredentialSummaryForGateway_args, 
List<org.apache.airavata.model.credential.store.CredentialSummary>> {
+      public getAllCredentialSummaryForGateway() {
+        super("getAllCredentialSummaryForGateway");
       }
 
-      public getAllGatewaySSHCredentialSummary_args getEmptyArgsInstance() {
-        return new getAllGatewaySSHCredentialSummary_args();
+      public getAllCredentialSummaryForGateway_args getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForGateway_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.credential.store.SSHCredentialSummary>
 o) {
-            getAllGatewaySSHCredentialSummary_result result = new 
getAllGatewaySSHCredentialSummary_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.credential.store.CredentialSummary> 
o) {
+            getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2069,7 +2081,7 @@ public class CredentialStoreService {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getAllGatewaySSHCredentialSummary_result result = new 
getAllGatewaySSHCredentialSummary_result();
+            getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
             if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
                         result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
                         result.setCsExceptionIsSet(true);
@@ -2095,25 +2107,25 @@ public class CredentialStoreService {
         return false;
       }
 
-      public void start(I iface, getAllGatewaySSHCredentialSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>
 resultHandler) throws TException {
-        iface.getAllGatewaySSHCredentialSummary(args.gatewayId,resultHandler);
+      public void start(I iface, getAllCredentialSummaryForGateway_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>
 resultHandler) throws TException {
+        iface.getAllCredentialSummaryForGateway(args.type, 
args.gatewayId,resultHandler);
       }
     }
 
-    public static class getAllSSHCredentialSummaryForUserInGateway<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllSSHCredentialSummaryForUserInGateway_args, 
List<org.apache.airavata.model.credential.store.SSHCredentialSummary>> {
-      public getAllSSHCredentialSummaryForUserInGateway() {
-        super("getAllSSHCredentialSummaryForUserInGateway");
+    public static class getAllCredentialSummaryForUserInGateway<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllCredentialSummaryForUserInGateway_args, 
List<org.apache.airavata.model.credential.store.CredentialSummary>> {
+      public getAllCredentialSummaryForUserInGateway() {
+        super("getAllCredentialSummaryForUserInGateway");
       }
 
-      public getAllSSHCredentialSummaryForUserInGateway_args 
getEmptyArgsInstance() {
-        return new getAllSSHCredentialSummaryForUserInGateway_args();
+      public getAllCredentialSummaryForUserInGateway_args 
getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForUserInGateway_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.credential.store.SSHCredentialSummary>
 o) {
-            getAllSSHCredentialSummaryForUserInGateway_result result = new 
getAllSSHCredentialSummaryForUserInGateway_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.credential.store.CredentialSummary> 
o) {
+            getAllCredentialSummaryForUserInGateway_result result = new 
getAllCredentialSummaryForUserInGateway_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -2126,7 +2138,7 @@ public class CredentialStoreService {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getAllSSHCredentialSummaryForUserInGateway_result result = new 
getAllSSHCredentialSummaryForUserInGateway_result();
+            getAllCredentialSummaryForUserInGateway_result result = new 
getAllCredentialSummaryForUserInGateway_result();
             if (e instanceof 
org.apache.airavata.credential.store.exception.CredentialStoreException) {
                         result.csException = 
(org.apache.airavata.credential.store.exception.CredentialStoreException) e;
                         result.setCsExceptionIsSet(true);
@@ -2152,8 +2164,8 @@ public class CredentialStoreService {
         return false;
       }
 
-      public void start(I iface, 
getAllSSHCredentialSummaryForUserInGateway_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.credential.store.SSHCredentialSummary>>
 resultHandler) throws TException {
-        iface.getAllSSHCredentialSummaryForUserInGateway(args.gatewayId, 
args.userId,resultHandler);
+      public void start(I iface, getAllCredentialSummaryForUserInGateway_args 
args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>
 resultHandler) throws TException {
+        iface.getAllCredentialSummaryForUserInGateway(args.type, 
args.gatewayId, args.userId,resultHandler);
       }
     }
 
@@ -6350,25 +6362,36 @@ public class CredentialStoreService {
 
   }
 
-  public static class getSSHCredentialSummary_args implements 
org.apache.thrift.TBase<getSSHCredentialSummary_args, 
getSSHCredentialSummary_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<getSSHCredentialSummary_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getSSHCredentialSummary_args");
+  public static class getCredentialSummary_args implements 
org.apache.thrift.TBase<getCredentialSummary_args, 
getCredentialSummary_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<getCredentialSummary_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getCredentialSummary_args");
 
-    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("tokenId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField 
GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", 
org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("type", 
org.apache.thrift.protocol.TType.I32, (short)1);
+    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("tokenId", 
org.apache.thrift.protocol.TType.STRING, (short)2);
+    private static final org.apache.thrift.protocol.TField 
GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", 
org.apache.thrift.protocol.TType.STRING, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getSSHCredentialSummary_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getSSHCredentialSummary_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getCredentialSummary_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getCredentialSummary_argsTupleSchemeFactory());
     }
 
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public org.apache.airavata.model.credential.store.SummaryType type; // 
required
     public String tokenId; // required
     public String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      TOKEN_ID((short)1, "tokenId"),
-      GATEWAY_ID((short)2, "gatewayId");
+      /**
+       * 
+       * @see org.apache.airavata.model.credential.store.SummaryType
+       */
+      TYPE((short)1, "type"),
+      TOKEN_ID((short)2, "tokenId"),
+      GATEWAY_ID((short)3, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -6383,9 +6406,11 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // TOKEN_ID
+          case 1: // TYPE
+            return TYPE;
+          case 2: // TOKEN_ID
             return TOKEN_ID;
-          case 2: // GATEWAY_ID
+          case 3: // GATEWAY_ID
             return GATEWAY_ID;
           default:
             return null;
@@ -6430,22 +6455,26 @@ public class CredentialStoreService {
     public static final Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TYPE, new 
org.apache.thrift.meta_data.FieldMetaData("type", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
org.apache.airavata.model.credential.store.SummaryType.class)));
       tmpMap.put(_Fields.TOKEN_ID, new 
org.apache.thrift.meta_data.FieldMetaData("tokenId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.GATEWAY_ID, new 
org.apache.thrift.meta_data.FieldMetaData("gatewayId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSSHCredentialSummary_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCredentialSummary_args.class,
 metaDataMap);
     }
 
-    public getSSHCredentialSummary_args() {
+    public getCredentialSummary_args() {
     }
 
-    public getSSHCredentialSummary_args(
+    public getCredentialSummary_args(
+      org.apache.airavata.model.credential.store.SummaryType type,
       String tokenId,
       String gatewayId)
     {
       this();
+      this.type = type;
       this.tokenId = tokenId;
       this.gatewayId = gatewayId;
     }
@@ -6453,7 +6482,10 @@ public class CredentialStoreService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getSSHCredentialSummary_args(getSSHCredentialSummary_args other) {
+    public getCredentialSummary_args(getCredentialSummary_args other) {
+      if (other.isSetType()) {
+        this.type = other.type;
+      }
       if (other.isSetTokenId()) {
         this.tokenId = other.tokenId;
       }
@@ -6462,21 +6494,54 @@ public class CredentialStoreService {
       }
     }
 
-    public getSSHCredentialSummary_args deepCopy() {
-      return new getSSHCredentialSummary_args(this);
+    public getCredentialSummary_args deepCopy() {
+      return new getCredentialSummary_args(this);
     }
 
     @Override
     public void clear() {
+      this.type = null;
       this.tokenId = null;
       this.gatewayId = null;
     }
 
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public org.apache.airavata.model.credential.store.SummaryType getType() {
+      return this.type;
+    }
+
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public getCredentialSummary_args 
setType(org.apache.airavata.model.credential.store.SummaryType type) {
+      this.type = type;
+      return this;
+    }
+
+    public void unsetType() {
+      this.type = null;
+    }
+
+    /** Returns true if field type is set (has been assigned a value) and 
false otherwise */
+    public boolean isSetType() {
+      return this.type != null;
+    }
+
+    public void setTypeIsSet(boolean value) {
+      if (!value) {
+        this.type = null;
+      }
+    }
+
     public String getTokenId() {
       return this.tokenId;
     }
 
-    public getSSHCredentialSummary_args setTokenId(String tokenId) {
+    public getCredentialSummary_args setTokenId(String tokenId) {
       this.tokenId = tokenId;
       return this;
     }
@@ -6500,7 +6565,7 @@ public class CredentialStoreService {
       return this.gatewayId;
     }
 
-    public getSSHCredentialSummary_args setGatewayId(String gatewayId) {
+    public getCredentialSummary_args setGatewayId(String gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -6522,6 +6587,14 @@ public class CredentialStoreService {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          
setType((org.apache.airavata.model.credential.store.SummaryType)value);
+        }
+        break;
+
       case TOKEN_ID:
         if (value == null) {
           unsetTokenId();
@@ -6543,6 +6616,9 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case TYPE:
+        return getType();
+
       case TOKEN_ID:
         return getTokenId();
 
@@ -6560,6 +6636,8 @@ public class CredentialStoreService {
       }
 
       switch (field) {
+      case TYPE:
+        return isSetType();
       case TOKEN_ID:
         return isSetTokenId();
       case GATEWAY_ID:
@@ -6572,15 +6650,24 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getSSHCredentialSummary_args)
-        return this.equals((getSSHCredentialSummary_args)that);
+      if (that instanceof getCredentialSummary_args)
+        return this.equals((getCredentialSummary_args)that);
       return false;
     }
 
-    public boolean equals(getSSHCredentialSummary_args that) {
+    public boolean equals(getCredentialSummary_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_type = true && this.isSetType();
+      boolean that_present_type = true && that.isSetType();
+      if (this_present_type || that_present_type) {
+        if (!(this_present_type && that_present_type))
+          return false;
+        if (!this.type.equals(that.type))
+          return false;
+      }
+
       boolean this_present_tokenId = true && this.isSetTokenId();
       boolean that_present_tokenId = true && that.isSetTokenId();
       if (this_present_tokenId || that_present_tokenId) {
@@ -6606,6 +6693,11 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
+      boolean present_type = true && (isSetType());
+      list.add(present_type);
+      if (present_type)
+        list.add(type.getValue());
+
       boolean present_tokenId = true && (isSetTokenId());
       list.add(present_tokenId);
       if (present_tokenId)
@@ -6620,13 +6712,23 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(getSSHCredentialSummary_args other) {
+    public int compareTo(getCredentialSummary_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
 
+      lastComparison = 
Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetType()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, 
other.type);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = 
Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -6664,9 +6766,17 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getSSHCredentialSummary_args(");
+      StringBuilder sb = new StringBuilder("getCredentialSummary_args(");
       boolean first = true;
 
+      sb.append("type:");
+      if (this.type == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.type);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("tokenId:");
       if (this.tokenId == null) {
         sb.append("null");
@@ -6688,6 +6798,9 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
+      if (type == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'type' was not present! Struct: " + toString());
+      }
       if (tokenId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'tokenId' was not present! Struct: " + toString());
       }
@@ -6713,15 +6826,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class getSSHCredentialSummary_argsStandardSchemeFactory 
implements SchemeFactory {
-      public getSSHCredentialSummary_argsStandardScheme getScheme() {
-        return new getSSHCredentialSummary_argsStandardScheme();
+    private static class getCredentialSummary_argsStandardSchemeFactory 
implements SchemeFactory {
+      public getCredentialSummary_argsStandardScheme getScheme() {
+        return new getCredentialSummary_argsStandardScheme();
       }
     }
 
-    private static class getSSHCredentialSummary_argsStandardScheme extends 
StandardScheme<getSSHCredentialSummary_args> {
+    private static class getCredentialSummary_argsStandardScheme extends 
StandardScheme<getCredentialSummary_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getCredentialSummary_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -6731,7 +6844,15 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // TOKEN_ID
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = 
org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+              }
+              break;
+            case 2: // TOKEN_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.tokenId = iprot.readString();
                 struct.setTokenIdIsSet(true);
@@ -6739,7 +6860,7 @@ public class CredentialStoreService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
-            case 2: // GATEWAY_ID
+            case 3: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -6758,10 +6879,15 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getCredentialSummary_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.type != null) {
+          oprot.writeFieldBegin(TYPE_FIELD_DESC);
+          oprot.writeI32(struct.type.getValue());
+          oprot.writeFieldEnd();
+        }
         if (struct.tokenId != null) {
           oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC);
           oprot.writeString(struct.tokenId);
@@ -6778,24 +6904,27 @@ public class CredentialStoreService {
 
     }
 
-    private static class getSSHCredentialSummary_argsTupleSchemeFactory 
implements SchemeFactory {
-      public getSSHCredentialSummary_argsTupleScheme getScheme() {
-        return new getSSHCredentialSummary_argsTupleScheme();
+    private static class getCredentialSummary_argsTupleSchemeFactory 
implements SchemeFactory {
+      public getCredentialSummary_argsTupleScheme getScheme() {
+        return new getCredentialSummary_argsTupleScheme();
       }
     }
 
-    private static class getSSHCredentialSummary_argsTupleScheme extends 
TupleScheme<getSSHCredentialSummary_args> {
+    private static class getCredentialSummary_argsTupleScheme extends 
TupleScheme<getCredentialSummary_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getCredentialSummary_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
+        oprot.writeI32(struct.type.getValue());
         oprot.writeString(struct.tokenId);
         oprot.writeString(struct.gatewayId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getSSHCredentialSummary_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getCredentialSummary_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
+        struct.type = 
org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
         struct.tokenId = iprot.readString();
         struct.setTokenIdIsSet(true);
         struct.gatewayId = iprot.readString();
@@ -6805,19 +6934,19 @@ public class CredentialStoreService {
 
   }
 
-  public static class getSSHCredentialSummary_result implements 
org.apache.thrift.TBase<getSSHCredentialSummary_result, 
getSSHCredentialSummary_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<getSSHCredentialSummary_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getSSHCredentialSummary_result");
+  public static class getCredentialSummary_result implements 
org.apache.thrift.TBase<getCredentialSummary_result, 
getCredentialSummary_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<getCredentialSummary_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getCredentialSummary_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField 
CS_EXCEPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("csException", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getSSHCredentialSummary_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getSSHCredentialSummary_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getCredentialSummary_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getCredentialSummary_resultTupleSchemeFactory());
     }
 
-    public org.apache.airavata.model.credential.store.SSHCredentialSummary 
success; // required
+    public org.apache.airavata.model.credential.store.CredentialSummary 
success; // required
     public 
org.apache.airavata.credential.store.exception.CredentialStoreException 
csException; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -6886,18 +7015,18 @@ public class CredentialStoreService {
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new 
org.apache.thrift.meta_data.FieldMetaData("success", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.credential.store.SSHCredentialSummary.class)));
+          new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.credential.store.CredentialSummary.class)));
       tmpMap.put(_Fields.CS_EXCEPTION, new 
org.apache.thrift.meta_data.FieldMetaData("csException", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSSHCredentialSummary_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getCredentialSummary_result.class,
 metaDataMap);
     }
 
-    public getSSHCredentialSummary_result() {
+    public getCredentialSummary_result() {
     }
 
-    public getSSHCredentialSummary_result(
-      org.apache.airavata.model.credential.store.SSHCredentialSummary success,
+    public getCredentialSummary_result(
+      org.apache.airavata.model.credential.store.CredentialSummary success,
       org.apache.airavata.credential.store.exception.CredentialStoreException 
csException)
     {
       this();
@@ -6908,17 +7037,17 @@ public class CredentialStoreService {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getSSHCredentialSummary_result(getSSHCredentialSummary_result 
other) {
+    public getCredentialSummary_result(getCredentialSummary_result other) {
       if (other.isSetSuccess()) {
-        this.success = new 
org.apache.airavata.model.credential.store.SSHCredentialSummary(other.success);
+        this.success = new 
org.apache.airavata.model.credential.store.CredentialSummary(other.success);
       }
       if (other.isSetCsException()) {
         this.csException = new 
org.apache.airavata.credential.store.exception.CredentialStoreException(other.csException);
       }
     }
 
-    public getSSHCredentialSummary_result deepCopy() {
-      return new getSSHCredentialSummary_result(this);
+    public getCredentialSummary_result deepCopy() {
+      return new getCredentialSummary_result(this);
     }
 
     @Override
@@ -6927,11 +7056,11 @@ public class CredentialStoreService {
       this.csException = null;
     }
 
-    public org.apache.airavata.model.credential.store.SSHCredentialSummary 
getSuccess() {
+    public org.apache.airavata.model.credential.store.CredentialSummary 
getSuccess() {
       return this.success;
     }
 
-    public getSSHCredentialSummary_result 
setSuccess(org.apache.airavata.model.credential.store.SSHCredentialSummary 
success) {
+    public getCredentialSummary_result 
setSuccess(org.apache.airavata.model.credential.store.CredentialSummary 
success) {
       this.success = success;
       return this;
     }
@@ -6955,7 +7084,7 @@ public class CredentialStoreService {
       return this.csException;
     }
 
-    public getSSHCredentialSummary_result 
setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException
 csException) {
+    public getCredentialSummary_result 
setCsException(org.apache.airavata.credential.store.exception.CredentialStoreException
 csException) {
       this.csException = csException;
       return this;
     }
@@ -6981,7 +7110,7 @@ public class CredentialStoreService {
         if (value == null) {
           unsetSuccess();
         } else {
-          
setSuccess((org.apache.airavata.model.credential.store.SSHCredentialSummary)value);
+          
setSuccess((org.apache.airavata.model.credential.store.CredentialSummary)value);
         }
         break;
 
@@ -7027,12 +7156,12 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getSSHCredentialSummary_result)
-        return this.equals((getSSHCredentialSummary_result)that);
+      if (that instanceof getCredentialSummary_result)
+        return this.equals((getCredentialSummary_result)that);
       return false;
     }
 
-    public boolean equals(getSSHCredentialSummary_result that) {
+    public boolean equals(getCredentialSummary_result that) {
       if (that == null)
         return false;
 
@@ -7075,7 +7204,7 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(getSSHCredentialSummary_result other) {
+    public int compareTo(getCredentialSummary_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -7119,7 +7248,7 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("getSSHCredentialSummary_result(");
+      StringBuilder sb = new StringBuilder("getCredentialSummary_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -7165,15 +7294,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class getSSHCredentialSummary_resultStandardSchemeFactory 
implements SchemeFactory {
-      public getSSHCredentialSummary_resultStandardScheme getScheme() {
-        return new getSSHCredentialSummary_resultStandardScheme();
+    private static class getCredentialSummary_resultStandardSchemeFactory 
implements SchemeFactory {
+      public getCredentialSummary_resultStandardScheme getScheme() {
+        return new getCredentialSummary_resultStandardScheme();
       }
     }
 
-    private static class getSSHCredentialSummary_resultStandardScheme extends 
StandardScheme<getSSHCredentialSummary_result> {
+    private static class getCredentialSummary_resultStandardScheme extends 
StandardScheme<getCredentialSummary_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getCredentialSummary_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -7185,7 +7314,7 @@ public class CredentialStoreService {
           switch (schemeField.id) {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) 
{
-                struct.success = new 
org.apache.airavata.model.credential.store.SSHCredentialSummary();
+                struct.success = new 
org.apache.airavata.model.credential.store.CredentialSummary();
                 struct.success.read(iprot);
                 struct.setSuccessIsSet(true);
               } else { 
@@ -7212,7 +7341,7 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getCredentialSummary_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -7232,16 +7361,16 @@ public class CredentialStoreService {
 
     }
 
-    private static class getSSHCredentialSummary_resultTupleSchemeFactory 
implements SchemeFactory {
-      public getSSHCredentialSummary_resultTupleScheme getScheme() {
-        return new getSSHCredentialSummary_resultTupleScheme();
+    private static class getCredentialSummary_resultTupleSchemeFactory 
implements SchemeFactory {
+      public getCredentialSummary_resultTupleScheme getScheme() {
+        return new getCredentialSummary_resultTupleScheme();
       }
     }
 
-    private static class getSSHCredentialSummary_resultTupleScheme extends 
TupleScheme<getSSHCredentialSummary_result> {
+    private static class getCredentialSummary_resultTupleScheme extends 
TupleScheme<getCredentialSummary_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getCredentialSummary_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -7260,11 +7389,11 @@ public class CredentialStoreService {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getSSHCredentialSummary_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getCredentialSummary_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
-          struct.success = new 
org.apache.airavata.model.credential.store.SSHCredentialSummary();
+          struct.success = new 
org.apache.airavata.model.credential.store.CredentialSummary();
           struct.success.read(iprot);
           struct.setSuccessIsSet(true);
         }
@@ -10882,22 +11011,33 @@ public class CredentialStoreService {
 
   }
 
-  public static class getAllGatewaySSHCredentialSummary_args implements 
org.apache.thrift.TBase<getAllGatewaySSHCredentialSummary_args, 
getAllGatewaySSHCredentialSummary_args._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllGatewaySSHCredentialSummary_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewaySSHCredentialSummary_args");
+  public static class getAllCredentialSummaryForGateway_args implements 
org.apache.thrift.TBase<getAllCredentialSummaryForGateway_args, 
getAllCredentialSummaryForGateway_args._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllCredentialSummaryForGateway_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllCredentialSummaryForGateway_args");
 
-    private static final org.apache.thrift.protocol.TField 
GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("type", 
org.apache.thrift.protocol.TType.I32, (short)1);
+    private static final org.apache.thrift.protocol.TField 
GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", 
org.apache.thrift.protocol.TType.STRING, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getAllGatewaySSHCredentialSummary_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllGatewaySSHCredentialSummary_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllCredentialSummaryForGateway_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllCredentialSummaryForGateway_argsTupleSchemeFactory());
     }
 
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public org.apache.airavata.model.credential.store.SummaryType type; // 
required
     public String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      GATEWAY_ID((short)1, "gatewayId");
+      /**
+       * 
+       * @see org.apache.airavata.model.credential.store.SummaryType
+       */
+      TYPE((short)1, "type"),
+      GATEWAY_ID((short)2, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -10912,7 +11052,9 @@ public class CredentialStoreService {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // GATEWAY_ID
+          case 1: // TYPE
+            return TYPE;
+          case 2: // GATEWAY_ID
             return GATEWAY_ID;
           default:
             return null;
@@ -10957,45 +11099,85 @@ public class CredentialStoreService {
     public static final Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TYPE, new 
org.apache.thrift.meta_data.FieldMetaData("type", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
+          new 
org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, 
org.apache.airavata.model.credential.store.SummaryType.class)));
       tmpMap.put(_Fields.GATEWAY_ID, new 
org.apache.thrift.meta_data.FieldMetaData("gatewayId", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewaySSHCredentialSummary_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllCredentialSummaryForGateway_args.class,
 metaDataMap);
     }
 
-    public getAllGatewaySSHCredentialSummary_args() {
+    public getAllCredentialSummaryForGateway_args() {
     }
 
-    public getAllGatewaySSHCredentialSummary_args(
+    public getAllCredentialSummaryForGateway_args(
+      org.apache.airavata.model.credential.store.SummaryType type,
       String gatewayId)
     {
       this();
+      this.type = type;
       this.gatewayId = gatewayId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public 
getAllGatewaySSHCredentialSummary_args(getAllGatewaySSHCredentialSummary_args 
other) {
+    public 
getAllCredentialSummaryForGateway_args(getAllCredentialSummaryForGateway_args 
other) {
+      if (other.isSetType()) {
+        this.type = other.type;
+      }
       if (other.isSetGatewayId()) {
         this.gatewayId = other.gatewayId;
       }
     }
 
-    public getAllGatewaySSHCredentialSummary_args deepCopy() {
-      return new getAllGatewaySSHCredentialSummary_args(this);
+    public getAllCredentialSummaryForGateway_args deepCopy() {
+      return new getAllCredentialSummaryForGateway_args(this);
     }
 
     @Override
     public void clear() {
+      this.type = null;
       this.gatewayId = null;
     }
 
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public org.apache.airavata.model.credential.store.SummaryType getType() {
+      return this.type;
+    }
+
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public getAllCredentialSummaryForGateway_args 
setType(org.apache.airavata.model.credential.store.SummaryType type) {
+      this.type = type;
+      return this;
+    }
+
+    public void unsetType() {
+      this.type = null;
+    }
+
+    /** Returns true if field type is set (has been assigned a value) and 
false otherwise */
+    public boolean isSetType() {
+      return this.type != null;
+    }
+
+    public void setTypeIsSet(boolean value) {
+      if (!value) {
+        this.type = null;
+      }
+    }
+
     public String getGatewayId() {
       return this.gatewayId;
     }
 
-    public getAllGatewaySSHCredentialSummary_args setGatewayId(String 
gatewayId) {
+    public getAllCredentialSummaryForGateway_args setGatewayId(String 
gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -11017,6 +11199,14 @@ public class CredentialStoreService {
 
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          
setType((org.apache.airavata.model.credential.store.SummaryType)value);
+        }
+        break;
+
       case GATEWAY_ID:
         if (value == null) {
           unsetGatewayId();
@@ -11030,6 +11220,9 @@ public class CredentialStoreService {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case TYPE:
+        return getType();
+
       case GATEWAY_ID:
         return getGatewayId();
 
@@ -11044,6 +11237,8 @@ public class CredentialStoreService {
       }
 
       switch (field) {
+      case TYPE:
+        return isSetType();
       case GATEWAY_ID:
         return isSetGatewayId();
       }
@@ -11054,15 +11249,24 @@ public class CredentialStoreService {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllGatewaySSHCredentialSummary_args)
-        return this.equals((getAllGatewaySSHCredentialSummary_args)that);
+      if (that instanceof getAllCredentialSummaryForGateway_args)
+        return this.equals((getAllCredentialSummaryForGateway_args)that);
       return false;
     }
 
-    public boolean equals(getAllGatewaySSHCredentialSummary_args that) {
+    public boolean equals(getAllCredentialSummaryForGateway_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_type = true && this.isSetType();
+      boolean that_present_type = true && that.isSetType();
+      if (this_present_type || that_present_type) {
+        if (!(this_present_type && that_present_type))
+          return false;
+        if (!this.type.equals(that.type))
+          return false;
+      }
+
       boolean this_present_gatewayId = true && this.isSetGatewayId();
       boolean that_present_gatewayId = true && that.isSetGatewayId();
       if (this_present_gatewayId || that_present_gatewayId) {
@@ -11079,6 +11283,11 @@ public class CredentialStoreService {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
+      boolean present_type = true && (isSetType());
+      list.add(present_type);
+      if (present_type)
+        list.add(type.getValue());
+
       boolean present_gatewayId = true && (isSetGatewayId());
       list.add(present_gatewayId);
       if (present_gatewayId)
@@ -11088,13 +11297,23 @@ public class CredentialStoreService {
     }
 
     @Override
-    public int compareTo(getAllGatewaySSHCredentialSummary_args other) {
+    public int compareTo(getAllCredentialSummaryForGateway_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
 
+      lastComparison = 
Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetType()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, 
other.type);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       lastComparison = 
Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -11122,9 +11341,17 @@ public class CredentialStoreService {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllGatewaySSHCredentialSummary_args(");
+      StringBuilder sb = new 
StringBuilder("getAllCredentialSummaryForGateway_args(");
       boolean first = true;
 
+      sb.append("type:");
+      if (this.type == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.type);
+      }
+      first = false;
+      if (!first) sb.append(", ");
       sb.append("gatewayId:");
       if (this.gatewayId == null) {
         sb.append("null");
@@ -11138,6 +11365,9 @@ public class CredentialStoreService {
 
     public void validate() throws org.apache.thrift.TException {
       // check for required fields
+      if (type == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'type' was not present! Struct: " + toString());
+      }
       if (gatewayId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
       }
@@ -11160,15 +11390,15 @@ public class CredentialStoreService {
       }
     }
 
-    private static class 
getAllGatewaySSHCredentialSummary_argsStandardSchemeFactory implements 
SchemeFactory {
-      public getAllGatewaySSHCredentialSummary_argsStandardScheme getScheme() {
-        return new getAllGatewaySSHCredentialSummary_argsStandardScheme();
+    private static class 
getAllCredentialSummaryForGateway_argsStandardSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForGateway_argsStandardScheme getScheme() {
+        return new getAllCredentialSummaryForGateway_argsStandardScheme();
       }
     }
 
-    private static class getAllGatewaySSHCredentialSummary_argsStandardScheme 
extends StandardScheme<getAllGatewaySSHCredentialSummary_args> {
+    private static class getAllCredentialSummaryForGateway_argsStandardScheme 
extends StandardScheme<getAllCredentialSummaryForGateway_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewaySSHCredentialSummary_args struct) throws 
org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllCredentialSummaryForGateway_args struct) throws 
org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -11178,7 +11408,15 @@ public class CredentialStoreService {
             break;
           }
           switch (schemeField.id) {
-            case 1: // GATEWAY_ID
+            case 1: // TYPE
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.type = 
org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
+                struct.setTypeIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+              }
+              break;
+            case 2: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -11197,10 +11435,15 @@ public class CredentialStoreService {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewaySSHCredentialSummary_args struct) throws 
org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllCredentialSummaryForGateway_args struct) throws 
org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructB

<TRUNCATED>

Reply via email to