http://git-wip-us.apache.org/repos/asf/airavata/blob/3184c238/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 d92d222..48fdbd8 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
@@ -2621,9 +2621,7 @@ public class Airavata {
      */
     public boolean 
deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken 
authzToken) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
-
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>
 
getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken 
authzToken) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Check if user has an SSH account on the given compute resource. This
@@ -2631,9 +2629,9 @@ public class Airavata {
      * 
      * @param authzToken
      * @param computeResourceId
-     * @param username
+     * @param userId
      */
-    public boolean 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public boolean 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Setup and return a UserComputeResourcePreference object for this user 
to SSH into the given compute resource with
@@ -2643,10 +2641,10 @@ public class Airavata {
      * 
      * @param authzToken
      * @param computeResourceId
-     * @param username
+     * @param userId
      * @param airavataCredStoreToken
      */
-    public 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
+    public 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException;
 
     /**
      * Register User Resource Profile.
@@ -3318,13 +3316,11 @@ public class Airavata {
 
     public void 
deleteGatewayStoragePreference(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayID, String storageId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
-    public void 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+    public void 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
     public void 
registerUserResourceProfile(org.apache.airavata.model.security.AuthzToken 
authzToken, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile 
userResourceProfile, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
@@ -8310,23 +8306,23 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteGatewayStoragePreference failed: unknown result");
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken 
authzToken) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken 
authzToken) throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      send_getSSHAccountProvisionerNames(authzToken);
-      return recv_getSSHAccountProvisionerNames();
+      send_getSSHAccountProvisioners(authzToken);
+      return recv_getSSHAccountProvisioners();
     }
 
-    public void 
send_getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken
 authzToken) throws org.apache.thrift.TException
+    public void 
send_getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken 
authzToken) throws org.apache.thrift.TException
     {
-      getSSHAccountProvisionerNames_args args = new 
getSSHAccountProvisionerNames_args();
+      getSSHAccountProvisioners_args args = new 
getSSHAccountProvisioners_args();
       args.setAuthzToken(authzToken);
-      sendBase("getSSHAccountProvisionerNames", args);
+      sendBase("getSSHAccountProvisioners", args);
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 recv_getSSHAccountProvisionerNames() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 recv_getSSHAccountProvisioners() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      getSSHAccountProvisionerNames_result result = new 
getSSHAccountProvisionerNames_result();
-      receiveBase(result, "getSSHAccountProvisionerNames");
+      getSSHAccountProvisioners_result result = new 
getSSHAccountProvisioners_result();
+      receiveBase(result, "getSSHAccountProvisioners");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -8342,57 +8338,21 @@ public class Airavata {
       if (result.ae != null) {
         throw result.ae;
       }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHAccountProvisionerNames failed: unknown result");
-    }
-
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>
 
getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
-    {
-      send_getSSHAccountProvisionerConfigParams(authzToken, provisionerName);
-      return recv_getSSHAccountProvisionerConfigParams();
-    }
-
-    public void 
send_getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName) throws org.apache.thrift.TException
-    {
-      getSSHAccountProvisionerConfigParams_args args = new 
getSSHAccountProvisionerConfigParams_args();
-      args.setAuthzToken(authzToken);
-      args.setProvisionerName(provisionerName);
-      sendBase("getSSHAccountProvisionerConfigParams", args);
+      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHAccountProvisioners failed: unknown result");
     }
 
-    public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>
 recv_getSSHAccountProvisionerConfigParams() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public boolean 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      getSSHAccountProvisionerConfigParams_result result = new 
getSSHAccountProvisionerConfigParams_result();
-      receiveBase(result, "getSSHAccountProvisionerConfigParams");
-      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;
-      }
-      if (result.ae != null) {
-        throw result.ae;
-      }
-      throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getSSHAccountProvisionerConfigParams failed: unknown result");
-    }
-
-    public boolean 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
-    {
-      send_doesUserHaveSSHAccount(authzToken, computeResourceId, username);
+      send_doesUserHaveSSHAccount(authzToken, computeResourceId, userId);
       return recv_doesUserHaveSSHAccount();
     }
 
-    public void 
send_doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username) throws 
org.apache.thrift.TException
+    public void 
send_doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String userId) throws 
org.apache.thrift.TException
     {
       doesUserHaveSSHAccount_args args = new doesUserHaveSSHAccount_args();
       args.setAuthzToken(authzToken);
       args.setComputeResourceId(computeResourceId);
-      args.setUsername(username);
+      args.setUserId(userId);
       sendBase("doesUserHaveSSHAccount", args);
     }
 
@@ -8418,18 +8378,18 @@ public class Airavata {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "doesUserHaveSSHAccount failed: unknown result");
     }
 
-    public 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
+    public 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
org.apache.thrift.TException
     {
-      send_setupUserComputeResourcePreferencesForSSH(authzToken, 
computeResourceId, username, airavataCredStoreToken);
+      send_setupUserComputeResourcePreferencesForSSH(authzToken, 
computeResourceId, userId, airavataCredStoreToken);
       return recv_setupUserComputeResourcePreferencesForSSH();
     }
 
-    public void 
send_setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken) throws org.apache.thrift.TException
+    public void 
send_setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken) throws org.apache.thrift.TException
     {
       setupUserComputeResourcePreferencesForSSH_args args = new 
setupUserComputeResourcePreferencesForSSH_args();
       args.setAuthzToken(authzToken);
       args.setComputeResourceId(computeResourceId);
-      args.setUsername(username);
+      args.setUserId(userId);
       args.setAiravataCredStoreToken(airavataCredStoreToken);
       sendBase("setupUserComputeResourcePreferencesForSSH", args);
     }
@@ -14767,23 +14727,23 @@ public class Airavata {
       }
     }
 
-    public void 
getSSHAccountProvisionerNames(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
getSSHAccountProvisioners(org.apache.airavata.model.security.AuthzToken 
authzToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getSSHAccountProvisionerNames_call method_call = new 
getSSHAccountProvisionerNames_call(authzToken, resultHandler, this, 
___protocolFactory, ___transport);
+      getSSHAccountProvisioners_call method_call = new 
getSSHAccountProvisioners_call(authzToken, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getSSHAccountProvisionerNames_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+    public static class getSSHAccountProvisioners_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
-      public 
getSSHAccountProvisionerNames_call(org.apache.airavata.model.security.AuthzToken
 authzToken, 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 
getSSHAccountProvisioners_call(org.apache.airavata.model.security.AuthzToken 
authzToken, 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;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getSSHAccountProvisionerNames", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getSSHAccountProvisionerNames_args args = new 
getSSHAccountProvisionerNames_args();
+        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getSSHAccountProvisioners", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getSSHAccountProvisioners_args args = new 
getSSHAccountProvisioners_args();
         args.setAuthzToken(authzToken);
         args.write(prot);
         prot.writeMessageEnd();
@@ -14795,48 +14755,13 @@ public class Airavata {
         }
         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_getSSHAccountProvisionerNames();
+        return (new Client(prot)).recv_getSSHAccountProvisioners();
       }
     }
 
-    public void 
getSSHAccountProvisionerConfigParams(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getSSHAccountProvisionerConfigParams_call method_call = new 
getSSHAccountProvisionerConfigParams_call(authzToken, provisionerName, 
resultHandler, this, ___protocolFactory, ___transport);
-      this.___currentMethod = method_call;
-      ___manager.call(method_call);
-    }
-
-    public static class getSSHAccountProvisionerConfigParams_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private org.apache.airavata.model.security.AuthzToken authzToken;
-      private String provisionerName;
-      public 
getSSHAccountProvisionerConfigParams_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String provisionerName, 
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.provisionerName = provisionerName;
-      }
-
-      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-        prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getSSHAccountProvisionerConfigParams", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
-        getSSHAccountProvisionerConfigParams_args args = new 
getSSHAccountProvisionerConfigParams_args();
-        args.setAuthzToken(authzToken);
-        args.setProvisionerName(provisionerName);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>
 getResult() throws org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.airavata.model.error.AuthorizationException, 
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_getSSHAccountProvisionerConfigParams();
-      }
-    }
-
-    public void 
doesUserHaveSSHAccount(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
-      checkReady();
-      doesUserHaveSSHAccount_call method_call = new 
doesUserHaveSSHAccount_call(authzToken, computeResourceId, username, 
resultHandler, this, ___protocolFactory, ___transport);
+      doesUserHaveSSHAccount_call method_call = new 
doesUserHaveSSHAccount_call(authzToken, computeResourceId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -14844,12 +14769,12 @@ public class Airavata {
     public static class doesUserHaveSSHAccount_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String computeResourceId;
-      private String username;
-      public 
doesUserHaveSSHAccount_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, String username, 
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 {
+      private String userId;
+      public 
doesUserHaveSSHAccount_call(org.apache.airavata.model.security.AuthzToken 
authzToken, String computeResourceId, 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.computeResourceId = computeResourceId;
-        this.username = username;
+        this.userId = userId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
@@ -14857,7 +14782,7 @@ public class Airavata {
         doesUserHaveSSHAccount_args args = new doesUserHaveSSHAccount_args();
         args.setAuthzToken(authzToken);
         args.setComputeResourceId(computeResourceId);
-        args.setUsername(username);
+        args.setUserId(userId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -14872,9 +14797,9 @@ public class Airavata {
       }
     }
 
-    public void 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+    public void 
setupUserComputeResourcePreferencesForSSH(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      setupUserComputeResourcePreferencesForSSH_call method_call = new 
setupUserComputeResourcePreferencesForSSH_call(authzToken, computeResourceId, 
username, airavataCredStoreToken, resultHandler, this, ___protocolFactory, 
___transport);
+      setupUserComputeResourcePreferencesForSSH_call method_call = new 
setupUserComputeResourcePreferencesForSSH_call(authzToken, computeResourceId, 
userId, airavataCredStoreToken, resultHandler, this, ___protocolFactory, 
___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -14882,13 +14807,13 @@ public class Airavata {
     public static class setupUserComputeResourcePreferencesForSSH_call extends 
org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String computeResourceId;
-      private String username;
+      private String userId;
       private String airavataCredStoreToken;
-      public 
setupUserComputeResourcePreferencesForSSH_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String username, String 
airavataCredStoreToken, 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 
setupUserComputeResourcePreferencesForSSH_call(org.apache.airavata.model.security.AuthzToken
 authzToken, String computeResourceId, String userId, String 
airavataCredStoreToken, 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.computeResourceId = computeResourceId;
-        this.username = username;
+        this.userId = userId;
         this.airavataCredStoreToken = airavataCredStoreToken;
       }
 
@@ -14897,7 +14822,7 @@ public class Airavata {
         setupUserComputeResourcePreferencesForSSH_args args = new 
setupUserComputeResourcePreferencesForSSH_args();
         args.setAuthzToken(authzToken);
         args.setComputeResourceId(computeResourceId);
-        args.setUsername(username);
+        args.setUserId(userId);
         args.setAiravataCredStoreToken(airavataCredStoreToken);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16418,8 +16343,7 @@ public class Airavata {
       processMap.put("updateGatewayStoragePreference", new 
updateGatewayStoragePreference());
       processMap.put("deleteGatewayComputeResourcePreference", new 
deleteGatewayComputeResourcePreference());
       processMap.put("deleteGatewayStoragePreference", new 
deleteGatewayStoragePreference());
-      processMap.put("getSSHAccountProvisionerNames", new 
getSSHAccountProvisionerNames());
-      processMap.put("getSSHAccountProvisionerConfigParams", new 
getSSHAccountProvisionerConfigParams());
+      processMap.put("getSSHAccountProvisioners", new 
getSSHAccountProvisioners());
       processMap.put("doesUserHaveSSHAccount", new doesUserHaveSSHAccount());
       processMap.put("setupUserComputeResourcePreferencesForSSH", new 
setupUserComputeResourcePreferencesForSSH());
       processMap.put("registerUserResourceProfile", new 
registerUserResourceProfile());
@@ -20507,53 +20431,23 @@ public class Airavata {
       }
     }
 
-    public static class getSSHAccountProvisionerNames<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getSSHAccountProvisionerNames_args> {
-      public getSSHAccountProvisionerNames() {
-        super("getSSHAccountProvisionerNames");
-      }
-
-      public getSSHAccountProvisionerNames_args getEmptyArgsInstance() {
-        return new getSSHAccountProvisionerNames_args();
-      }
-
-      protected boolean isOneway() {
-        return false;
-      }
-
-      public getSSHAccountProvisionerNames_result getResult(I iface, 
getSSHAccountProvisionerNames_args args) throws org.apache.thrift.TException {
-        getSSHAccountProvisionerNames_result result = new 
getSSHAccountProvisionerNames_result();
-        try {
-          result.success = 
iface.getSSHAccountProvisionerNames(args.authzToken);
-        } 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;
-        } catch (org.apache.airavata.model.error.AuthorizationException ae) {
-          result.ae = ae;
-        }
-        return result;
-      }
-    }
-
-    public static class getSSHAccountProvisionerConfigParams<I extends Iface> 
extends org.apache.thrift.ProcessFunction<I, 
getSSHAccountProvisionerConfigParams_args> {
-      public getSSHAccountProvisionerConfigParams() {
-        super("getSSHAccountProvisionerConfigParams");
+    public static class getSSHAccountProvisioners<I extends Iface> extends 
org.apache.thrift.ProcessFunction<I, getSSHAccountProvisioners_args> {
+      public getSSHAccountProvisioners() {
+        super("getSSHAccountProvisioners");
       }
 
-      public getSSHAccountProvisionerConfigParams_args getEmptyArgsInstance() {
-        return new getSSHAccountProvisionerConfigParams_args();
+      public getSSHAccountProvisioners_args getEmptyArgsInstance() {
+        return new getSSHAccountProvisioners_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public getSSHAccountProvisionerConfigParams_result getResult(I iface, 
getSSHAccountProvisionerConfigParams_args args) throws 
org.apache.thrift.TException {
-        getSSHAccountProvisionerConfigParams_result result = new 
getSSHAccountProvisionerConfigParams_result();
+      public getSSHAccountProvisioners_result getResult(I iface, 
getSSHAccountProvisioners_args args) throws org.apache.thrift.TException {
+        getSSHAccountProvisioners_result result = new 
getSSHAccountProvisioners_result();
         try {
-          result.success = 
iface.getSSHAccountProvisionerConfigParams(args.authzToken, 
args.provisionerName);
+          result.success = iface.getSSHAccountProvisioners(args.authzToken);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -20583,7 +20477,7 @@ public class Airavata {
       public doesUserHaveSSHAccount_result getResult(I iface, 
doesUserHaveSSHAccount_args args) throws org.apache.thrift.TException {
         doesUserHaveSSHAccount_result result = new 
doesUserHaveSSHAccount_result();
         try {
-          result.success = iface.doesUserHaveSSHAccount(args.authzToken, 
args.computeResourceId, args.username);
+          result.success = iface.doesUserHaveSSHAccount(args.authzToken, 
args.computeResourceId, args.userId);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -20614,7 +20508,7 @@ public class Airavata {
       public setupUserComputeResourcePreferencesForSSH_result getResult(I 
iface, setupUserComputeResourcePreferencesForSSH_args args) throws 
org.apache.thrift.TException {
         setupUserComputeResourcePreferencesForSSH_result result = new 
setupUserComputeResourcePreferencesForSSH_result();
         try {
-          result.success = 
iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, 
args.computeResourceId, args.username, args.airavataCredStoreToken);
+          result.success = 
iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, 
args.computeResourceId, args.userId, args.airavataCredStoreToken);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -21867,8 +21761,7 @@ public class Airavata {
       processMap.put("updateGatewayStoragePreference", new 
updateGatewayStoragePreference());
       processMap.put("deleteGatewayComputeResourcePreference", new 
deleteGatewayComputeResourcePreference());
       processMap.put("deleteGatewayStoragePreference", new 
deleteGatewayStoragePreference());
-      processMap.put("getSSHAccountProvisionerNames", new 
getSSHAccountProvisionerNames());
-      processMap.put("getSSHAccountProvisionerConfigParams", new 
getSSHAccountProvisionerConfigParams());
+      processMap.put("getSSHAccountProvisioners", new 
getSSHAccountProvisioners());
       processMap.put("doesUserHaveSSHAccount", new doesUserHaveSSHAccount());
       processMap.put("setupUserComputeResourcePreferencesForSSH", new 
setupUserComputeResourcePreferencesForSSH());
       processMap.put("registerUserResourceProfile", new 
registerUserResourceProfile());
@@ -31551,20 +31444,20 @@ public class Airavata {
       }
     }
 
-    public static class getSSHAccountProvisionerNames<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getSSHAccountProvisionerNames_args, 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>
 {
-      public getSSHAccountProvisionerNames() {
-        super("getSSHAccountProvisionerNames");
+    public static class getSSHAccountProvisioners<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getSSHAccountProvisioners_args, 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>
 {
+      public getSSHAccountProvisioners() {
+        super("getSSHAccountProvisioners");
       }
 
-      public getSSHAccountProvisionerNames_args getEmptyArgsInstance() {
-        return new getSSHAccountProvisionerNames_args();
+      public getSSHAccountProvisioners_args getEmptyArgsInstance() {
+        return new getSSHAccountProvisioners_args();
       }
 
       public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>()
 { 
           public void 
onComplete(List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>
 o) {
-            getSSHAccountProvisionerNames_result result = new 
getSSHAccountProvisionerNames_result();
+            getSSHAccountProvisioners_result result = new 
getSSHAccountProvisioners_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -31577,7 +31470,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getSSHAccountProvisionerNames_result result = new 
getSSHAccountProvisionerNames_result();
+            getSSHAccountProvisioners_result result = new 
getSSHAccountProvisioners_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -31618,26 +31511,27 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getSSHAccountProvisionerNames_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>
 resultHandler) throws TException {
-        iface.getSSHAccountProvisionerNames(args.authzToken,resultHandler);
+      public void start(I iface, getSSHAccountProvisioners_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisioner>>
 resultHandler) throws TException {
+        iface.getSSHAccountProvisioners(args.authzToken,resultHandler);
       }
     }
 
-    public static class getSSHAccountProvisionerConfigParams<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getSSHAccountProvisionerConfigParams_args, 
List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>>
 {
-      public getSSHAccountProvisionerConfigParams() {
-        super("getSSHAccountProvisionerConfigParams");
+    public static class doesUserHaveSSHAccount<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, doesUserHaveSSHAccount_args, Boolean> 
{
+      public doesUserHaveSSHAccount() {
+        super("doesUserHaveSSHAccount");
       }
 
-      public getSSHAccountProvisionerConfigParams_args getEmptyArgsInstance() {
-        return new getSSHAccountProvisionerConfigParams_args();
+      public doesUserHaveSSHAccount_args getEmptyArgsInstance() {
+        return new doesUserHaveSSHAccount_args();
       }
 
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>
 o) {
-            getSSHAccountProvisionerConfigParams_result result = new 
getSSHAccountProvisionerConfigParams_result();
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            doesUserHaveSSHAccount_result result = new 
doesUserHaveSSHAccount_result();
             result.success = o;
+            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -31649,7 +31543,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getSSHAccountProvisionerConfigParams_result result = new 
getSSHAccountProvisionerConfigParams_result();
+            doesUserHaveSSHAccount_result result = new 
doesUserHaveSSHAccount_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -31690,25 +31584,241 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getSSHAccountProvisionerConfigParams_args 
args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam>>
 resultHandler) throws TException {
-        iface.getSSHAccountProvisionerConfigParams(args.authzToken, 
args.provisionerName,resultHandler);
+      public void start(I iface, doesUserHaveSSHAccount_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, 
args.userId,resultHandler);
       }
     }
 
-    public static class doesUserHaveSSHAccount<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, doesUserHaveSSHAccount_args, Boolean> 
{
-      public doesUserHaveSSHAccount() {
-        super("doesUserHaveSSHAccount");
+    public static class setupUserComputeResourcePreferencesForSSH<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
setupUserComputeResourcePreferencesForSSH_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 {
+      public setupUserComputeResourcePreferencesForSSH() {
+        super("setupUserComputeResourcePreferencesForSSH");
       }
 
-      public doesUserHaveSSHAccount_args getEmptyArgsInstance() {
-        return new doesUserHaveSSHAccount_args();
+      public setupUserComputeResourcePreferencesForSSH_args 
getEmptyArgsInstance() {
+        return new setupUserComputeResourcePreferencesForSSH_args();
+      }
+
+      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>()
 { 
+          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 o) {
+            setupUserComputeResourcePreferencesForSSH_result result = new 
setupUserComputeResourcePreferencesForSSH_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;
+            setupUserComputeResourcePreferencesForSSH_result result = new 
setupUserComputeResourcePreferencesForSSH_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             if (e instanceof 
org.apache.airavata.model.error.AuthorizationException) {
+                        result.ae = 
(org.apache.airavata.model.error.AuthorizationException) e;
+                        result.setAeIsSet(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, 
setupUserComputeResourcePreferencesForSSH_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 resultHandler) throws TException {
+        iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, 
args.computeResourceId, args.userId, args.airavataCredStoreToken,resultHandler);
+      }
+    }
+
+    public static class registerUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
registerUserResourceProfile_args, String> {
+      public registerUserResourceProfile() {
+        super("registerUserResourceProfile");
+      }
+
+      public registerUserResourceProfile_args getEmptyArgsInstance() {
+        return new registerUserResourceProfile_args();
+      }
+
+      public AsyncMethodCallback<String> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<String>() { 
+          public void onComplete(String o) {
+            registerUserResourceProfile_result result = new 
registerUserResourceProfile_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;
+            registerUserResourceProfile_result result = new 
registerUserResourceProfile_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             if (e instanceof 
org.apache.airavata.model.error.AuthorizationException) {
+                        result.ae = 
(org.apache.airavata.model.error.AuthorizationException) e;
+                        result.setAeIsSet(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, registerUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws 
TException {
+        iface.registerUserResourceProfile(args.authzToken, 
args.userResourceProfile,resultHandler);
+      }
+    }
+
+    public static class getUserResourceProfile<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getUserResourceProfile_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> {
+      public getUserResourceProfile() {
+        super("getUserResourceProfile");
+      }
+
+      public getUserResourceProfile_args getEmptyArgsInstance() {
+        return new getUserResourceProfile_args();
+      }
+
+      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>()
 { 
+          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile
 o) {
+            getUserResourceProfile_result result = new 
getUserResourceProfile_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;
+            getUserResourceProfile_result result = new 
getUserResourceProfile_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             if (e instanceof 
org.apache.airavata.model.error.AuthorizationException) {
+                        result.ae = 
(org.apache.airavata.model.error.AuthorizationException) e;
+                        result.setAeIsSet(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, getUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>
 resultHandler) throws TException {
+        iface.getUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID,resultHandler);
+      }
+    }
+
+    public static class updateUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
updateUserResourceProfile_args, Boolean> {
+      public updateUserResourceProfile() {
+        super("updateUserResourceProfile");
+      }
+
+      public updateUserResourceProfile_args getEmptyArgsInstance() {
+        return new updateUserResourceProfile_args();
       }
 
       public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<Boolean>() { 
           public void onComplete(Boolean o) {
-            doesUserHaveSSHAccount_result result = new 
doesUserHaveSSHAccount_result();
+            updateUserResourceProfile_result result = new 
updateUserResourceProfile_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
@@ -31722,7 +31832,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            doesUserHaveSSHAccount_result result = new 
doesUserHaveSSHAccount_result();
+            updateUserResourceProfile_result result = new 
updateUserResourceProfile_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -31763,98 +31873,27 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, doesUserHaveSSHAccount_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
-        iface.doesUserHaveSSHAccount(args.authzToken, args.computeResourceId, 
args.username,resultHandler);
-      }
-    }
-
-    public static class setupUserComputeResourcePreferencesForSSH<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
setupUserComputeResourcePreferencesForSSH_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 {
-      public setupUserComputeResourcePreferencesForSSH() {
-        super("setupUserComputeResourcePreferencesForSSH");
-      }
-
-      public setupUserComputeResourcePreferencesForSSH_args 
getEmptyArgsInstance() {
-        return new setupUserComputeResourcePreferencesForSSH_args();
-      }
-
-      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>()
 { 
-          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 o) {
-            setupUserComputeResourcePreferencesForSSH_result result = new 
setupUserComputeResourcePreferencesForSSH_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;
-            setupUserComputeResourcePreferencesForSSH_result result = new 
setupUserComputeResourcePreferencesForSSH_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             if (e instanceof 
org.apache.airavata.model.error.AuthorizationException) {
-                        result.ae = 
(org.apache.airavata.model.error.AuthorizationException) e;
-                        result.setAeIsSet(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, 
setupUserComputeResourcePreferencesForSSH_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 resultHandler) throws TException {
-        iface.setupUserComputeResourcePreferencesForSSH(args.authzToken, 
args.computeResourceId, args.username, 
args.airavataCredStoreToken,resultHandler);
+      public void start(I iface, updateUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.updateUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID, args.userResourceProfile,resultHandler);
       }
     }
 
-    public static class registerUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
registerUserResourceProfile_args, String> {
-      public registerUserResourceProfile() {
-        super("registerUserResourceProfile");
+    public static class deleteUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
deleteUserResourceProfile_args, Boolean> {
+      public deleteUserResourceProfile() {
+        super("deleteUserResourceProfile");
       }
 
-      public registerUserResourceProfile_args getEmptyArgsInstance() {
-        return new registerUserResourceProfile_args();
+      public deleteUserResourceProfile_args getEmptyArgsInstance() {
+        return new deleteUserResourceProfile_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
-            registerUserResourceProfile_result result = new 
registerUserResourceProfile_result();
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            deleteUserResourceProfile_result result = new 
deleteUserResourceProfile_result();
             result.success = o;
+            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -31866,7 +31905,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            registerUserResourceProfile_result result = new 
registerUserResourceProfile_result();
+            deleteUserResourceProfile_result result = new 
deleteUserResourceProfile_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -31907,26 +31946,27 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, registerUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws 
TException {
-        iface.registerUserResourceProfile(args.authzToken, 
args.userResourceProfile,resultHandler);
+      public void start(I iface, deleteUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.deleteUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID,resultHandler);
       }
     }
 
-    public static class getUserResourceProfile<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getUserResourceProfile_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile> {
-      public getUserResourceProfile() {
-        super("getUserResourceProfile");
+    public static class addUserComputeResourcePreference<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
addUserComputeResourcePreference_args, Boolean> {
+      public addUserComputeResourcePreference() {
+        super("addUserComputeResourcePreference");
       }
 
-      public getUserResourceProfile_args getEmptyArgsInstance() {
-        return new getUserResourceProfile_args();
+      public addUserComputeResourcePreference_args getEmptyArgsInstance() {
+        return new addUserComputeResourcePreference_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>()
 { 
-          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile
 o) {
-            getUserResourceProfile_result result = new 
getUserResourceProfile_result();
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            addUserComputeResourcePreference_result result = new 
addUserComputeResourcePreference_result();
             result.success = o;
+            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -31938,7 +31978,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getUserResourceProfile_result result = new 
getUserResourceProfile_result();
+            addUserComputeResourcePreference_result result = new 
addUserComputeResourcePreference_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -31979,25 +32019,25 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>
 resultHandler) throws TException {
-        iface.getUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID,resultHandler);
+      public void start(I iface, addUserComputeResourcePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.addUserComputeResourcePreference(args.authzToken, args.userId, 
args.gatewayID, args.userComputeResourceId, 
args.userComputeResourcePreference,resultHandler);
       }
     }
 
-    public static class updateUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
updateUserResourceProfile_args, Boolean> {
-      public updateUserResourceProfile() {
-        super("updateUserResourceProfile");
+    public static class addUserStoragePreference<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, addUserStoragePreference_args, 
Boolean> {
+      public addUserStoragePreference() {
+        super("addUserStoragePreference");
       }
 
-      public updateUserResourceProfile_args getEmptyArgsInstance() {
-        return new updateUserResourceProfile_args();
+      public addUserStoragePreference_args getEmptyArgsInstance() {
+        return new addUserStoragePreference_args();
       }
 
       public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
         return new AsyncMethodCallback<Boolean>() { 
           public void onComplete(Boolean o) {
-            updateUserResourceProfile_result result = new 
updateUserResourceProfile_result();
+            addUserStoragePreference_result result = new 
addUserStoragePreference_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
@@ -32011,7 +32051,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            updateUserResourceProfile_result result = new 
updateUserResourceProfile_result();
+            addUserStoragePreference_result result = new 
addUserStoragePreference_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32052,27 +32092,26 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, updateUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
-        iface.updateUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID, args.userResourceProfile,resultHandler);
+      public void start(I iface, addUserStoragePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
+        iface.addUserStoragePreference(args.authzToken, args.userId, 
args.gatewayID, args.userStorageResourceId, 
args.userStoragePreference,resultHandler);
       }
     }
 
-    public static class deleteUserResourceProfile<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
deleteUserResourceProfile_args, Boolean> {
-      public deleteUserResourceProfile() {
-        super("deleteUserResourceProfile");
+    public static class getUserComputeResourcePreference<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getUserComputeResourcePreference_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 {
+      public getUserComputeResourcePreference() {
+        super("getUserComputeResourcePreference");
       }
 
-      public deleteUserResourceProfile_args getEmptyArgsInstance() {
-        return new deleteUserResourceProfile_args();
+      public getUserComputeResourcePreference_args getEmptyArgsInstance() {
+        return new getUserComputeResourcePreference_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
-            deleteUserResourceProfile_result result = new 
deleteUserResourceProfile_result();
+        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>()
 { 
+          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 o) {
+            getUserComputeResourcePreference_result result = new 
getUserComputeResourcePreference_result();
             result.success = o;
-            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -32084,7 +32123,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            deleteUserResourceProfile_result result = new 
deleteUserResourceProfile_result();
+            getUserComputeResourcePreference_result result = new 
getUserComputeResourcePreference_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32125,27 +32164,26 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, deleteUserResourceProfile_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
-        iface.deleteUserResourceProfile(args.authzToken, args.userId, 
args.gatewayID,resultHandler);
+      public void start(I iface, getUserComputeResourcePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 resultHandler) throws TException {
+        iface.getUserComputeResourcePreference(args.authzToken, args.userId, 
args.gatewayID, args.userComputeResourceId,resultHandler);
       }
     }
 
-    public static class addUserComputeResourcePreference<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
addUserComputeResourcePreference_args, Boolean> {
-      public addUserComputeResourcePreference() {
-        super("addUserComputeResourcePreference");
+    public static class getUserStoragePreference<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getUserStoragePreference_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> 
{
+      public getUserStoragePreference() {
+        super("getUserStoragePreference");
       }
 
-      public addUserComputeResourcePreference_args getEmptyArgsInstance() {
-        return new addUserComputeResourcePreference_args();
+      public getUserStoragePreference_args getEmptyArgsInstance() {
+        return new getUserStoragePreference_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
-            addUserComputeResourcePreference_result result = new 
addUserComputeResourcePreference_result();
+        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>()
 { 
+          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference
 o) {
+            getUserStoragePreference_result result = new 
getUserStoragePreference_result();
             result.success = o;
-            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -32157,7 +32195,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            addUserComputeResourcePreference_result result = new 
addUserComputeResourcePreference_result();
+            getUserStoragePreference_result result = new 
getUserStoragePreference_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32198,27 +32236,26 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, addUserComputeResourcePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
-        iface.addUserComputeResourcePreference(args.authzToken, args.userId, 
args.gatewayID, args.userComputeResourceId, 
args.userComputeResourcePreference,resultHandler);
+      public void start(I iface, getUserStoragePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>
 resultHandler) throws TException {
+        iface.getUserStoragePreference(args.authzToken, args.userId, 
args.gatewayID, args.userStorageResourceId,resultHandler);
       }
     }
 
-    public static class addUserStoragePreference<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, addUserStoragePreference_args, 
Boolean> {
-      public addUserStoragePreference() {
-        super("addUserStoragePreference");
+    public static class getAllUserComputeResourcePreferences<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllUserComputeResourcePreferences_args, 
List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>
 {
+      public getAllUserComputeResourcePreferences() {
+        super("getAllUserComputeResourcePreferences");
       }
 
-      public addUserStoragePreference_args getEmptyArgsInstance() {
-        return new addUserStoragePreference_args();
+      public getAllUserComputeResourcePreferences_args getEmptyArgsInstance() {
+        return new getAllUserComputeResourcePreferences_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final 
AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
-            addUserStoragePreference_result result = new 
addUserStoragePreference_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 o) {
+            getAllUserComputeResourcePreferences_result result = new 
getAllUserComputeResourcePreferences_result();
             result.success = o;
-            result.setSuccessIsSet(true);
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
               return;
@@ -32230,7 +32267,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            addUserStoragePreference_result result = new 
addUserStoragePreference_result();
+            getAllUserComputeResourcePreferences_result result = new 
getAllUserComputeResourcePreferences_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32271,25 +32308,25 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, addUserStoragePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws 
TException {
-        iface.addUserStoragePreference(args.authzToken, args.userId, 
args.gatewayID, args.userStorageResourceId, 
args.userStoragePreference,resultHandler);
+      public void start(I iface, getAllUserComputeResourcePreferences_args 
args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>
 resultHandler) throws TException {
+        iface.getAllUserComputeResourcePreferences(args.authzToken, 
args.userId, args.gatewayID,resultHandler);
       }
     }
 
-    public static class getUserComputeResourcePreference<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getUserComputeResourcePreference_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 {
-      public getUserComputeResourcePreference() {
-        super("getUserComputeResourcePreference");
+    public static class getAllUserStoragePreferences<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getAllUserStoragePreferences_args, 
List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>>
 {
+      public getAllUserStoragePreferences() {
+        super("getAllUserStoragePreferences");
       }
 
-      public getUserComputeResourcePreference_args getEmptyArgsInstance() {
-        return new getUserComputeResourcePreference_args();
+      public getAllUserStoragePreferences_args getEmptyArgsInstance() {
+        return new getAllUserStoragePreferences_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>()
 { 
-          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference
 o) {
-            getUserComputeResourcePreference_result result = new 
getUserComputeResourcePreference_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>
 o) {
+            getAllUserStoragePreferences_result result = new 
getAllUserStoragePreferences_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -32302,7 +32339,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getUserComputeResourcePreference_result result = new 
getUserComputeResourcePreference_result();
+            getAllUserStoragePreferences_result result = new 
getAllUserStoragePreferences_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32343,25 +32380,25 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getUserComputeResourcePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 resultHandler) throws TException {
-        iface.getUserComputeResourcePreference(args.authzToken, args.userId, 
args.gatewayID, args.userComputeResourceId,resultHandler);
+      public void start(I iface, getAllUserStoragePreferences_args args, 
org.apache.thrift.async.AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>>
 resultHandler) throws TException {
+        iface.getAllUserStoragePreferences(args.authzToken, args.userId, 
args.gatewayID,resultHandler);
       }
     }
 
-    public static class getUserStoragePreference<I extends AsyncIface> extends 
org.apache.thrift.AsyncProcessFunction<I, getUserStoragePreference_args, 
org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference> 
{
-      public getUserStoragePreference() {
-        super("getUserStoragePreference");
+    public static class getAllUserResourceProfiles<I extends AsyncIface> 
extends org.apache.thrift.AsyncProcessFunction<I, 
getAllUserResourceProfiles_args, 
List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>>
 {
+      public getAllUserResourceProfiles() {
+        super("getAllUserResourceProfiles");
       }
 
-      public getUserStoragePreference_args getEmptyArgsInstance() {
-        return new getUserStoragePreference_args();
+      public getAllUserResourceProfiles_args getEmptyArgsInstance() {
+        return new getAllUserResourceProfiles_args();
       }
 
-      public 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>()
 { 
-          public void 
onComplete(org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference
 o) {
-            getUserStoragePreference_result result = new 
getUserStoragePreference_result();
+        return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>>()
 { 
+          public void 
onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile>
 o) {
+            getAllUserResourceProfiles_result result = new 
getAllUserResourceProfiles_result();
             result.success = o;
             try {
               fcall.sendResponse(fb,result, 
org.apache.thrift.protocol.TMessageType.REPLY,seqid);
@@ -32374,7 +32411,7 @@ public class Airavata {
           public void onError(Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
             org.apache.thrift.TBase msg;
-            getUserStoragePreference_result result = new 
getUserStoragePreference_result();
+            getAllUserResourceProfiles_result result = new 
getAllUserResourceProfiles_result();
             if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
                         result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
                         result.setIreIsSet(true);
@@ -32415,98 +32452,27 @@ public class Airavata {
         return false;
       }
 
-      public void start(I iface, getUserStoragePreference_args args, 
org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference>
 resultHandler) throws TException {
-        iface.getUserStoragePreference(args.authzToken, args.userId, 
args.gatewayID, args.userStorageResourceId,resultHandler);
-      }
-    }
-
-    public static class getAllUserComputeResourcePreferences<I extends 
AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, 
getAllUserComputeResourcePreferences_args, 
List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>
 {
-      public getAllUserComputeResourcePreferences() {
-        super("getAllUserComputeResourcePreferences");
-      }
-
-      public getAllUserComputeResourcePreferences_args getEmptyArgsInstance() {
-        return new getAllUserComputeResourcePreferences_args();
-      }
-
-      public 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>
 getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
-        final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new 
AsyncMethodCallback<List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>>()
 { 
-          public void 
onComplete(List<org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference>
 o) {
-            getAllUserComputeResourcePreferences_result result = new 
getAllUserComputeResourcePreferences_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;
-            getAllUserComputeResourcePreferences_result result = new 
getAllUserComputeResourcePreferences_result();
-            if (e instanceof 
org.apache.airavata.model.error.InvalidRequestException) {
-                        result.ire = 
(org.apache.airavata.model.error.InvalidRequestException) e;
-   

<TRUNCATED>

Reply via email to