http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index a6af662..0367bbc 100644
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -307,30 +307,37 @@ public class Airavata {
 
     /**
      * 
-     * Get all Public Keys of the Gateway
+     * Get all Credential summaries for the Gateway
      * 
      * @param CredStoreToken
      *    Credential Store Token which you want to find the Public Key for.
      * 
+     * @param credential_store_data_models.SummaryType
+     *    Summary type : SSH,PASSWD or CERT
+     * 
      * @param gatewayId
      *    This is the unique identifier of your gateway where the token and 
public key was generated from.
      * 
-     * @return publicKey
+     * @return List of Credential Summary Objects
      * 
      * 
      * 
      * @param authzToken
+     * @param type
      * @param gatewayId
      */
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForGateway(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.airavata.model.credential.store.SummaryType type, String 
gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
 
     /**
      * 
-     * Get all Public Key summaries for user in a Gateway
+     * Get all Credential summaries for user in a Gateway
      * 
      * @param CredStoreToken
      *    Credential Store Token which you want to find the Public Key for.
      * 
+     * @param credential_store_data_models.SummaryType
+     *    Summary type : SSH,PASSWD or CERT
+     * 
      * @param gatewayId
      *    This is the unique identifier of your gateway where the token and 
public key was generated from.
      * 
@@ -342,10 +349,11 @@ public class Airavata {
      * 
      * 
      * @param authzToken
+     * @param type
      * @param gatewayId
      * @param userId
      */
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForUsersInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, org.apache.airavata.model.credential.store.SummaryType type, 
String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
 
     public Map<String,String> 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
 
@@ -3041,9 +3049,9 @@ public class Airavata {
 
     public void 
getAllGatewaySSHPubKeys(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
getAllCredentialSummaryForGateway(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.airavata.model.credential.store.SummaryType type, String 
gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getAllCredentialSummaryForUsersInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, 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 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
@@ -4011,24 +4019,25 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllGatewaySSHPubKeys failed: unknown result");
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForGateway(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.airavata.model.credential.store.SummaryType type, String 
gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
     {
-      send_getAllGatewaySSHPubKeysSummary(authzToken, gatewayId);
-      return recv_getAllGatewaySSHPubKeysSummary();
+      send_getAllCredentialSummaryForGateway(authzToken, type, gatewayId);
+      return recv_getAllCredentialSummaryForGateway();
     }
 
-    public void 
send_getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId) throws org.apache.thrift.TException
+    public void 
send_getAllCredentialSummaryForGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, org.apache.airavata.model.credential.store.SummaryType type, 
String gatewayId) throws org.apache.thrift.TException
     {
-      getAllGatewaySSHPubKeysSummary_args args = new 
getAllGatewaySSHPubKeysSummary_args();
+      getAllCredentialSummaryForGateway_args args = new 
getAllCredentialSummaryForGateway_args();
       args.setAuthzToken(authzToken);
+      args.setType(type);
       args.setGatewayId(gatewayId);
-      sendBase("getAllGatewaySSHPubKeysSummary", args);
+      sendBase("getAllCredentialSummaryForGateway", args);
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
recv_getAllGatewaySSHPubKeysSummary() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
recv_getAllCredentialSummaryForGateway() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
     {
-      getAllGatewaySSHPubKeysSummary_result result = new 
getAllGatewaySSHPubKeysSummary_result();
-      receiveBase(result, "getAllGatewaySSHPubKeysSummary");
+      getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
+      receiveBase(result, "getAllCredentialSummaryForGateway");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -4041,28 +4050,29 @@ public class Airavata {
       if (result.ase != null) {
         throw result.ase;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllGatewaySSHPubKeysSummary 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.appcatalog.credentialsummary.CredentialSummary> 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getAllCredentialSummaryForUsersInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, org.apache.airavata.model.credential.store.SummaryType type, 
String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
     {
-      send_getAllSSHPubKeysSummaryForUserInGateway(authzToken, gatewayId, 
userId);
-      return recv_getAllSSHPubKeysSummaryForUserInGateway();
+      send_getAllCredentialSummaryForUsersInGateway(authzToken, type, 
gatewayId, userId);
+      return recv_getAllCredentialSummaryForUsersInGateway();
     }
 
-    public void 
send_getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.thrift.TException
+    public void 
send_getAllCredentialSummaryForUsersInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, org.apache.airavata.model.credential.store.SummaryType type, 
String gatewayId, String userId) throws org.apache.thrift.TException
     {
-      getAllSSHPubKeysSummaryForUserInGateway_args args = new 
getAllSSHPubKeysSummaryForUserInGateway_args();
+      getAllCredentialSummaryForUsersInGateway_args args = new 
getAllCredentialSummaryForUsersInGateway_args();
       args.setAuthzToken(authzToken);
+      args.setType(type);
       args.setGatewayId(gatewayId);
       args.setUserId(userId);
-      sendBase("getAllSSHPubKeysSummaryForUserInGateway", args);
+      sendBase("getAllCredentialSummaryForUsersInGateway", args);
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
recv_getAllSSHPubKeysSummaryForUserInGateway() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
recv_getAllCredentialSummaryForUsersInGateway() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
     {
-      getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
-      receiveBase(result, "getAllSSHPubKeysSummaryForUserInGateway");
+      getAllCredentialSummaryForUsersInGateway_result result = new 
getAllCredentialSummaryForUsersInGateway_result();
+      receiveBase(result, "getAllCredentialSummaryForUsersInGateway");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -4075,7 +4085,7 @@ public class Airavata {
       if (result.ase != null) {
         throw result.ase;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllSSHPubKeysSummaryForUserInGateway failed: unknown result");
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllCredentialSummaryForUsersInGateway failed: unknown result");
     }
 
     public Map<String,String> 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
@@ -10253,76 +10263,82 @@ public class Airavata {
       }
     }
 
-    public void 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+    public void 
getAllCredentialSummaryForGateway(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.airavata.model.credential.store.SummaryType type, String 
gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getAllGatewaySSHPubKeysSummary_call method_call = new 
getAllGatewaySSHPubKeysSummary_call(authzToken, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
+      getAllCredentialSummaryForGateway_call method_call = new 
getAllCredentialSummaryForGateway_call(authzToken, type, gatewayId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllGatewaySSHPubKeysSummary_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class getAllCredentialSummaryForGateway_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
+      private org.apache.airavata.model.credential.store.SummaryType type;
       private String gatewayId;
-      public 
getAllGatewaySSHPubKeysSummary_call(org.apache.airavata.model.security.AuthzToken
 authzToken, 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.security.AuthzToken
 authzToken, 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.authzToken = authzToken;
+        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("getAllGatewaySSHPubKeysSummary", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getAllGatewaySSHPubKeysSummary_args args = new 
getAllGatewaySSHPubKeysSummary_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllCredentialSummaryForGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllCredentialSummaryForGateway_args args = new 
getAllCredentialSummaryForGateway_args();
         args.setAuthzToken(authzToken);
+        args.setType(type);
         args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException {
+      public 
List<org.apache.airavata.model.credential.store.CredentialSummary> getResult() 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
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_getAllGatewaySSHPubKeysSummary();
+        return (new Client(prot)).recv_getAllCredentialSummaryForGateway();
       }
     }
 
-    public void 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
getAllCredentialSummaryForUsersInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, org.apache.airavata.model.credential.store.SummaryType type, 
String gatewayId, String userId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getAllSSHPubKeysSummaryForUserInGateway_call method_call = new 
getAllSSHPubKeysSummaryForUserInGateway_call(authzToken, gatewayId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
+      getAllCredentialSummaryForUsersInGateway_call method_call = new 
getAllCredentialSummaryForUsersInGateway_call(authzToken, type, gatewayId, 
userId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllSSHPubKeysSummaryForUserInGateway_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class getAllCredentialSummaryForUsersInGateway_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
+      private org.apache.airavata.model.credential.store.SummaryType type;
       private String gatewayId;
       private String userId;
-      public 
getAllSSHPubKeysSummaryForUserInGateway_call(org.apache.airavata.model.security.AuthzToken
 authzToken, 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 
getAllCredentialSummaryForUsersInGateway_call(org.apache.airavata.model.security.AuthzToken
 authzToken, 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.authzToken = authzToken;
+        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("getAllSSHPubKeysSummaryForUserInGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getAllSSHPubKeysSummaryForUserInGateway_args args = new 
getAllSSHPubKeysSummaryForUserInGateway_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getAllCredentialSummaryForUsersInGateway", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllCredentialSummaryForUsersInGateway_args args = new 
getAllCredentialSummaryForUsersInGateway_args();
         args.setAuthzToken(authzToken);
+        args.setType(type);
         args.setGatewayId(gatewayId);
         args.setUserId(userId);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException {
+      public 
List<org.apache.airavata.model.credential.store.CredentialSummary> getResult() 
throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
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_getAllSSHPubKeysSummaryForUserInGateway();
+        return (new 
Client(prot)).recv_getAllCredentialSummaryForUsersInGateway();
       }
     }
 
@@ -15944,8 +15960,8 @@ public class Airavata {
       processMap.put("registerPwdCredential", new registerPwdCredential());
       processMap.put("getSSHPubKey", new getSSHPubKey());
       processMap.put("getAllGatewaySSHPubKeys", new getAllGatewaySSHPubKeys());
-      processMap.put("getAllGatewaySSHPubKeysSummary", new 
getAllGatewaySSHPubKeysSummary());
-      processMap.put("getAllSSHPubKeysSummaryForUserInGateway", new 
getAllSSHPubKeysSummaryForUserInGateway());
+      processMap.put("getAllCredentialSummaryForGateway", new 
getAllCredentialSummaryForGateway());
+      processMap.put("getAllCredentialSummaryForUsersInGateway", new 
getAllCredentialSummaryForUsersInGateway());
       processMap.put("getAllGatewayPWDCredentials", new 
getAllGatewayPWDCredentials());
       processMap.put("deleteSSHPubKey", new deleteSSHPubKey());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -16636,23 +16652,23 @@ public class Airavata {
       }
     }
 
-    public static class getAllGatewaySSHPubKeysSummary<I extends Iface> 
extends org.apache.thrift.ProcessFunction<I, 
getAllGatewaySSHPubKeysSummary_args> {
-      public getAllGatewaySSHPubKeysSummary() {
-        super("getAllGatewaySSHPubKeysSummary");
+    public static class getAllCredentialSummaryForGateway<I extends Iface> 
extends org.apache.thrift.ProcessFunction<I, 
getAllCredentialSummaryForGateway_args> {
+      public getAllCredentialSummaryForGateway() {
+        super("getAllCredentialSummaryForGateway");
       }
 
-      public getAllGatewaySSHPubKeysSummary_args getEmptyArgsInstance() {
-        return new getAllGatewaySSHPubKeysSummary_args();
+      public getAllCredentialSummaryForGateway_args getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForGateway_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getAllGatewaySSHPubKeysSummary_result getResult(I iface, 
getAllGatewaySSHPubKeysSummary_args args) throws org.apache.thrift.TException {
-        getAllGatewaySSHPubKeysSummary_result result = new 
getAllGatewaySSHPubKeysSummary_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.getAllGatewaySSHPubKeysSummary(args.authzToken, args.gatewayId);
+          result.success = 
iface.getAllCredentialSummaryForGateway(args.authzToken, args.type, 
args.gatewayId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -16664,23 +16680,23 @@ public class Airavata {
       }
     }
 
-    public static class getAllSSHPubKeysSummaryForUserInGateway<I extends 
Iface> extends org.apache.thrift.ProcessFunction<I, 
getAllSSHPubKeysSummaryForUserInGateway_args> {
-      public getAllSSHPubKeysSummaryForUserInGateway() {
-        super("getAllSSHPubKeysSummaryForUserInGateway");
+    public static class getAllCredentialSummaryForUsersInGateway<I extends 
Iface> extends org.apache.thrift.ProcessFunction<I, 
getAllCredentialSummaryForUsersInGateway_args> {
+      public getAllCredentialSummaryForUsersInGateway() {
+        super("getAllCredentialSummaryForUsersInGateway");
       }
 
-      public getAllSSHPubKeysSummaryForUserInGateway_args 
getEmptyArgsInstance() {
-        return new getAllSSHPubKeysSummaryForUserInGateway_args();
+      public getAllCredentialSummaryForUsersInGateway_args 
getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForUsersInGateway_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getAllSSHPubKeysSummaryForUserInGateway_result getResult(I iface, 
getAllSSHPubKeysSummaryForUserInGateway_args args) throws 
org.apache.thrift.TException {
-        getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+      public getAllCredentialSummaryForUsersInGateway_result getResult(I 
iface, getAllCredentialSummaryForUsersInGateway_args args) throws 
org.apache.thrift.TException {
+        getAllCredentialSummaryForUsersInGateway_result result = new 
getAllCredentialSummaryForUsersInGateway_result();
         try {
-          result.success = 
iface.getAllSSHPubKeysSummaryForUserInGateway(args.authzToken, args.gatewayId, 
args.userId);
+          result.success = 
iface.getAllCredentialSummaryForUsersInGateway(args.authzToken, args.type, 
args.gatewayId, args.userId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -21269,8 +21285,8 @@ public class Airavata {
       processMap.put("registerPwdCredential", new registerPwdCredential());
       processMap.put("getSSHPubKey", new getSSHPubKey());
       processMap.put("getAllGatewaySSHPubKeys", new getAllGatewaySSHPubKeys());
-      processMap.put("getAllGatewaySSHPubKeysSummary", new 
getAllGatewaySSHPubKeysSummary());
-      processMap.put("getAllSSHPubKeysSummaryForUserInGateway", new 
getAllSSHPubKeysSummaryForUserInGateway());
+      processMap.put("getAllCredentialSummaryForGateway", new 
getAllCredentialSummaryForGateway());
+      processMap.put("getAllCredentialSummaryForUsersInGateway", new 
getAllCredentialSummaryForUsersInGateway());
       processMap.put("getAllGatewayPWDCredentials", new 
getAllGatewayPWDCredentials());
       processMap.put("deleteSSHPubKey", new deleteSSHPubKey());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -22705,20 +22721,20 @@ public class Airavata {
       }
     }
 
-    public static class getAllGatewaySSHPubKeysSummary<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getAllGatewaySSHPubKeysSummary_args, 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>> 
{
-      public getAllGatewaySSHPubKeysSummary() {
-        super("getAllGatewaySSHPubKeysSummary");
+    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 getAllGatewaySSHPubKeysSummary_args getEmptyArgsInstance() {
-        return new getAllGatewaySSHPubKeysSummary_args();
+      public getAllCredentialSummaryForGateway_args getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForGateway_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>>
 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.appcatalog.credentialsummary.CredentialSummary>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 o) {
-            getAllGatewaySSHPubKeysSummary_result result = new 
getAllGatewaySSHPubKeysSummary_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);
@@ -22731,7 +22747,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getAllGatewaySSHPubKeysSummary_result result = new 
getAllGatewaySSHPubKeysSummary_result();
+            getAllCredentialSummaryForGateway_result result = new 
getAllCredentialSummaryForGateway_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -22767,25 +22783,25 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getAllGatewaySSHPubKeysSummary_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>>
 resultHandler) throws TException {
-        iface.getAllGatewaySSHPubKeysSummary(args.authzToken, 
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.authzToken, args.type, 
args.gatewayId,resultHandler);
       }
     }
 
-    public static class getAllSSHPubKeysSummaryForUserInGateway<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllSSHPubKeysSummaryForUserInGateway_args, 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>> 
{
-      public getAllSSHPubKeysSummaryForUserInGateway() {
-        super("getAllSSHPubKeysSummaryForUserInGateway");
+    public static class getAllCredentialSummaryForUsersInGateway<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllCredentialSummaryForUsersInGateway_args, 
List<org.apache.airavata.model.credential.store.CredentialSummary>> {
+      public getAllCredentialSummaryForUsersInGateway() {
+        super("getAllCredentialSummaryForUsersInGateway");
       }
 
-      public getAllSSHPubKeysSummaryForUserInGateway_args 
getEmptyArgsInstance() {
-        return new getAllSSHPubKeysSummaryForUserInGateway_args();
+      public getAllCredentialSummaryForUsersInGateway_args 
getEmptyArgsInstance() {
+        return new getAllCredentialSummaryForUsersInGateway_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>>
 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.appcatalog.credentialsummary.CredentialSummary>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 o) {
-            getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.credential.store.CredentialSummary> 
o) {
+            getAllCredentialSummaryForUsersInGateway_result result = new 
getAllCredentialSummaryForUsersInGateway_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -22798,7 +22814,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+            getAllCredentialSummaryForUsersInGateway_result result = new 
getAllCredentialSummaryForUsersInGateway_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -22834,8 +22850,8 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getAllSSHPubKeysSummaryForUserInGateway_args 
args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>>
 resultHandler) throws TException {
-        iface.getAllSSHPubKeysSummaryForUserInGateway(args.authzToken, 
args.gatewayId, args.userId,resultHandler);
+      public void start(I iface, getAllCredentialSummaryForUsersInGateway_args 
args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.credential.store.CredentialSummary>>
 resultHandler) throws TException {
+        iface.getAllCredentialSummaryForUsersInGateway(args.authzToken, 
args.type, args.gatewayId, args.userId,resultHandler);
       }
     }
 
@@ -57000,25 +57016,36 @@ public class Airavata {
 
   }
 
-  public static class getAllGatewaySSHPubKeysSummary_args implements 
org.apache.thrift.TBase<getAllGatewaySSHPubKeysSummary_args, 
getAllGatewaySSHPubKeysSummary_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<getAllGatewaySSHPubKeysSummary_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewaySSHPubKeysSummary_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 
AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", 
org.apache.thrift.protocol.TType.STRUCT, (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)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 
getAllGatewaySSHPubKeysSummary_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllGatewaySSHPubKeysSummary_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllCredentialSummaryForGateway_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllCredentialSummaryForGateway_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // 
required
+    /**
+     * 
+     * @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 {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      GATEWAY_ID((short)2, "gatewayId");
+      /**
+       * 
+       * @see org.apache.airavata.model.credential.store.SummaryType
+       */
+      TYPE((short)2, "type"),
+      GATEWAY_ID((short)3, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -57035,7 +57062,9 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // GATEWAY_ID
+          case 2: // TYPE
+            return TYPE;
+          case 3: // GATEWAY_ID
             return GATEWAY_ID;
           default:
             return null;
@@ -57082,43 +57111,51 @@ public class Airavata {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("authzToken", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.security.AuthzToken.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(getAllGatewaySSHPubKeysSummary_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllCredentialSummaryForGateway_args.class,
 metaDataMap);
     }
 
-    public getAllGatewaySSHPubKeysSummary_args() {
+    public getAllCredentialSummaryForGateway_args() {
     }
 
-    public getAllGatewaySSHPubKeysSummary_args(
+    public getAllCredentialSummaryForGateway_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
+      org.apache.airavata.model.credential.store.SummaryType type,
       String gatewayId)
     {
       this();
       this.authzToken = authzToken;
+      this.type = type;
       this.gatewayId = gatewayId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public 
getAllGatewaySSHPubKeysSummary_args(getAllGatewaySSHPubKeysSummary_args other) {
+    public 
getAllCredentialSummaryForGateway_args(getAllCredentialSummaryForGateway_args 
other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new 
org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
+      if (other.isSetType()) {
+        this.type = other.type;
+      }
       if (other.isSetGatewayId()) {
         this.gatewayId = other.gatewayId;
       }
     }
 
-    public getAllGatewaySSHPubKeysSummary_args deepCopy() {
-      return new getAllGatewaySSHPubKeysSummary_args(this);
+    public getAllCredentialSummaryForGateway_args deepCopy() {
+      return new getAllCredentialSummaryForGateway_args(this);
     }
 
     @Override
     public void clear() {
       this.authzToken = null;
+      this.type = null;
       this.gatewayId = null;
     }
 
@@ -57126,7 +57163,7 @@ public class Airavata {
       return this.authzToken;
     }
 
-    public getAllGatewaySSHPubKeysSummary_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public getAllCredentialSummaryForGateway_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -57146,11 +57183,43 @@ public class Airavata {
       }
     }
 
+    /**
+     * 
+     * @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 getAllGatewaySSHPubKeysSummary_args setGatewayId(String gatewayId) {
+    public getAllCredentialSummaryForGateway_args setGatewayId(String 
gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -57180,6 +57249,14 @@ public class Airavata {
         }
         break;
 
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          
setType((org.apache.airavata.model.credential.store.SummaryType)value);
+        }
+        break;
+
       case GATEWAY_ID:
         if (value == null) {
           unsetGatewayId();
@@ -57196,6 +57273,9 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
+      case TYPE:
+        return getType();
+
       case GATEWAY_ID:
         return getGatewayId();
 
@@ -57212,6 +57292,8 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
+      case TYPE:
+        return isSetType();
       case GATEWAY_ID:
         return isSetGatewayId();
       }
@@ -57222,12 +57304,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllGatewaySSHPubKeysSummary_args)
-        return this.equals((getAllGatewaySSHPubKeysSummary_args)that);
+      if (that instanceof getAllCredentialSummaryForGateway_args)
+        return this.equals((getAllCredentialSummaryForGateway_args)that);
       return false;
     }
 
-    public boolean equals(getAllGatewaySSHPubKeysSummary_args that) {
+    public boolean equals(getAllCredentialSummaryForGateway_args that) {
       if (that == null)
         return false;
 
@@ -57240,6 +57322,15 @@ public class Airavata {
           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) {
@@ -57261,6 +57352,11 @@ public class Airavata {
       if (present_authzToken)
         list.add(authzToken);
 
+      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)
@@ -57270,7 +57366,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getAllGatewaySSHPubKeysSummary_args other) {
+    public int compareTo(getAllCredentialSummaryForGateway_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -57287,6 +57383,16 @@ public class Airavata {
           return lastComparison;
         }
       }
+      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;
@@ -57314,7 +57420,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllGatewaySSHPubKeysSummary_args(");
+      StringBuilder sb = new 
StringBuilder("getAllCredentialSummaryForGateway_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -57325,6 +57431,14 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
+      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");
@@ -57341,6 +57455,9 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'authzToken' was not present! Struct: " + toString());
       }
+      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());
       }
@@ -57366,15 +57483,15 @@ public class Airavata {
       }
     }
 
-    private static class 
getAllGatewaySSHPubKeysSummary_argsStandardSchemeFactory implements 
SchemeFactory {
-      public getAllGatewaySSHPubKeysSummary_argsStandardScheme getScheme() {
-        return new getAllGatewaySSHPubKeysSummary_argsStandardScheme();
+    private static class 
getAllCredentialSummaryForGateway_argsStandardSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForGateway_argsStandardScheme getScheme() {
+        return new getAllCredentialSummaryForGateway_argsStandardScheme();
       }
     }
 
-    private static class getAllGatewaySSHPubKeysSummary_argsStandardScheme 
extends StandardScheme<getAllGatewaySSHPubKeysSummary_args> {
+    private static class getAllCredentialSummaryForGateway_argsStandardScheme 
extends StandardScheme<getAllCredentialSummaryForGateway_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewaySSHPubKeysSummary_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)
@@ -57393,7 +57510,15 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
-            case 2: // GATEWAY_ID
+            case 2: // 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 3: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -57412,7 +57537,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewaySSHPubKeysSummary_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.writeStructBegin(STRUCT_DESC);
@@ -57421,6 +57546,11 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
+        if (struct.type != null) {
+          oprot.writeFieldBegin(TYPE_FIELD_DESC);
+          oprot.writeI32(struct.type.getValue());
+          oprot.writeFieldEnd();
+        }
         if (struct.gatewayId != null) {
           oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
           oprot.writeString(struct.gatewayId);
@@ -57432,27 +57562,30 @@ public class Airavata {
 
     }
 
-    private static class getAllGatewaySSHPubKeysSummary_argsTupleSchemeFactory 
implements SchemeFactory {
-      public getAllGatewaySSHPubKeysSummary_argsTupleScheme getScheme() {
-        return new getAllGatewaySSHPubKeysSummary_argsTupleScheme();
+    private static class 
getAllCredentialSummaryForGateway_argsTupleSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForGateway_argsTupleScheme getScheme() {
+        return new getAllCredentialSummaryForGateway_argsTupleScheme();
       }
     }
 
-    private static class getAllGatewaySSHPubKeysSummary_argsTupleScheme 
extends TupleScheme<getAllGatewaySSHPubKeysSummary_args> {
+    private static class getAllCredentialSummaryForGateway_argsTupleScheme 
extends TupleScheme<getAllCredentialSummaryForGateway_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewaySSHPubKeysSummary_args struct) throws org.apache.thrift.TException 
{
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllCredentialSummaryForGateway_args struct) throws 
org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.authzToken.write(oprot);
+        oprot.writeI32(struct.type.getValue());
         oprot.writeString(struct.gatewayId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewaySSHPubKeysSummary_args struct) throws org.apache.thrift.TException 
{
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllCredentialSummaryForGateway_args struct) throws 
org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.authzToken = new 
org.apache.airavata.model.security.AuthzToken();
         struct.authzToken.read(iprot);
         struct.setAuthzTokenIsSet(true);
+        struct.type = 
org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
+        struct.setTypeIsSet(true);
         struct.gatewayId = iprot.readString();
         struct.setGatewayIdIsSet(true);
       }
@@ -57460,8 +57593,8 @@ public class Airavata {
 
   }
 
-  public static class getAllGatewaySSHPubKeysSummary_result implements 
org.apache.thrift.TBase<getAllGatewaySSHPubKeysSummary_result, 
getAllGatewaySSHPubKeysSummary_result._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllGatewaySSHPubKeysSummary_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewaySSHPubKeysSummary_result");
+  public static class getAllCredentialSummaryForGateway_result implements 
org.apache.thrift.TBase<getAllCredentialSummaryForGateway_result, 
getAllCredentialSummaryForGateway_result._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllCredentialSummaryForGateway_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllCredentialSummaryForGateway_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField IRE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ire", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -57470,11 +57603,11 @@ public class Airavata {
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getAllGatewaySSHPubKeysSummary_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllGatewaySSHPubKeysSummary_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllCredentialSummaryForGateway_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllCredentialSummaryForGateway_resultTupleSchemeFactory());
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
success; // required
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
success; // required
     public org.apache.airavata.model.error.InvalidRequestException ire; // 
required
     public org.apache.airavata.model.error.AiravataClientException ace; // 
required
     public org.apache.airavata.model.error.AiravataSystemException ase; // 
required
@@ -57552,7 +57685,7 @@ public class Airavata {
       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.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary.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.IRE, new 
org.apache.thrift.meta_data.FieldMetaData("ire", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
       tmpMap.put(_Fields.ACE, new 
org.apache.thrift.meta_data.FieldMetaData("ace", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -57560,14 +57693,14 @@ public class Airavata {
       tmpMap.put(_Fields.ASE, new 
org.apache.thrift.meta_data.FieldMetaData("ase", 
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(getAllGatewaySSHPubKeysSummary_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllCredentialSummaryForGateway_result.class,
 metaDataMap);
     }
 
-    public getAllGatewaySSHPubKeysSummary_result() {
+    public getAllCredentialSummaryForGateway_result() {
     }
 
-    public getAllGatewaySSHPubKeysSummary_result(
-      
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
success,
+    public getAllCredentialSummaryForGateway_result(
+      List<org.apache.airavata.model.credential.store.CredentialSummary> 
success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
       org.apache.airavata.model.error.AiravataSystemException ase)
@@ -57582,11 +57715,11 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public 
getAllGatewaySSHPubKeysSummary_result(getAllGatewaySSHPubKeysSummary_result 
other) {
+    public 
getAllCredentialSummaryForGateway_result(getAllCredentialSummaryForGateway_result
 other) {
       if (other.isSetSuccess()) {
-        
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
__this__success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>(other.success.size());
-        for 
(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
other_element : other.success) {
-          __this__success.add(new 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary(other_element));
+        List<org.apache.airavata.model.credential.store.CredentialSummary> 
__this__success = new 
ArrayList<org.apache.airavata.model.credential.store.CredentialSummary>(other.success.size());
+        for (org.apache.airavata.model.credential.store.CredentialSummary 
other_element : other.success) {
+          __this__success.add(new 
org.apache.airavata.model.credential.store.CredentialSummary(other_element));
         }
         this.success = __this__success;
       }
@@ -57601,8 +57734,8 @@ public class Airavata {
       }
     }
 
-    public getAllGatewaySSHPubKeysSummary_result deepCopy() {
-      return new getAllGatewaySSHPubKeysSummary_result(this);
+    public getAllCredentialSummaryForGateway_result deepCopy() {
+      return new getAllCredentialSummaryForGateway_result(this);
     }
 
     @Override
@@ -57617,22 +57750,22 @@ public class Airavata {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public 
java.util.Iterator<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 getSuccessIterator() {
+    public 
java.util.Iterator<org.apache.airavata.model.credential.store.CredentialSummary>
 getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
-    public void 
addToSuccess(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary
 elem) {
+    public void 
addToSuccess(org.apache.airavata.model.credential.store.CredentialSummary elem) 
{
       if (this.success == null) {
-        this.success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>();
+        this.success = new 
ArrayList<org.apache.airavata.model.credential.store.CredentialSummary>();
       }
       this.success.add(elem);
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getSuccess() {
+    public List<org.apache.airavata.model.credential.store.CredentialSummary> 
getSuccess() {
       return this.success;
     }
 
-    public getAllGatewaySSHPubKeysSummary_result 
setSuccess(List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 success) {
+    public getAllCredentialSummaryForGateway_result 
setSuccess(List<org.apache.airavata.model.credential.store.CredentialSummary> 
success) {
       this.success = success;
       return this;
     }
@@ -57656,7 +57789,7 @@ public class Airavata {
       return this.ire;
     }
 
-    public getAllGatewaySSHPubKeysSummary_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+    public getAllCredentialSummaryForGateway_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -57680,7 +57813,7 @@ public class Airavata {
       return this.ace;
     }
 
-    public getAllGatewaySSHPubKeysSummary_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+    public getAllCredentialSummaryForGateway_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
       this.ace = ace;
       return this;
     }
@@ -57704,7 +57837,7 @@ public class Airavata {
       return this.ase;
     }
 
-    public getAllGatewaySSHPubKeysSummary_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+    public getAllCredentialSummaryForGateway_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
       this.ase = ase;
       return this;
     }
@@ -57730,7 +57863,7 @@ public class Airavata {
         if (value == null) {
           unsetSuccess();
         } else {
-          
setSuccess((List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>)value);
+          
setSuccess((List<org.apache.airavata.model.credential.store.CredentialSummary>)value);
         }
         break;
 
@@ -57802,12 +57935,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllGatewaySSHPubKeysSummary_result)
-        return this.equals((getAllGatewaySSHPubKeysSummary_result)that);
+      if (that instanceof getAllCredentialSummaryForGateway_result)
+        return this.equals((getAllCredentialSummaryForGateway_result)that);
       return false;
     }
 
-    public boolean equals(getAllGatewaySSHPubKeysSummary_result that) {
+    public boolean equals(getAllCredentialSummaryForGateway_result that) {
       if (that == null)
         return false;
 
@@ -57878,7 +58011,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getAllGatewaySSHPubKeysSummary_result other) {
+    public int compareTo(getAllCredentialSummaryForGateway_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -57942,7 +58075,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllGatewaySSHPubKeysSummary_result(");
+      StringBuilder sb = new 
StringBuilder("getAllCredentialSummaryForGateway_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -58001,15 +58134,15 @@ public class Airavata {
       }
     }
 
-    private static class 
getAllGatewaySSHPubKeysSummary_resultStandardSchemeFactory implements 
SchemeFactory {
-      public getAllGatewaySSHPubKeysSummary_resultStandardScheme getScheme() {
-        return new getAllGatewaySSHPubKeysSummary_resultStandardScheme();
+    private static class 
getAllCredentialSummaryForGateway_resultStandardSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForGateway_resultStandardScheme 
getScheme() {
+        return new getAllCredentialSummaryForGateway_resultStandardScheme();
       }
     }
 
-    private static class getAllGatewaySSHPubKeysSummary_resultStandardScheme 
extends StandardScheme<getAllGatewaySSHPubKeysSummary_result> {
+    private static class 
getAllCredentialSummaryForGateway_resultStandardScheme extends 
StandardScheme<getAllCredentialSummaryForGateway_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewaySSHPubKeysSummary_result struct) throws 
org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllCredentialSummaryForGateway_result struct) throws 
org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -58023,11 +58156,11 @@ public class Airavata {
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
                   org.apache.thrift.protocol.TList _list34 = 
iprot.readListBegin();
-                  struct.success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>(_list34.size);
-                  
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_elem35;
+                  struct.success = new 
ArrayList<org.apache.airavata.model.credential.store.CredentialSummary>(_list34.size);
+                  org.apache.airavata.model.credential.store.CredentialSummary 
_elem35;
                   for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                   {
-                    _elem35 = new 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary();
+                    _elem35 = new 
org.apache.airavata.model.credential.store.CredentialSummary();
                     _elem35.read(iprot);
                     struct.success.add(_elem35);
                   }
@@ -58076,7 +58209,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewaySSHPubKeysSummary_result struct) throws 
org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllCredentialSummaryForGateway_result struct) throws 
org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -58084,7 +58217,7 @@ public class Airavata {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
struct.success.size()));
-            for 
(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_iter37 : struct.success)
+            for (org.apache.airavata.model.credential.store.CredentialSummary 
_iter37 : struct.success)
             {
               _iter37.write(oprot);
             }
@@ -58113,16 +58246,16 @@ public class Airavata {
 
     }
 
-    private static class 
getAllGatewaySSHPubKeysSummary_resultTupleSchemeFactory implements 
SchemeFactory {
-      public getAllGatewaySSHPubKeysSummary_resultTupleScheme getScheme() {
-        return new getAllGatewaySSHPubKeysSummary_resultTupleScheme();
+    private static class 
getAllCredentialSummaryForGateway_resultTupleSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForGateway_resultTupleScheme getScheme() {
+        return new getAllCredentialSummaryForGateway_resultTupleScheme();
       }
     }
 
-    private static class getAllGatewaySSHPubKeysSummary_resultTupleScheme 
extends TupleScheme<getAllGatewaySSHPubKeysSummary_result> {
+    private static class getAllCredentialSummaryForGateway_resultTupleScheme 
extends TupleScheme<getAllCredentialSummaryForGateway_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewaySSHPubKeysSummary_result struct) throws 
org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllCredentialSummaryForGateway_result struct) throws 
org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -58141,7 +58274,7 @@ public class Airavata {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for 
(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_iter38 : struct.success)
+            for (org.apache.airavata.model.credential.store.CredentialSummary 
_iter38 : struct.success)
             {
               _iter38.write(oprot);
             }
@@ -58159,17 +58292,17 @@ public class Airavata {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewaySSHPubKeysSummary_result struct) throws 
org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllCredentialSummaryForGateway_result struct) throws 
org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
             org.apache.thrift.protocol.TList _list39 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
-            struct.success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>(_list39.size);
-            
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_elem40;
+            struct.success = new 
ArrayList<org.apache.airavata.model.credential.store.CredentialSummary>(_list39.size);
+            org.apache.airavata.model.credential.store.CredentialSummary 
_elem40;
             for (int _i41 = 0; _i41 < _list39.size; ++_i41)
             {
-              _elem40 = new 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary();
+              _elem40 = new 
org.apache.airavata.model.credential.store.CredentialSummary();
               _elem40.read(iprot);
               struct.success.add(_elem40);
             }
@@ -58196,28 +58329,39 @@ public class Airavata {
 
   }
 
-  public static class getAllSSHPubKeysSummaryForUserInGateway_args implements 
org.apache.thrift.TBase<getAllSSHPubKeysSummaryForUserInGateway_args, 
getAllSSHPubKeysSummaryForUserInGateway_args._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllSSHPubKeysSummaryForUserInGateway_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllSSHPubKeysSummaryForUserInGateway_args");
+  public static class getAllCredentialSummaryForUsersInGateway_args implements 
org.apache.thrift.TBase<getAllCredentialSummaryForUsersInGateway_args, 
getAllCredentialSummaryForUsersInGateway_args._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllCredentialSummaryForUsersInGateway_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllCredentialSummaryForUsersInGateway_args");
 
     private static final org.apache.thrift.protocol.TField 
AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", 
org.apache.thrift.protocol.TType.STRUCT, (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 USER_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("userId", 
org.apache.thrift.protocol.TType.STRING, (short)3);
+    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)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 org.apache.thrift.protocol.TField USER_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("userId", 
org.apache.thrift.protocol.TType.STRING, (short)4);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllCredentialSummaryForUsersInGateway_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllCredentialSummaryForUsersInGateway_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // 
required
+    /**
+     * 
+     * @see org.apache.airavata.model.credential.store.SummaryType
+     */
+    public org.apache.airavata.model.credential.store.SummaryType type; // 
required
     public String gatewayId; // required
     public String userId; // 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 {
       AUTHZ_TOKEN((short)1, "authzToken"),
-      GATEWAY_ID((short)2, "gatewayId"),
-      USER_ID((short)3, "userId");
+      /**
+       * 
+       * @see org.apache.airavata.model.credential.store.SummaryType
+       */
+      TYPE((short)2, "type"),
+      GATEWAY_ID((short)3, "gatewayId"),
+      USER_ID((short)4, "userId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -58234,9 +58378,11 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // GATEWAY_ID
+          case 2: // TYPE
+            return TYPE;
+          case 3: // GATEWAY_ID
             return GATEWAY_ID;
-          case 3: // USER_ID
+          case 4: // USER_ID
             return USER_ID;
           default:
             return null;
@@ -58283,24 +58429,28 @@ public class Airavata {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTHZ_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("authzToken", 
org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.security.AuthzToken.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)));
       tmpMap.put(_Fields.USER_ID, new 
org.apache.thrift.meta_data.FieldMetaData("userId", 
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(getAllSSHPubKeysSummaryForUserInGateway_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllCredentialSummaryForUsersInGateway_args.class,
 metaDataMap);
     }
 
-    public getAllSSHPubKeysSummaryForUserInGateway_args() {
+    public getAllCredentialSummaryForUsersInGateway_args() {
     }
 
-    public getAllSSHPubKeysSummaryForUserInGateway_args(
+    public getAllCredentialSummaryForUsersInGateway_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
+      org.apache.airavata.model.credential.store.SummaryType type,
       String gatewayId,
       String userId)
     {
       this();
       this.authzToken = authzToken;
+      this.type = type;
       this.gatewayId = gatewayId;
       this.userId = userId;
     }
@@ -58308,10 +58458,13 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public 
getAllSSHPubKeysSummaryForUserInGateway_args(getAllSSHPubKeysSummaryForUserInGateway_args
 other) {
+    public 
getAllCredentialSummaryForUsersInGateway_args(getAllCredentialSummaryForUsersInGateway_args
 other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new 
org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
+      if (other.isSetType()) {
+        this.type = other.type;
+      }
       if (other.isSetGatewayId()) {
         this.gatewayId = other.gatewayId;
       }
@@ -58320,13 +58473,14 @@ public class Airavata {
       }
     }
 
-    public getAllSSHPubKeysSummaryForUserInGateway_args deepCopy() {
-      return new getAllSSHPubKeysSummaryForUserInGateway_args(this);
+    public getAllCredentialSummaryForUsersInGateway_args deepCopy() {
+      return new getAllCredentialSummaryForUsersInGateway_args(this);
     }
 
     @Override
     public void clear() {
       this.authzToken = null;
+      this.type = null;
       this.gatewayId = null;
       this.userId = null;
     }
@@ -58335,7 +58489,7 @@ public class Airavata {
       return this.authzToken;
     }
 
-    public getAllSSHPubKeysSummaryForUserInGateway_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public getAllCredentialSummaryForUsersInGateway_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -58355,11 +58509,43 @@ public class Airavata {
       }
     }
 
+    /**
+     * 
+     * @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 getAllCredentialSummaryForUsersInGateway_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 getAllSSHPubKeysSummaryForUserInGateway_args setGatewayId(String 
gatewayId) {
+    public getAllCredentialSummaryForUsersInGateway_args setGatewayId(String 
gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -58383,7 +58569,7 @@ public class Airavata {
       return this.userId;
     }
 
-    public getAllSSHPubKeysSummaryForUserInGateway_args setUserId(String 
userId) {
+    public getAllCredentialSummaryForUsersInGateway_args setUserId(String 
userId) {
       this.userId = userId;
       return this;
     }
@@ -58413,6 +58599,14 @@ public class Airavata {
         }
         break;
 
+      case TYPE:
+        if (value == null) {
+          unsetType();
+        } else {
+          
setType((org.apache.airavata.model.credential.store.SummaryType)value);
+        }
+        break;
+
       case GATEWAY_ID:
         if (value == null) {
           unsetGatewayId();
@@ -58437,6 +58631,9 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
+      case TYPE:
+        return getType();
+
       case GATEWAY_ID:
         return getGatewayId();
 
@@ -58456,6 +58653,8 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
+      case TYPE:
+        return isSetType();
       case GATEWAY_ID:
         return isSetGatewayId();
       case USER_ID:
@@ -58468,12 +58667,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllSSHPubKeysSummaryForUserInGateway_args)
-        return this.equals((getAllSSHPubKeysSummaryForUserInGateway_args)that);
+      if (that instanceof getAllCredentialSummaryForUsersInGateway_args)
+        return 
this.equals((getAllCredentialSummaryForUsersInGateway_args)that);
       return false;
     }
 
-    public boolean equals(getAllSSHPubKeysSummaryForUserInGateway_args that) {
+    public boolean equals(getAllCredentialSummaryForUsersInGateway_args that) {
       if (that == null)
         return false;
 
@@ -58486,6 +58685,15 @@ public class Airavata {
           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) {
@@ -58516,6 +58724,11 @@ public class Airavata {
       if (present_authzToken)
         list.add(authzToken);
 
+      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)
@@ -58530,7 +58743,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getAllSSHPubKeysSummaryForUserInGateway_args other) {
+    public int compareTo(getAllCredentialSummaryForUsersInGateway_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -58547,6 +58760,16 @@ public class Airavata {
           return lastComparison;
         }
       }
+      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;
@@ -58584,7 +58807,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllSSHPubKeysSummaryForUserInGateway_args(");
+      StringBuilder sb = new 
StringBuilder("getAllCredentialSummaryForUsersInGateway_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -58595,6 +58818,14 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
+      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");
@@ -58619,6 +58850,9 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'authzToken' was not present! Struct: " + toString());
       }
+      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());
       }
@@ -58647,15 +58881,15 @@ public class Airavata {
       }
     }
 
-    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardSchemeFactory implements 
SchemeFactory {
-      public getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme 
getScheme() {
-        return new 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme();
+    private static class 
getAllCredentialSummaryForUsersInGateway_argsStandardSchemeFactory implements 
SchemeFactory {
+      public getAllCredentialSummaryForUsersInGateway_argsStandardScheme 
getScheme() {
+        return new 
getAllCredentialSummaryForUsersInGateway_argsStandardScheme();
       }
     }
 
-    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme extends 
StandardScheme<getAllSSHPubKeysSummaryForUserInGateway_args> {
+    private static class 
getAllCredentialSummaryForUsersInGateway_argsStandardScheme extends 
StandardScheme<getAllCredentialSummaryForUsersInGateway_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllSSHPubKeysSummaryForUserInGateway_args struct) throws 
org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllCredentialSummaryForUsersInGateway_args struct) throws 
org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -58674,7 +58908,15 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
-            case 2: // GATEWAY_ID
+            case 2: // 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 3: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -58682,7 +58924,7 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
-            case 3: // USER_ID
+            case 4: // USER_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.userId = iprot.readString();
                 struct.setUserIdIsSet(true);
@@ -58701,7 +58943,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllSSHPubKeysSummaryForUserInGateway_args struct) throws 
org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllCredentialSummaryForUsersInGateway_args struct) throws 
org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -58710,6 +58952,11 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
+        if (struct.type != null) {
+          oprot.writeFieldBegin(TYPE_FIELD_DESC);
+          oprot.writeI32(struct.type.getValue());
+          oprot.writeFieldEnd();
+        }
         if (struct.gatewayId != n

<TRUNCATED>

Reply via email to