http://git-wip-us.apache.org/repos/asf/airavata/blob/8e59d800/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 0b12271..a600dce 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
@@ -316,6 +316,29 @@ public class Airavata {
      */
     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;
 
+    /**
+     * 
+     * Get all Public Key summaries for user in a Gateway
+     * 
+     * @param CredStoreToken
+     *    Credential Store Token which you want to find the Public Key for.
+     * 
+     * @param gatewayId
+     *    This is the unique identifier of your gateway where the token and 
public key was generated from.
+     * 
+     * @param userId
+     *    This is the unique identifier of user whose public keys are to be 
fetched.
+     * 
+     * @return CredentialSummary
+     * 
+     * 
+     * 
+     * @param authzToken
+     * @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 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;
 
     /**
@@ -2913,6 +2936,8 @@ 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 
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 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
     public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken 
authzToken, String airavataCredStoreToken, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
@@ -3904,6 +3929,40 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllGatewaySSHPubKeysSummary 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
+    {
+      send_getAllSSHPubKeysSummaryForUserInGateway(authzToken, gatewayId, 
userId);
+      return recv_getAllSSHPubKeysSummaryForUserInGateway();
+    }
+
+    public void 
send_getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.thrift.TException
+    {
+      getAllSSHPubKeysSummaryForUserInGateway_args args = new 
getAllSSHPubKeysSummaryForUserInGateway_args();
+      args.setAuthzToken(authzToken);
+      args.setGatewayId(gatewayId);
+      args.setUserId(userId);
+      sendBase("getAllSSHPubKeysSummaryForUserInGateway", 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
+    {
+      getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+      receiveBase(result, "getAllSSHPubKeysSummaryForUserInGateway");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.ire != null) {
+        throw result.ire;
+      }
+      if (result.ace != null) {
+        throw result.ace;
+      }
+      if (result.ase != null) {
+        throw result.ase;
+      }
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllSSHPubKeysSummaryForUserInGateway 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
     {
       send_getAllGatewayPWDCredentials(authzToken, gatewayId);
@@ -9986,6 +10045,44 @@ public class Airavata {
       }
     }
 
+    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 {
+      checkReady();
+      getAllSSHPubKeysSummaryForUserInGateway_call method_call = new 
getAllSSHPubKeysSummaryForUserInGateway_call(authzToken, 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 {
+      private org.apache.airavata.model.security.AuthzToken authzToken;
+      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 {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.authzToken = authzToken;
+        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();
+        args.setAuthzToken(authzToken);
+        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 {
+        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();
+      }
+    }
+
     public void 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getAllGatewayPWDCredentials_call method_call = new 
getAllGatewayPWDCredentials_call(authzToken, gatewayId, resultHandler, this, 
___protocolFactory, ___transport);
@@ -15494,6 +15591,7 @@ public class Airavata {
       processMap.put("getSSHPubKey", new getSSHPubKey());
       processMap.put("getAllGatewaySSHPubKeys", new getAllGatewaySSHPubKeys());
       processMap.put("getAllGatewaySSHPubKeysSummary", new 
getAllGatewaySSHPubKeysSummary());
+      processMap.put("getAllSSHPubKeysSummaryForUserInGateway", new 
getAllSSHPubKeysSummaryForUserInGateway());
       processMap.put("getAllGatewayPWDCredentials", new 
getAllGatewayPWDCredentials());
       processMap.put("deleteSSHPubKey", new deleteSSHPubKey());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -16209,6 +16307,34 @@ public class Airavata {
       }
     }
 
+    public static class getAllSSHPubKeysSummaryForUserInGateway<I extends 
Iface> extends org.apache.thrift.ProcessFunction<I, 
getAllSSHPubKeysSummaryForUserInGateway_args> {
+      public getAllSSHPubKeysSummaryForUserInGateway() {
+        super("getAllSSHPubKeysSummaryForUserInGateway");
+      }
+
+      public getAllSSHPubKeysSummaryForUserInGateway_args 
getEmptyArgsInstance() {
+        return new getAllSSHPubKeysSummaryForUserInGateway_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();
+        try {
+          result.success = 
iface.getAllSSHPubKeysSummaryForUserInGateway(args.authzToken, args.gatewayId, 
args.userId);
+        } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
+          result.ire = ire;
+        } catch (org.apache.airavata.model.error.AiravataClientException ace) {
+          result.ace = ace;
+        } catch (org.apache.airavata.model.error.AiravataSystemException ase) {
+          result.ase = ase;
+        }
+        return result;
+      }
+    }
+
     public static class getAllGatewayPWDCredentials<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getAllGatewayPWDCredentials_args> {
       public getAllGatewayPWDCredentials() {
         super("getAllGatewayPWDCredentials");
@@ -20689,6 +20815,7 @@ public class Airavata {
       processMap.put("getSSHPubKey", new getSSHPubKey());
       processMap.put("getAllGatewaySSHPubKeys", new getAllGatewaySSHPubKeys());
       processMap.put("getAllGatewaySSHPubKeysSummary", new 
getAllGatewaySSHPubKeysSummary());
+      processMap.put("getAllSSHPubKeysSummaryForUserInGateway", new 
getAllSSHPubKeysSummaryForUserInGateway());
       processMap.put("getAllGatewayPWDCredentials", new 
getAllGatewayPWDCredentials());
       processMap.put("deleteSSHPubKey", new deleteSSHPubKey());
       processMap.put("deletePWDCredential", new deletePWDCredential());
@@ -22187,6 +22314,73 @@ public class Airavata {
       }
     }
 
+    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 getAllSSHPubKeysSummaryForUserInGateway_args 
getEmptyArgsInstance() {
+        return new getAllSSHPubKeysSummaryForUserInGateway_args();
+      }
+
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.credentialsummary.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();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+            if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
+                        result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
+                        result.setIreIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof 
org.apache.airavata.model.error.AiravataClientException) {
+                        result.ace = 
(org.apache.airavata.model.error.AiravataClientException) e;
+                        result.setAceIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof 
org.apache.airavata.model.error.AiravataSystemException) {
+                        result.ase = 
(org.apache.airavata.model.error.AiravataSystemException) e;
+                        result.setAseIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR,
 e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        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 static class getAllGatewayPWDCredentials<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getAllGatewayPWDCredentials_args, Map<String,String>> {
       public getAllGatewayPWDCredentials() {
         super("getAllGatewayPWDCredentials");
@@ -57079,25 +57273,28 @@ public class Airavata {
 
   }
 
-  public static class getAllGatewayPWDCredentials_args implements 
org.apache.thrift.TBase<getAllGatewayPWDCredentials_args, 
getAllGatewayPWDCredentials_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<getAllGatewayPWDCredentials_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewayPWDCredentials_args");
+  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");
 
     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 Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getAllGatewayPWDCredentials_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllGatewayPWDCredentials_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // 
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");
+      GATEWAY_ID((short)2, "gatewayId"),
+      USER_ID((short)3, "userId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -57116,6 +57313,8 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // GATEWAY_ID
             return GATEWAY_ID;
+          case 3: // USER_ID
+            return USER_ID;
           default:
             return null;
         }
@@ -57163,49 +57362,57 @@ public class Airavata {
           new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 org.apache.airavata.model.security.AuthzToken.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(getAllGatewayPWDCredentials_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllSSHPubKeysSummaryForUserInGateway_args.class,
 metaDataMap);
     }
 
-    public getAllGatewayPWDCredentials_args() {
+    public getAllSSHPubKeysSummaryForUserInGateway_args() {
     }
 
-    public getAllGatewayPWDCredentials_args(
+    public getAllSSHPubKeysSummaryForUserInGateway_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      String gatewayId)
+      String gatewayId,
+      String userId)
     {
       this();
       this.authzToken = authzToken;
       this.gatewayId = gatewayId;
+      this.userId = userId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public getAllGatewayPWDCredentials_args(getAllGatewayPWDCredentials_args 
other) {
+    public 
getAllSSHPubKeysSummaryForUserInGateway_args(getAllSSHPubKeysSummaryForUserInGateway_args
 other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new 
org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
       if (other.isSetGatewayId()) {
         this.gatewayId = other.gatewayId;
       }
+      if (other.isSetUserId()) {
+        this.userId = other.userId;
+      }
     }
 
-    public getAllGatewayPWDCredentials_args deepCopy() {
-      return new getAllGatewayPWDCredentials_args(this);
+    public getAllSSHPubKeysSummaryForUserInGateway_args deepCopy() {
+      return new getAllSSHPubKeysSummaryForUserInGateway_args(this);
     }
 
     @Override
     public void clear() {
       this.authzToken = null;
       this.gatewayId = null;
+      this.userId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
       return this.authzToken;
     }
 
-    public getAllGatewayPWDCredentials_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public getAllSSHPubKeysSummaryForUserInGateway_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -57229,7 +57436,7 @@ public class Airavata {
       return this.gatewayId;
     }
 
-    public getAllGatewayPWDCredentials_args setGatewayId(String gatewayId) {
+    public getAllSSHPubKeysSummaryForUserInGateway_args setGatewayId(String 
gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -57249,6 +57456,30 @@ public class Airavata {
       }
     }
 
+    public String getUserId() {
+      return this.userId;
+    }
+
+    public getAllSSHPubKeysSummaryForUserInGateway_args setUserId(String 
userId) {
+      this.userId = userId;
+      return this;
+    }
+
+    public void unsetUserId() {
+      this.userId = null;
+    }
+
+    /** Returns true if field userId is set (has been assigned a value) and 
false otherwise */
+    public boolean isSetUserId() {
+      return this.userId != null;
+    }
+
+    public void setUserIdIsSet(boolean value) {
+      if (!value) {
+        this.userId = null;
+      }
+    }
+
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case AUTHZ_TOKEN:
@@ -57267,6 +57498,14 @@ public class Airavata {
         }
         break;
 
+      case USER_ID:
+        if (value == null) {
+          unsetUserId();
+        } else {
+          setUserId((String)value);
+        }
+        break;
+
       }
     }
 
@@ -57278,6 +57517,9 @@ public class Airavata {
       case GATEWAY_ID:
         return getGatewayId();
 
+      case USER_ID:
+        return getUserId();
+
       }
       throw new IllegalStateException();
     }
@@ -57293,6 +57535,8 @@ public class Airavata {
         return isSetAuthzToken();
       case GATEWAY_ID:
         return isSetGatewayId();
+      case USER_ID:
+        return isSetUserId();
       }
       throw new IllegalStateException();
     }
@@ -57301,12 +57545,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllGatewayPWDCredentials_args)
-        return this.equals((getAllGatewayPWDCredentials_args)that);
+      if (that instanceof getAllSSHPubKeysSummaryForUserInGateway_args)
+        return this.equals((getAllSSHPubKeysSummaryForUserInGateway_args)that);
       return false;
     }
 
-    public boolean equals(getAllGatewayPWDCredentials_args that) {
+    public boolean equals(getAllSSHPubKeysSummaryForUserInGateway_args that) {
       if (that == null)
         return false;
 
@@ -57328,6 +57572,15 @@ public class Airavata {
           return false;
       }
 
+      boolean this_present_userId = true && this.isSetUserId();
+      boolean that_present_userId = true && that.isSetUserId();
+      if (this_present_userId || that_present_userId) {
+        if (!(this_present_userId && that_present_userId))
+          return false;
+        if (!this.userId.equals(that.userId))
+          return false;
+      }
+
       return true;
     }
 
@@ -57345,11 +57598,16 @@ public class Airavata {
       if (present_gatewayId)
         list.add(gatewayId);
 
+      boolean present_userId = true && (isSetUserId());
+      list.add(present_userId);
+      if (present_userId)
+        list.add(userId);
+
       return list.hashCode();
     }
 
     @Override
-    public int compareTo(getAllGatewayPWDCredentials_args other) {
+    public int compareTo(getAllSSHPubKeysSummaryForUserInGateway_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -57376,6 +57634,16 @@ public class Airavata {
           return lastComparison;
         }
       }
+      lastComparison = 
Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetUserId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, 
other.userId);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
       return 0;
     }
 
@@ -57393,7 +57661,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllGatewayPWDCredentials_args(");
+      StringBuilder sb = new 
StringBuilder("getAllSSHPubKeysSummaryForUserInGateway_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -57411,6 +57679,14 @@ public class Airavata {
         sb.append(this.gatewayId);
       }
       first = false;
+      if (!first) sb.append(", ");
+      sb.append("userId:");
+      if (this.userId == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.userId);
+      }
+      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -57423,6 +57699,9 @@ public class Airavata {
       if (gatewayId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
       }
+      if (userId == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'userId' was not present! Struct: " + toString());
+      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -57445,15 +57724,15 @@ public class Airavata {
       }
     }
 
-    private static class getAllGatewayPWDCredentials_argsStandardSchemeFactory 
implements SchemeFactory {
-      public getAllGatewayPWDCredentials_argsStandardScheme getScheme() {
-        return new getAllGatewayPWDCredentials_argsStandardScheme();
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardSchemeFactory implements 
SchemeFactory {
+      public getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme 
getScheme() {
+        return new 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme();
       }
     }
 
-    private static class getAllGatewayPWDCredentials_argsStandardScheme 
extends StandardScheme<getAllGatewayPWDCredentials_args> {
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsStandardScheme extends 
StandardScheme<getAllSSHPubKeysSummaryForUserInGateway_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllSSHPubKeysSummaryForUserInGateway_args struct) throws 
org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -57480,6 +57759,14 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
+            case 3: // USER_ID
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
+                struct.userId = iprot.readString();
+                struct.setUserIdIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
+              }
+              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
           }
@@ -57491,7 +57778,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllSSHPubKeysSummaryForUserInGateway_args struct) throws 
org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -57505,55 +57792,63 @@ public class Airavata {
           oprot.writeString(struct.gatewayId);
           oprot.writeFieldEnd();
         }
+        if (struct.userId != null) {
+          oprot.writeFieldBegin(USER_ID_FIELD_DESC);
+          oprot.writeString(struct.userId);
+          oprot.writeFieldEnd();
+        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
 
     }
 
-    private static class getAllGatewayPWDCredentials_argsTupleSchemeFactory 
implements SchemeFactory {
-      public getAllGatewayPWDCredentials_argsTupleScheme getScheme() {
-        return new getAllGatewayPWDCredentials_argsTupleScheme();
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsTupleSchemeFactory implements 
SchemeFactory {
+      public getAllSSHPubKeysSummaryForUserInGateway_argsTupleScheme 
getScheme() {
+        return new getAllSSHPubKeysSummaryForUserInGateway_argsTupleScheme();
       }
     }
 
-    private static class getAllGatewayPWDCredentials_argsTupleScheme extends 
TupleScheme<getAllGatewayPWDCredentials_args> {
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_argsTupleScheme extends 
TupleScheme<getAllSSHPubKeysSummaryForUserInGateway_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllSSHPubKeysSummaryForUserInGateway_args struct) throws 
org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.gatewayId);
+        oprot.writeString(struct.userId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllSSHPubKeysSummaryForUserInGateway_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.gatewayId = iprot.readString();
         struct.setGatewayIdIsSet(true);
+        struct.userId = iprot.readString();
+        struct.setUserIdIsSet(true);
       }
     }
 
   }
 
-  public static class getAllGatewayPWDCredentials_result implements 
org.apache.thrift.TBase<getAllGatewayPWDCredentials_result, 
getAllGatewayPWDCredentials_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<getAllGatewayPWDCredentials_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewayPWDCredentials_result");
+  public static class getAllSSHPubKeysSummaryForUserInGateway_result 
implements 
org.apache.thrift.TBase<getAllSSHPubKeysSummaryForUserInGateway_result, 
getAllSSHPubKeysSummaryForUserInGateway_result._Fields>, java.io.Serializable, 
Cloneable, Comparable<getAllSSHPubKeysSummaryForUserInGateway_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllSSHPubKeysSummaryForUserInGateway_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.MAP, (short)0);
+    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);
     private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ace", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ase", 
org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
getAllGatewayPWDCredentials_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
getAllGatewayPWDCredentials_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllSSHPubKeysSummaryForUserInGateway_resultTupleSchemeFactory());
     }
 
-    public Map<String,String> success; // required
+    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.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
@@ -57630,9 +57925,8 @@ public class Airavata {
     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.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-              new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
-              new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+          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))));
       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, 
@@ -57640,14 +57934,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(getAllGatewayPWDCredentials_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllSSHPubKeysSummaryForUserInGateway_result.class,
 metaDataMap);
     }
 
-    public getAllGatewayPWDCredentials_result() {
+    public getAllSSHPubKeysSummaryForUserInGateway_result() {
     }
 
-    public getAllGatewayPWDCredentials_result(
-      Map<String,String> success,
+    public getAllSSHPubKeysSummaryForUserInGateway_result(
+      
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
       org.apache.airavata.model.error.AiravataSystemException ase)
@@ -57662,9 +57956,12 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public 
getAllGatewayPWDCredentials_result(getAllGatewayPWDCredentials_result other) {
+    public 
getAllSSHPubKeysSummaryForUserInGateway_result(getAllSSHPubKeysSummaryForUserInGateway_result
 other) {
       if (other.isSetSuccess()) {
-        Map<String,String> __this__success = new 
HashMap<String,String>(other.success);
+        
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));
+        }
         this.success = __this__success;
       }
       if (other.isSetIre()) {
@@ -57678,8 +57975,8 @@ public class Airavata {
       }
     }
 
-    public getAllGatewayPWDCredentials_result deepCopy() {
-      return new getAllGatewayPWDCredentials_result(this);
+    public getAllSSHPubKeysSummaryForUserInGateway_result deepCopy() {
+      return new getAllSSHPubKeysSummaryForUserInGateway_result(this);
     }
 
     @Override
@@ -57694,18 +57991,22 @@ public class Airavata {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public void putToSuccess(String key, String val) {
+    public 
java.util.Iterator<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 getSuccessIterator() {
+      return (this.success == null) ? null : this.success.iterator();
+    }
+
+    public void 
addToSuccess(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary
 elem) {
       if (this.success == null) {
-        this.success = new HashMap<String,String>();
+        this.success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>();
       }
-      this.success.put(key, val);
+      this.success.add(elem);
     }
 
-    public Map<String,String> getSuccess() {
+    public 
List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary> 
getSuccess() {
       return this.success;
     }
 
-    public getAllGatewayPWDCredentials_result setSuccess(Map<String,String> 
success) {
+    public getAllSSHPubKeysSummaryForUserInGateway_result 
setSuccess(List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>
 success) {
       this.success = success;
       return this;
     }
@@ -57729,7 +58030,7 @@ public class Airavata {
       return this.ire;
     }
 
-    public getAllGatewayPWDCredentials_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+    public getAllSSHPubKeysSummaryForUserInGateway_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -57753,7 +58054,7 @@ public class Airavata {
       return this.ace;
     }
 
-    public getAllGatewayPWDCredentials_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+    public getAllSSHPubKeysSummaryForUserInGateway_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
       this.ace = ace;
       return this;
     }
@@ -57777,7 +58078,7 @@ public class Airavata {
       return this.ase;
     }
 
-    public getAllGatewayPWDCredentials_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+    public getAllSSHPubKeysSummaryForUserInGateway_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
       this.ase = ase;
       return this;
     }
@@ -57803,7 +58104,7 @@ public class Airavata {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Map<String,String>)value);
+          
setSuccess((List<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>)value);
         }
         break;
 
@@ -57875,12 +58176,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof getAllGatewayPWDCredentials_result)
-        return this.equals((getAllGatewayPWDCredentials_result)that);
+      if (that instanceof getAllSSHPubKeysSummaryForUserInGateway_result)
+        return 
this.equals((getAllSSHPubKeysSummaryForUserInGateway_result)that);
       return false;
     }
 
-    public boolean equals(getAllGatewayPWDCredentials_result that) {
+    public boolean equals(getAllSSHPubKeysSummaryForUserInGateway_result that) 
{
       if (that == null)
         return false;
 
@@ -57951,7 +58252,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(getAllGatewayPWDCredentials_result other) {
+    public int compareTo(getAllSSHPubKeysSummaryForUserInGateway_result other) 
{
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -58015,7 +58316,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new 
StringBuilder("getAllGatewayPWDCredentials_result(");
+      StringBuilder sb = new 
StringBuilder("getAllSSHPubKeysSummaryForUserInGateway_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -58074,15 +58375,15 @@ public class Airavata {
       }
     }
 
-    private static class 
getAllGatewayPWDCredentials_resultStandardSchemeFactory implements 
SchemeFactory {
-      public getAllGatewayPWDCredentials_resultStandardScheme getScheme() {
-        return new getAllGatewayPWDCredentials_resultStandardScheme();
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_resultStandardSchemeFactory implements 
SchemeFactory {
+      public getAllSSHPubKeysSummaryForUserInGateway_resultStandardScheme 
getScheme() {
+        return new 
getAllSSHPubKeysSummaryForUserInGateway_resultStandardScheme();
       }
     }
 
-    private static class getAllGatewayPWDCredentials_resultStandardScheme 
extends StandardScheme<getAllGatewayPWDCredentials_result> {
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_resultStandardScheme extends 
StandardScheme<getAllSSHPubKeysSummaryForUserInGateway_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllSSHPubKeysSummaryForUserInGateway_result struct) throws 
org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -58093,19 +58394,18 @@ public class Airavata {
           }
           switch (schemeField.id) {
             case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TMap _map42 = 
iprot.readMapBegin();
-                  struct.success = new HashMap<String,String>(2*_map42.size);
-                  String _key43;
-                  String _val44;
-                  for (int _i45 = 0; _i45 < _map42.size; ++_i45)
+                  org.apache.thrift.protocol.TList _list42 = 
iprot.readListBegin();
+                  struct.success = new 
ArrayList<org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary>(_list42.size);
+                  
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_elem43;
+                  for (int _i44 = 0; _i44 < _list42.size; ++_i44)
                   {
-                    _key43 = iprot.readString();
-                    _val44 = iprot.readString();
-                    struct.success.put(_key43, _val44);
+                    _elem43 = new 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary();
+                    _elem43.read(iprot);
+                    struct.success.add(_elem43);
                   }
-                  iprot.readMapEnd();
+                  iprot.readListEnd();
                 }
                 struct.setSuccessIsSet(true);
               } else { 
@@ -58150,20 +58450,19 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllSSHPubKeysSummaryForUserInGateway_result struct) throws 
org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
         if (struct.success != null) {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
-            oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (Map.Entry<String, String> _iter46 : struct.success.entrySet())
+            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 
_iter45 : struct.success)
             {
-              oprot.writeString(_iter46.getKey());
-              oprot.writeString(_iter46.getValue());
+              _iter45.write(oprot);
             }
-            oprot.writeMapEnd();
+            oprot.writeListEnd();
           }
           oprot.writeFieldEnd();
         }
@@ -58188,16 +58487,16 @@ public class Airavata {
 
     }
 
-    private static class getAllGatewayPWDCredentials_resultTupleSchemeFactory 
implements SchemeFactory {
-      public getAllGatewayPWDCredentials_resultTupleScheme getScheme() {
-        return new getAllGatewayPWDCredentials_resultTupleScheme();
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_resultTupleSchemeFactory implements 
SchemeFactory {
+      public getAllSSHPubKeysSummaryForUserInGateway_resultTupleScheme 
getScheme() {
+        return new getAllSSHPubKeysSummaryForUserInGateway_resultTupleScheme();
       }
     }
 
-    private static class getAllGatewayPWDCredentials_resultTupleScheme extends 
TupleScheme<getAllGatewayPWDCredentials_result> {
+    private static class 
getAllSSHPubKeysSummaryForUserInGateway_resultTupleScheme extends 
TupleScheme<getAllSSHPubKeysSummaryForUserInGateway_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllSSHPubKeysSummaryForUserInGateway_result struct) throws 
org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -58216,10 +58515,9 @@ public class Airavata {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, String> _iter47 : struct.success.entrySet())
+            for 
(org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_iter46 : struct.success)
             {
-              oprot.writeString(_iter47.getKey());
-              oprot.writeString(_iter47.getValue());
+              _iter46.write(oprot);
             }
           }
         }
@@ -58235,20 +58533,19 @@ public class Airavata {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllSSHPubKeysSummaryForUserInGateway_result struct) throws 
org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map48 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new HashMap<String,String>(2*_map48.size);
-            String _key49;
-            String _val50;
-            for (int _i51 = 0; _i51 < _map48.size; ++_i51)
+            org.apache.thrift.protocol.TList _list47 = 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>(_list47.size);
+            
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary 
_elem48;
+            for (int _i49 = 0; _i49 < _list47.size; ++_i49)
             {
-              _key49 = iprot.readString();
-              _val50 = iprot.readString();
-              struct.success.put(_key49, _val50);
+              _elem48 = new 
org.apache.airavata.model.appcatalog.credentialsummary.CredentialSummary();
+              _elem48.read(iprot);
+              struct.success.add(_elem48);
             }
           }
           struct.setSuccessIsSet(true);
@@ -58273,28 +58570,25 @@ public class Airavata {
 
   }
 
-  public static class deleteSSHPubKey_args implements 
org.apache.thrift.TBase<deleteSSHPubKey_args, deleteSSHPubKey_args._Fields>, 
java.io.Serializable, Cloneable, Comparable<deleteSSHPubKey_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("deleteSSHPubKey_args");
+  public static class getAllGatewayPWDCredentials_args implements 
org.apache.thrift.TBase<getAllGatewayPWDCredentials_args, 
getAllGatewayPWDCredentials_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<getAllGatewayPWDCredentials_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewayPWDCredentials_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 
AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new 
org.apache.thrift.protocol.TField("airavataCredStoreToken", 
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 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 
deleteSSHPubKey_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
deleteSSHPubKey_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllGatewayPWDCredentials_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllGatewayPWDCredentials_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // 
required
-    public String airavataCredStoreToken; // 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"),
-      AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken"),
-      GATEWAY_ID((short)3, "gatewayId");
+      GATEWAY_ID((short)2, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, 
_Fields>();
 
@@ -58311,9 +58605,7 @@ public class Airavata {
         switch(fieldId) {
           case 1: // AUTHZ_TOKEN
             return AUTHZ_TOKEN;
-          case 2: // AIRAVATA_CRED_STORE_TOKEN
-            return AIRAVATA_CRED_STORE_TOKEN;
-          case 3: // GATEWAY_ID
+          case 2: // GATEWAY_ID
             return GATEWAY_ID;
           default:
             return null;
@@ -58360,51 +58652,43 @@ 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.AIRAVATA_CRED_STORE_TOKEN, new 
org.apache.thrift.meta_data.FieldMetaData("airavataCredStoreToken", 
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(deleteSSHPubKey_args.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayPWDCredentials_args.class,
 metaDataMap);
     }
 
-    public deleteSSHPubKey_args() {
+    public getAllGatewayPWDCredentials_args() {
     }
 
-    public deleteSSHPubKey_args(
+    public getAllGatewayPWDCredentials_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
-      String airavataCredStoreToken,
       String gatewayId)
     {
       this();
       this.authzToken = authzToken;
-      this.airavataCredStoreToken = airavataCredStoreToken;
       this.gatewayId = gatewayId;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public deleteSSHPubKey_args(deleteSSHPubKey_args other) {
+    public getAllGatewayPWDCredentials_args(getAllGatewayPWDCredentials_args 
other) {
       if (other.isSetAuthzToken()) {
         this.authzToken = new 
org.apache.airavata.model.security.AuthzToken(other.authzToken);
       }
-      if (other.isSetAiravataCredStoreToken()) {
-        this.airavataCredStoreToken = other.airavataCredStoreToken;
-      }
       if (other.isSetGatewayId()) {
         this.gatewayId = other.gatewayId;
       }
     }
 
-    public deleteSSHPubKey_args deepCopy() {
-      return new deleteSSHPubKey_args(this);
+    public getAllGatewayPWDCredentials_args deepCopy() {
+      return new getAllGatewayPWDCredentials_args(this);
     }
 
     @Override
     public void clear() {
       this.authzToken = null;
-      this.airavataCredStoreToken = null;
       this.gatewayId = null;
     }
 
@@ -58412,7 +58696,7 @@ public class Airavata {
       return this.authzToken;
     }
 
-    public deleteSSHPubKey_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
+    public getAllGatewayPWDCredentials_args 
setAuthzToken(org.apache.airavata.model.security.AuthzToken authzToken) {
       this.authzToken = authzToken;
       return this;
     }
@@ -58432,35 +58716,11 @@ public class Airavata {
       }
     }
 
-    public String getAiravataCredStoreToken() {
-      return this.airavataCredStoreToken;
-    }
-
-    public deleteSSHPubKey_args setAiravataCredStoreToken(String 
airavataCredStoreToken) {
-      this.airavataCredStoreToken = airavataCredStoreToken;
-      return this;
-    }
-
-    public void unsetAiravataCredStoreToken() {
-      this.airavataCredStoreToken = null;
-    }
-
-    /** Returns true if field airavataCredStoreToken is set (has been assigned 
a value) and false otherwise */
-    public boolean isSetAiravataCredStoreToken() {
-      return this.airavataCredStoreToken != null;
-    }
-
-    public void setAiravataCredStoreTokenIsSet(boolean value) {
-      if (!value) {
-        this.airavataCredStoreToken = null;
-      }
-    }
-
     public String getGatewayId() {
       return this.gatewayId;
     }
 
-    public deleteSSHPubKey_args setGatewayId(String gatewayId) {
+    public getAllGatewayPWDCredentials_args setGatewayId(String gatewayId) {
       this.gatewayId = gatewayId;
       return this;
     }
@@ -58490,14 +58750,6 @@ public class Airavata {
         }
         break;
 
-      case AIRAVATA_CRED_STORE_TOKEN:
-        if (value == null) {
-          unsetAiravataCredStoreToken();
-        } else {
-          setAiravataCredStoreToken((String)value);
-        }
-        break;
-
       case GATEWAY_ID:
         if (value == null) {
           unsetGatewayId();
@@ -58514,9 +58766,6 @@ public class Airavata {
       case AUTHZ_TOKEN:
         return getAuthzToken();
 
-      case AIRAVATA_CRED_STORE_TOKEN:
-        return getAiravataCredStoreToken();
-
       case GATEWAY_ID:
         return getGatewayId();
 
@@ -58533,8 +58782,6 @@ public class Airavata {
       switch (field) {
       case AUTHZ_TOKEN:
         return isSetAuthzToken();
-      case AIRAVATA_CRED_STORE_TOKEN:
-        return isSetAiravataCredStoreToken();
       case GATEWAY_ID:
         return isSetGatewayId();
       }
@@ -58545,12 +58792,12 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof deleteSSHPubKey_args)
-        return this.equals((deleteSSHPubKey_args)that);
+      if (that instanceof getAllGatewayPWDCredentials_args)
+        return this.equals((getAllGatewayPWDCredentials_args)that);
       return false;
     }
 
-    public boolean equals(deleteSSHPubKey_args that) {
+    public boolean equals(getAllGatewayPWDCredentials_args that) {
       if (that == null)
         return false;
 
@@ -58563,15 +58810,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_airavataCredStoreToken = true && 
this.isSetAiravataCredStoreToken();
-      boolean that_present_airavataCredStoreToken = true && 
that.isSetAiravataCredStoreToken();
-      if (this_present_airavataCredStoreToken || 
that_present_airavataCredStoreToken) {
-        if (!(this_present_airavataCredStoreToken && 
that_present_airavataCredStoreToken))
-          return false;
-        if (!this.airavataCredStoreToken.equals(that.airavataCredStoreToken))
-          return false;
-      }
-
       boolean this_present_gatewayId = true && this.isSetGatewayId();
       boolean that_present_gatewayId = true && that.isSetGatewayId();
       if (this_present_gatewayId || that_present_gatewayId) {
@@ -58593,11 +58831,6 @@ public class Airavata {
       if (present_authzToken)
         list.add(authzToken);
 
-      boolean present_airavataCredStoreToken = true && 
(isSetAiravataCredStoreToken());
-      list.add(present_airavataCredStoreToken);
-      if (present_airavataCredStoreToken)
-        list.add(airavataCredStoreToken);
-
       boolean present_gatewayId = true && (isSetGatewayId());
       list.add(present_gatewayId);
       if (present_gatewayId)
@@ -58607,7 +58840,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(deleteSSHPubKey_args other) {
+    public int compareTo(getAllGatewayPWDCredentials_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -58624,16 +58857,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = 
Boolean.valueOf(isSetAiravataCredStoreToken()).compareTo(other.isSetAiravataCredStoreToken());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetAiravataCredStoreToken()) {
-        lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.airavataCredStoreToken, 
other.airavataCredStoreToken);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = 
Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
       if (lastComparison != 0) {
         return lastComparison;
@@ -58661,7 +58884,7 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("deleteSSHPubKey_args(");
+      StringBuilder sb = new 
StringBuilder("getAllGatewayPWDCredentials_args(");
       boolean first = true;
 
       sb.append("authzToken:");
@@ -58672,14 +58895,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("airavataCredStoreToken:");
-      if (this.airavataCredStoreToken == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.airavataCredStoreToken);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("gatewayId:");
       if (this.gatewayId == null) {
         sb.append("null");
@@ -58696,9 +58911,6 @@ public class Airavata {
       if (authzToken == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'authzToken' was not present! Struct: " + toString());
       }
-      if (airavataCredStoreToken == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'airavataCredStoreToken' was not present! Struct: " + toString());
-      }
       if (gatewayId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required 
field 'gatewayId' was not present! Struct: " + toString());
       }
@@ -58724,15 +58936,15 @@ public class Airavata {
       }
     }
 
-    private static class deleteSSHPubKey_argsStandardSchemeFactory implements 
SchemeFactory {
-      public deleteSSHPubKey_argsStandardScheme getScheme() {
-        return new deleteSSHPubKey_argsStandardScheme();
+    private static class getAllGatewayPWDCredentials_argsStandardSchemeFactory 
implements SchemeFactory {
+      public getAllGatewayPWDCredentials_argsStandardScheme getScheme() {
+        return new getAllGatewayPWDCredentials_argsStandardScheme();
       }
     }
 
-    private static class deleteSSHPubKey_argsStandardScheme extends 
StandardScheme<deleteSSHPubKey_args> {
+    private static class getAllGatewayPWDCredentials_argsStandardScheme 
extends StandardScheme<getAllGatewayPWDCredentials_args> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteSSHPubKey_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -58751,15 +58963,7 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
               }
               break;
-            case 2: // AIRAVATA_CRED_STORE_TOKEN
-              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
-                struct.airavataCredStoreToken = iprot.readString();
-                struct.setAiravataCredStoreTokenIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
-              }
-              break;
-            case 3: // GATEWAY_ID
+            case 2: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) 
{
                 struct.gatewayId = iprot.readString();
                 struct.setGatewayIdIsSet(true);
@@ -58778,7 +58982,7 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteSSHPubKey_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
@@ -58787,11 +58991,6 @@ public class Airavata {
           struct.authzToken.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.airavataCredStoreToken != null) {
-          oprot.writeFieldBegin(AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.airavataCredStoreToken);
-          oprot.writeFieldEnd();
-        }
         if (struct.gatewayId != null) {
           oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
           oprot.writeString(struct.gatewayId);
@@ -58803,30 +59002,27 @@ public class Airavata {
 
     }
 
-    private static class deleteSSHPubKey_argsTupleSchemeFactory implements 
SchemeFactory {
-      public deleteSSHPubKey_argsTupleScheme getScheme() {
-        return new deleteSSHPubKey_argsTupleScheme();
+    private static class getAllGatewayPWDCredentials_argsTupleSchemeFactory 
implements SchemeFactory {
+      public getAllGatewayPWDCredentials_argsTupleScheme getScheme() {
+        return new getAllGatewayPWDCredentials_argsTupleScheme();
       }
     }
 
-    private static class deleteSSHPubKey_argsTupleScheme extends 
TupleScheme<deleteSSHPubKey_args> {
+    private static class getAllGatewayPWDCredentials_argsTupleScheme extends 
TupleScheme<getAllGatewayPWDCredentials_args> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteSSHPubKey_args struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.authzToken.write(oprot);
-        oprot.writeString(struct.airavataCredStoreToken);
         oprot.writeString(struct.gatewayId);
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteSSHPubKey_args struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_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.airavataCredStoreToken = iprot.readString();
-        struct.setAiravataCredStoreTokenIsSet(true);
         struct.gatewayId = iprot.readString();
         struct.setGatewayIdIsSet(true);
       }
@@ -58834,21 +59030,21 @@ public class Airavata {
 
   }
 
-  public static class deleteSSHPubKey_result implements 
org.apache.thrift.TBase<deleteSSHPubKey_result, 
deleteSSHPubKey_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<deleteSSHPubKey_result>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("deleteSSHPubKey_result");
+  public static class getAllGatewayPWDCredentials_result implements 
org.apache.thrift.TBase<getAllGatewayPWDCredentials_result, 
getAllGatewayPWDCredentials_result._Fields>, java.io.Serializable, Cloneable, 
Comparable<getAllGatewayPWDCredentials_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("getAllGatewayPWDCredentials_result");
 
-    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.BOOL, (short)0);
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC 
= new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.MAP, (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);
     private static final org.apache.thrift.protocol.TField ACE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ace", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField ASE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("ase", 
org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
deleteSSHPubKey_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
deleteSSHPubKey_resultTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
getAllGatewayPWDCredentials_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
getAllGatewayPWDCredentials_resultTupleSchemeFactory());
     }
 
-    public boolean success; // required
+    public Map<String,String> 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
@@ -58921,13 +59117,13 @@ public class Airavata {
     }
 
     // isset id assignments
-    private static final int __SUCCESS_ISSET_ID = 0;
-    private byte __isset_bitfield = 0;
     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.SUCCESS, new 
org.apache.thrift.meta_data.FieldMetaData("success", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+          new 
org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+              new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING),
 
+              new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
       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, 
@@ -58935,21 +59131,20 @@ 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(deleteSSHPubKey_result.class,
 metaDataMap);
+      
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllGatewayPWDCredentials_result.class,
 metaDataMap);
     }
 
-    public deleteSSHPubKey_result() {
+    public getAllGatewayPWDCredentials_result() {
     }
 
-    public deleteSSHPubKey_result(
-      boolean success,
+    public getAllGatewayPWDCredentials_result(
+      Map<String,String> success,
       org.apache.airavata.model.error.InvalidRequestException ire,
       org.apache.airavata.model.error.AiravataClientException ace,
       org.apache.airavata.model.error.AiravataSystemException ase)
     {
       this();
       this.success = success;
-      setSuccessIsSet(true);
       this.ire = ire;
       this.ace = ace;
       this.ase = ase;
@@ -58958,9 +59153,11 @@ public class Airavata {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public deleteSSHPubKey_result(deleteSSHPubKey_result other) {
-      __isset_bitfield = other.__isset_bitfield;
-      this.success = other.success;
+    public 
getAllGatewayPWDCredentials_result(getAllGatewayPWDCredentials_result other) {
+      if (other.isSetSuccess()) {
+        Map<String,String> __this__success = new 
HashMap<String,String>(other.success);
+        this.success = __this__success;
+      }
       if (other.isSetIre()) {
         this.ire = new 
org.apache.airavata.model.error.InvalidRequestException(other.ire);
       }
@@ -58972,47 +59169,58 @@ public class Airavata {
       }
     }
 
-    public deleteSSHPubKey_result deepCopy() {
-      return new deleteSSHPubKey_result(this);
+    public getAllGatewayPWDCredentials_result deepCopy() {
+      return new getAllGatewayPWDCredentials_result(this);
     }
 
     @Override
     public void clear() {
-      setSuccessIsSet(false);
-      this.success = false;
+      this.success = null;
       this.ire = null;
       this.ace = null;
       this.ase = null;
     }
 
-    public boolean isSuccess() {
+    public int getSuccessSize() {
+      return (this.success == null) ? 0 : this.success.size();
+    }
+
+    public void putToSuccess(String key, String val) {
+      if (this.success == null) {
+        this.success = new HashMap<String,String>();
+      }
+      this.success.put(key, val);
+    }
+
+    public Map<String,String> getSuccess() {
       return this.success;
     }
 
-    public deleteSSHPubKey_result setSuccess(boolean success) {
+    public getAllGatewayPWDCredentials_result setSuccess(Map<String,String> 
success) {
       this.success = success;
-      setSuccessIsSet(true);
       return this;
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, 
__SUCCESS_ISSET_ID);
+      this.success = null;
     }
 
     /** Returns true if field success is set (has been assigned a value) and 
false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return this.success != null;
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, 
__SUCCESS_ISSET_ID, value);
+      if (!value) {
+        this.success = null;
+      }
     }
 
     public org.apache.airavata.model.error.InvalidRequestException getIre() {
       return this.ire;
     }
 
-    public deleteSSHPubKey_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
+    public getAllGatewayPWDCredentials_result 
setIre(org.apache.airavata.model.error.InvalidRequestException ire) {
       this.ire = ire;
       return this;
     }
@@ -59036,7 +59244,7 @@ public class Airavata {
       return this.ace;
     }
 
-    public deleteSSHPubKey_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
+    public getAllGatewayPWDCredentials_result 
setAce(org.apache.airavata.model.error.AiravataClientException ace) {
       this.ace = ace;
       return this;
     }
@@ -59060,7 +59268,7 @@ public class Airavata {
       return this.ase;
     }
 
-    public deleteSSHPubKey_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
+    public getAllGatewayPWDCredentials_result 
setAse(org.apache.airavata.model.error.AiravataSystemException ase) {
       this.ase = ase;
       return this;
     }
@@ -59086,7 +59294,7 @@ public class Airavata {
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((Map<String,String>)value);
         }
         break;
 
@@ -59120,7 +59328,7 @@ public class Airavata {
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return isSuccess();
+        return getSuccess();
 
       case IRE:
         return getIre();
@@ -59158,21 +59366,21 @@ public class Airavata {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof deleteSSHPubKey_result)
-        return this.equals((deleteSSHPubKey_result)that);
+      if (that instanceof getAllGatewayPWDCredentials_result)
+        return this.equals((getAllGatewayPWDCredentials_result)that);
       return false;
     }
 
-    public boolean equals(deleteSSHPubKey_result that) {
+    public boolean equals(getAllGatewayPWDCredentials_result that) {
       if (that == null)
         return false;
 
-      boolean this_present_success = true;
-      boolean that_present_success = true;
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
       if (this_present_success || that_present_success) {
         if (!(this_present_success && that_present_success))
           return false;
-        if (this.success != that.success)
+        if (!this.success.equals(that.success))
           return false;
       }
 
@@ -59210,7 +59418,7 @@ public class Airavata {
     public int hashCode() {
       List<Object> list = new ArrayList<Object>();
 
-      boolean present_success = true;
+      boolean present_success = true && (isSetSuccess());
       list.add(present_success);
       if (present_success)
         list.add(success);
@@ -59234,7 +59442,7 @@ public class Airavata {
     }
 
     @Override
-    public int compareTo(deleteSSHPubKey_result other) {
+    public int compareTo(getAllGatewayPWDCredentials_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
@@ -59298,11 +59506,15 @@ public class Airavata {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("deleteSSHPubKey_result(");
+      StringBuilder sb = new 
StringBuilder("getAllGatewayPWDCredentials_result(");
       boolean first = true;
 
       sb.append("success:");
-      sb.append(this.success);
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
       first = false;
       if (!first) sb.append(", ");
       sb.append("ire:");
@@ -59347,23 +59559,21 @@ public class Airavata {
 
     private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
       try {
-        // it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
-        __isset_bitfield = 0;
         read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
       }
     }
 
-    private static class deleteSSHPubKey_resultStandardSchemeFactory 
implements SchemeFactory {
-      public deleteSSHPubKey_resultStandardScheme getScheme() {
-        return new deleteSSHPubKey_resultStandardScheme();
+    private static class 
getAllGatewayPWDCredentials_resultStandardSchemeFactory implements 
SchemeFactory {
+      public getAllGatewayPWDCredentials_resultStandardScheme getScheme() {
+        return new getAllGatewayPWDCredentials_resultStandardScheme();
       }
     }
 
-    private static class deleteSSHPubKey_resultStandardScheme extends 
StandardScheme<deleteSSHPubKey_result> {
+    private static class getAllGatewayPWDCredentials_resultStandardScheme 
extends StandardScheme<getAllGatewayPWDCredentials_result> {
 
-      public void read(org.apache.thrift.protocol.TProtocol iprot, 
deleteSSHPubKey_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol iprot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
         iprot.readStructBegin();
         while (true)
@@ -59374,8 +59584,20 @@ public class Airavata {
           }
           switch (schemeField.id) {
             case 0: // SUCCESS
-              if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-                struct.success = iprot.readBool();
+              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+                {
+                  org.apache.thrift.protocol.TMap _map50 = 
iprot.readMapBegin();
+                  struct.success = new HashMap<String,String>(2*_map50.size);
+                  String _key51;
+                  String _val52;
+                  for (int _i53 = 0; _i53 < _map50.size; ++_i53)
+                  {
+                    _key51 = iprot.readString();
+                    _val52 = iprot.readString();
+                    struct.success.put(_key51, _val52);
+                  }
+                  iprot.readMapEnd();
+                }
                 struct.setSuccessIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -59419,13 +59641,21 @@ public class Airavata {
         struct.validate();
       }
 
-      public void write(org.apache.thrift.protocol.TProtocol oprot, 
deleteSSHPubKey_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol oprot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
         struct.validate();
 
         oprot.writeStructBegin(STRUCT_DESC);
-        if (struct.isSetSuccess()) {
+        if (struct.success != null) {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-          oprot.writeBool(struct.success);
+          {
+            oprot.writeMapBegin(new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, struct.success.size()));
+            for (Map.Entry<String, String> _iter54 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter54.getKey());
+              oprot.writeString(_iter54.getValue());
+            }
+            oprot.writeMapEnd();
+          }
           oprot.writeFieldEnd();
         }
         if (struct.ire != null) {
@@ -59449,16 +59679,16 @@ public class Airavata {
 
     }
 
-    private static class deleteSSHPubKey_resultTupleSchemeFactory implements 
SchemeFactory {
-      public deleteSSHPubKey_resultTupleScheme getScheme() {
-        return new deleteSSHPubKey_resultTupleScheme();
+    private static class getAllGatewayPWDCredentials_resultTupleSchemeFactory 
implements SchemeFactory {
+      public getAllGatewayPWDCredentials_resultTupleScheme getScheme() {
+        return new getAllGatewayPWDCredentials_resultTupleScheme();
       }
     }
 
-    private static class deleteSSHPubKey_resultTupleScheme extends 
TupleScheme<deleteSSHPubKey_result> {
+    private static class getAllGatewayPWDCredentials_resultTupleScheme extends 
TupleScheme<getAllGatewayPWDCredentials_result> {
 
       @Override
-      public void write(org.apache.thrift.protocol.TProtocol prot, 
deleteSSHPubKey_result struct) throws org.apache.thrift.TException {
+      public void write(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         BitSet optionals = new BitSet();
         if (struct.isSetSuccess()) {
@@ -59475,7 +59705,14 @@ public class Airavata {
         }
         oprot.writeBitSet(optionals, 4);
         if (struct.isSetSuccess()) {
-          oprot.writeBool(struct.success);
+          {
+            oprot.writeI32(struct.success.size());
+            for (Map.Entry<String, String> _iter55 : struct.success.entrySet())
+            {
+              oprot.writeString(_iter55.getKey());
+              oprot.writeString(_iter55.getValue());
+            }
+          }
         }
         if (struct.isSetIre()) {
           struct.ire.write(oprot);
@@ -59489,11 +59726,22 @@ public class Airavata {
       }
 
       @Override
-      public void read(org.apache.thrift.protocol.TProtocol prot, 
deleteSSHPubKey_result struct) throws org.apache.thrift.TException {
+      public void read(org.apache.thrift.protocol.TProtocol prot, 
getAllGatewayPWDCredentials_result struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
-          struct.success = iprot.readBool();
+          {
+            org.apache.thrift.protocol.TMap _map56 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new HashMap<String,String>(2*_map56.size);
+            String _key57;
+            String _val58;
+            for (int _i59 = 0; _i59 < _map56.size; ++_i59)
+            {
+              _key57 = iprot.readString();
+              _val58 = iprot.readString();
+              struct.success.put(_key57, _val58);
+            }
+          }
           struct.setSuccessIsSet(true);
         }
         if (incoming.get(1)) {
@@ -59516,8 +59764,8 @@ public class Airavata {
 
   }
 
-  public static class deletePWDCredential_args implements 
org.apache.thrift.TBase<deletePWDCredential_args, 
deletePWDCredential_args._Fields>, java.io.Serializable, Cloneable, 
Comparable<deletePWDCredential_args>   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("deletePWDCredential_args");
+  public static class deleteSSHPubKey_args implements 
org.apache.thrift.TBase<deleteSSHPubKey_args, deleteSSHPubKey_args._Fields>, 
java.io.Serializable, Cloneable, Comparable<deleteSSHPubKey_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("deleteSSHPubKey_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 
AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new 
org.apache.thrift.protocol.TField("airavataCredStoreToken", 
org.apache.thrift.protocol.TType.STRING, (short)2);
@@ -59525,8 +59773,8 @@ public class Airavata {
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes 
= new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new 
deletePWDCredential_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new 
deletePWDCredential_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new 
deleteSSHPubKey_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new 
deleteSSHPubKey_argsTupleSchemeFactory());
     }
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // 
required
@@ -59608,13 +59856,13 @@ public class Airavata {
       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);

<TRUNCATED>

Reply via email to