airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject [4/4] airavata git commit: get rid of token id from launch experiment method and use token from compute resource preference
Date Thu, 08 Oct 2015 19:25:41 GMT
get rid of token id from launch experiment method and use token from compute resource preference


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e66c52bc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e66c52bc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e66c52bc

Branch: refs/heads/master
Commit: e66c52bc6ad88aa3fe9a80067311a179522ee03a
Parents: ec75efb
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Thu Oct 8 15:25:25 2015 -0400
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Thu Oct 8 15:25:25 2015 -0400

----------------------------------------------------------------------
 .../server/handler/AiravataServerHandler.java   |  20 +-
 .../java/org/apache/airavata/api/Airavata.java  | 291 +++++++++----------
 .../main/resources/lib/airavata/Airavata.cpp    |  48 +--
 .../src/main/resources/lib/airavata/Airavata.h  |  65 ++---
 .../lib/airavata/Airavata_server.skeleton.cpp   |  17 +-
 .../resources/lib/Airavata/API/Airavata.php     |  65 ++---
 .../lib/apache/airavata/api/Airavata-remote     |   4 +-
 .../lib/apache/airavata/api/Airavata.py         |  90 +++---
 .../client/samples/CancelExperiments.java       |   5 +-
 .../client/samples/CreateLaunchBES.java         |   3 +-
 .../client/samples/CreateLaunchExperiment.java  |   7 +-
 .../samples/CreateLaunchExperimentUS3.java      |   2 +-
 .../samples/TestCreateLaunchExperiment.java     | 274 -----------------
 .../org/apache/airavata/model/Workflow.java     |   2 +-
 .../ApplicationDeploymentDescription.java       |   2 +-
 .../appdeployment/ApplicationModule.java        |   2 +-
 .../appcatalog/appdeployment/SetEnvPaths.java   |   2 +-
 .../ApplicationInterfaceDescription.java        |   2 +-
 .../appcatalog/computeresource/BatchQueue.java  |   2 +-
 .../computeresource/CloudJobSubmission.java     |   2 +-
 .../ComputeResourceDescription.java             |   2 +-
 .../computeresource/DataMovementInterface.java  |   2 +-
 .../computeresource/GlobusJobSubmission.java    |   2 +-
 .../computeresource/GridFTPDataMovement.java    |   2 +-
 .../computeresource/JobSubmissionInterface.java |   2 +-
 .../computeresource/LOCALDataMovement.java      |   2 +-
 .../computeresource/LOCALSubmission.java        |   2 +-
 .../computeresource/ResourceJobManager.java     |   2 +-
 .../computeresource/SCPDataMovement.java        |   2 +-
 .../computeresource/SSHJobSubmission.java       |   2 +-
 .../computeresource/UnicoreDataMovement.java    |   2 +-
 .../computeresource/UnicoreJobSubmission.java   |   2 +-
 .../ComputeResourcePreference.java              |   2 +-
 .../gatewayprofile/DataStoragePreference.java   |   2 +-
 .../gatewayprofile/GatewayResourceProfile.java  |   2 +-
 .../application/io/InputDataObjectType.java     |   2 +-
 .../application/io/OutputDataObjectType.java    |   2 +-
 .../airavata/model/commons/ErrorModel.java      |   2 +-
 .../model/commons/ValidationResults.java        |   2 +-
 .../airavata/model/commons/ValidatorResult.java |   2 +-
 .../model/error/AiravataClientException.java    |   2 +-
 .../model/error/AiravataSystemException.java    |   2 +-
 .../model/error/AuthenticationException.java    |   2 +-
 .../model/error/AuthorizationException.java     |   2 +-
 .../error/ExperimentNotFoundException.java      |   2 +-
 .../model/error/InvalidRequestException.java    |   2 +-
 .../model/error/LaunchValidationException.java  |   2 +-
 .../model/error/ProjectNotFoundException.java   |   2 +-
 .../airavata/model/error/TimedOutException.java |   2 +-
 .../airavata/model/error/ValidationResults.java |   2 +-
 .../airavata/model/error/ValidatorResult.java   |   2 +-
 .../model/experiment/ExperimentModel.java       |   2 +-
 .../model/experiment/ExperimentStatistics.java  |   2 +-
 .../experiment/ExperimentSummaryModel.java      |   2 +-
 .../experiment/UserConfigurationDataModel.java  |   2 +-
 .../org/apache/airavata/model/job/JobModel.java |   2 +-
 .../event/ExperimentStatusChangeEvent.java      |   2 +-
 .../model/messaging/event/JobIdentifier.java    |   2 +-
 .../messaging/event/JobStatusChangeEvent.java   |   2 +-
 .../event/JobStatusChangeRequestEvent.java      |   2 +-
 .../airavata/model/messaging/event/Message.java |   2 +-
 .../messaging/event/ProcessIdentifier.java      |   2 +-
 .../event/ProcessStatusChangeEvent.java         |   2 +-
 .../event/ProcessStatusChangeRequestEvent.java  |   2 +-
 .../messaging/event/ProcessSubmitEvent.java     |   2 +-
 .../messaging/event/ProcessTerminateEvent.java  |   2 +-
 .../model/messaging/event/TaskIdentifier.java   |   2 +-
 .../messaging/event/TaskOutputChangeEvent.java  |   2 +-
 .../messaging/event/TaskStatusChangeEvent.java  |   2 +-
 .../event/TaskStatusChangeRequestEvent.java     |   2 +-
 .../airavata/model/process/ProcessModel.java    |   2 +-
 .../ComputationalResourceSchedulingModel.java   |   2 +-
 .../airavata/model/security/AuthzToken.java     |   2 +-
 .../airavata/model/status/ExperimentStatus.java |   2 +-
 .../apache/airavata/model/status/JobStatus.java |   2 +-
 .../airavata/model/status/ProcessStatus.java    |   2 +-
 .../airavata/model/status/TaskStatus.java       |   2 +-
 .../model/task/DataStagingTaskModel.java        |   2 +-
 .../apache/airavata/model/task/TaskModel.java   |   2 +-
 .../airavata/model/workspace/Gateway.java       |   2 +-
 .../apache/airavata/model/workspace/Group.java  |   2 +-
 .../airavata/model/workspace/Project.java       |   2 +-
 .../apache/airavata/model/workspace/User.java   |   2 +-
 .../credential-store-service/pom.xml            |  10 +-
 .../store/store/impl/db/SSHCredentialTest.java  |   8 +-
 .../orchestrator/cpi/OrchestratorService.java   | 282 +++++++++---------
 .../server/OrchestratorServerHandler.java       |  50 +---
 .../airavata-api/airavata_api.thrift            |  15 +-
 .../orchestrator.cpi.service.thrift             |   4 +-
 89 files changed, 519 insertions(+), 881 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index fccf66f..72fe13a 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -1590,14 +1590,6 @@ public class AiravataServerHandler implements Airavata.Iface {
      *
      *
      * @param airavataExperimentId   The identifier for the requested experiment. This is returned during the create experiment step.
-     * @param airavataCredStoreToken :
-     *                               A requirement to execute experiments within Airavata is to first register the targeted remote computational account
-     *                               credentials with Airavata Credential Store. The administrative API (related to credential store) will return a
-     *                               generated token associated with the registered credentials. The client has to security posses this token id and is
-     *                               required to pass it to Airavata Server for all execution requests.
-     *                               Note: At this point only the credential store token is required so the string is directly passed here. In future if
-     *                               if more security credentials are enables, then the structure ExecutionSecurityParameters should be used.
-     *                               Note: This parameter is not persisted within Airavata Registry for security reasons.
      * @return This method call does not have a return value.
      * @throws org.apache.airavata.model.error.InvalidRequestException
      *          For any incorrect forming of the request itself.
@@ -1621,7 +1613,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public void launchExperiment(AuthzToken authzToken, final String airavataExperimentId, String airavataCredStoreToken)
+    public void launchExperiment(AuthzToken authzToken, final String airavataExperimentId, String gatewayId)
             throws AuthorizationException, TException {
     	try {
             experimentCatalog = RegistryFactory.getDefaultExpCatalog();
@@ -1629,6 +1621,10 @@ public class AiravataServerHandler implements Airavata.Iface {
                 logger.error(airavataExperimentId, "Error while launching experiment, experiment {} doesn't exist.", airavataExperimentId);
                 throw new ExperimentNotFoundException("Requested experiment id " + airavataExperimentId + " does not exist in the system..");
             }
+            if (!experimentCatalog.isExist(ExperimentCatalogModelType.GATEWAY, gatewayId)) {
+                logger.error(airavataExperimentId, "Error while launching experiment, gatewayId {} doesn't exist.", gatewayId);
+                throw new ExperimentNotFoundException("Requested gateway id " + gatewayId + " does not exist in the system..");
+            }
         } catch (RegistryException e1) {
             logger.error(airavataExperimentId, "Error while instantiate the registry instance", e1);
             AiravataSystemException exception = new AiravataSystemException();
@@ -1639,7 +1635,7 @@ public class AiravataServerHandler implements Airavata.Iface {
     	ExperimentModel experiment = getExperimentInternal(airavataExperimentId);
     	OrchestratorService.Client orchestratorClient = getOrchestratorClient();
     	if (orchestratorClient.validateExperiment(airavataExperimentId)) {
-    		orchestratorClient.launchExperiment(airavataExperimentId, airavataCredStoreToken);
+    		orchestratorClient.launchExperiment(airavataExperimentId, gatewayId);
     	}else {
             logger.error(airavataExperimentId, "Couldn't identify experiment type, experiment {} is neither single application nor workflow.", airavataExperimentId);
             throw new InvalidRequestException("Experiment '" + airavataExperimentId + "' launch failed. Unable to figureout execution type for application " + experiment.getExecutionId());
@@ -1766,7 +1762,7 @@ public class AiravataServerHandler implements Airavata.Iface {
      */
     @Override
     @SecurityCheck
-    public void terminateExperiment(AuthzToken authzToken, String airavataExperimentId, String tokenId) throws InvalidRequestException,
+    public void terminateExperiment(AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws InvalidRequestException,
             ExperimentNotFoundException, AiravataClientException, AiravataSystemException, AuthorizationException, TException {
         try {
             if (!(experimentCatalog.isExist(ExperimentCatalogModelType.EXPERIMENT, airavataExperimentId))){
@@ -1774,7 +1770,7 @@ public class AiravataServerHandler implements Airavata.Iface {
                 throw new AiravataSystemException(AiravataErrorType.INTERNAL_ERROR);
             }
             Client client = getOrchestratorClient();
-            client.terminateExperiment(airavataExperimentId, tokenId);
+            client.terminateExperiment(airavataExperimentId, gatewayId);
         } catch (RegistryException e) {
             logger.error(airavataExperimentId, "Error while cancelling the experiment...", e);
             AiravataSystemException exception = new AiravataSystemException();

http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/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 413075f..28cba9b 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
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-6")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-8")
 public class Airavata {
 
   public interface Iface {
@@ -561,15 +561,6 @@ public class Airavata {
      * @param airavataExperimentId
      *    The identifier for the requested experiment. This is returned during the create experiment step.
      * 
-     * @param airavataCredStoreToken:
-     *   A requirement to execute experiments within Airavata is to first register the targeted remote computational account
-     *     credentials with Airavata Credential Store. The administrative API (related to credential store) will return a
-     *     generated token associated with the registered credentials. The client has to security posses this token id and is
-     *     required to pass it to Airavata Server for all execution requests.
-     *   Note: At this point only the credential store token is required so the string is directly passed here. In future if
-     *     if more security credentials are enables, then the structure ExecutionSecurityParameters should be used.
-     *   Note: This parameter is not persisted within Airavata Registry for security reasons.
-     * 
      * @return
      *   This method call does not have a return value.
      * 
@@ -599,9 +590,9 @@ public class Airavata {
      * 
      * @param authzToken
      * @param airavataExperimentId
-     * @param airavataCredStoreToken
+     * @param gatewayId
      */
-    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, 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.status.ExperimentStatus getExperimentStatus(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
@@ -693,9 +684,9 @@ public class Airavata {
      * 
      * @param authzToken
      * @param airavataExperimentId
-     * @param tokenId
+     * @param gatewayId
      */
-    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
+    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     /**
      * Register a Application Module.
@@ -1847,7 +1838,7 @@ public class Airavata {
 
     public void validateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void getExperimentStatus(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -1861,7 +1852,7 @@ public class Airavata {
 
     public void cloneExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String existingExperimentID, String newExperimentName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
     public void registerApplicationModule(org.apache.airavata.model.security.AuthzToken authzToken, String gatewayId, org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule applicationModule, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
@@ -3232,18 +3223,18 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "validateExperiment failed: unknown result");
     }
 
-    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String airavataCredStoreToken) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_launchExperiment(authzToken, airavataExperimentId, airavataCredStoreToken);
+      send_launchExperiment(authzToken, airavataExperimentId, gatewayId);
       recv_launchExperiment();
     }
 
-    public void send_launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String airavataCredStoreToken) throws org.apache.thrift.TException
+    public void send_launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.thrift.TException
     {
       launchExperiment_args args = new launchExperiment_args();
       args.setAuthzToken(authzToken);
       args.setAiravataExperimentId(airavataExperimentId);
-      args.setAiravataCredStoreToken(airavataCredStoreToken);
+      args.setGatewayId(gatewayId);
       sendBase("launchExperiment", args);
     }
 
@@ -3504,18 +3495,18 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "cloneExperiment failed: unknown result");
     }
 
-    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
+    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.ExperimentNotFoundException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_terminateExperiment(authzToken, airavataExperimentId, tokenId);
+      send_terminateExperiment(authzToken, airavataExperimentId, gatewayId);
       recv_terminateExperiment();
     }
 
-    public void send_terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId) throws org.apache.thrift.TException
+    public void send_terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId) throws org.apache.thrift.TException
     {
       terminateExperiment_args args = new terminateExperiment_args();
       args.setAuthzToken(authzToken);
       args.setAiravataExperimentId(airavataExperimentId);
-      args.setTokenId(tokenId);
+      args.setGatewayId(gatewayId);
       sendBase("terminateExperiment", args);
     }
 
@@ -7863,9 +7854,9 @@ public class Airavata {
       }
     }
 
-    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void launchExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      launchExperiment_call method_call = new launchExperiment_call(authzToken, airavataExperimentId, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
+      launchExperiment_call method_call = new launchExperiment_call(authzToken, airavataExperimentId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -7873,12 +7864,12 @@ public class Airavata {
     public static class launchExperiment_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String airavataExperimentId;
-      private String airavataCredStoreToken;
-      public launchExperiment_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, 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 {
+      private String gatewayId;
+      public launchExperiment_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.airavataExperimentId = airavataExperimentId;
-        this.airavataCredStoreToken = airavataCredStoreToken;
+        this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -7886,7 +7877,7 @@ public class Airavata {
         launchExperiment_args args = new launchExperiment_args();
         args.setAuthzToken(authzToken);
         args.setAiravataExperimentId(airavataExperimentId);
-        args.setAiravataCredStoreToken(airavataCredStoreToken);
+        args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -8114,9 +8105,9 @@ public class Airavata {
       }
     }
 
-    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void terminateExperiment(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      terminateExperiment_call method_call = new terminateExperiment_call(authzToken, airavataExperimentId, tokenId, resultHandler, this, ___protocolFactory, ___transport);
+      terminateExperiment_call method_call = new terminateExperiment_call(authzToken, airavataExperimentId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -8124,12 +8115,12 @@ public class Airavata {
     public static class terminateExperiment_call extends org.apache.thrift.async.TAsyncMethodCall {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private String airavataExperimentId;
-      private String tokenId;
-      public terminateExperiment_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String tokenId, 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 gatewayId;
+      public terminateExperiment_call(org.apache.airavata.model.security.AuthzToken authzToken, String airavataExperimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.airavataExperimentId = airavataExperimentId;
-        this.tokenId = tokenId;
+        this.gatewayId = gatewayId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -8137,7 +8128,7 @@ public class Airavata {
         terminateExperiment_args args = new terminateExperiment_args();
         args.setAuthzToken(authzToken);
         args.setAiravataExperimentId(airavataExperimentId);
-        args.setTokenId(tokenId);
+        args.setGatewayId(gatewayId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -12328,7 +12319,7 @@ public class Airavata {
       public launchExperiment_result getResult(I iface, launchExperiment_args args) throws org.apache.thrift.TException {
         launchExperiment_result result = new launchExperiment_result();
         try {
-          iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.airavataCredStoreToken);
+          iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.ExperimentNotFoundException enf) {
@@ -12552,7 +12543,7 @@ public class Airavata {
       public terminateExperiment_result getResult(I iface, terminateExperiment_args args) throws org.apache.thrift.TException {
         terminateExperiment_result result = new terminateExperiment_result();
         try {
-          iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.tokenId);
+          iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.ExperimentNotFoundException enf) {
@@ -17596,7 +17587,7 @@ public class Airavata {
       }
 
       public void start(I iface, launchExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
-        iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.airavataCredStoreToken,resultHandler);
+        iface.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,resultHandler);
       }
     }
 
@@ -18134,7 +18125,7 @@ public class Airavata {
       }
 
       public void start(I iface, terminateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
-        iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.tokenId,resultHandler);
+        iface.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId,resultHandler);
       }
     }
 
@@ -69196,7 +69187,7 @@ public class Airavata {
 
     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_EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataExperimentId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    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)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)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -69206,13 +69197,13 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public String airavataExperimentId; // 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_EXPERIMENT_ID((short)2, "airavataExperimentId"),
-      AIRAVATA_CRED_STORE_TOKEN((short)3, "airavataCredStoreToken");
+      GATEWAY_ID((short)3, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -69231,8 +69222,8 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // AIRAVATA_EXPERIMENT_ID
             return AIRAVATA_EXPERIMENT_ID;
-          case 3: // AIRAVATA_CRED_STORE_TOKEN
-            return AIRAVATA_CRED_STORE_TOKEN;
+          case 3: // GATEWAY_ID
+            return GATEWAY_ID;
           default:
             return null;
         }
@@ -69280,7 +69271,7 @@ 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.AIRAVATA_EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataExperimentId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.AIRAVATA_CRED_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("airavataCredStoreToken", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+      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(launchExperiment_args.class, metaDataMap);
@@ -69292,12 +69283,12 @@ public class Airavata {
     public launchExperiment_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       String airavataExperimentId,
-      String airavataCredStoreToken)
+      String gatewayId)
     {
       this();
       this.authzToken = authzToken;
       this.airavataExperimentId = airavataExperimentId;
-      this.airavataCredStoreToken = airavataCredStoreToken;
+      this.gatewayId = gatewayId;
     }
 
     /**
@@ -69310,8 +69301,8 @@ public class Airavata {
       if (other.isSetAiravataExperimentId()) {
         this.airavataExperimentId = other.airavataExperimentId;
       }
-      if (other.isSetAiravataCredStoreToken()) {
-        this.airavataCredStoreToken = other.airavataCredStoreToken;
+      if (other.isSetGatewayId()) {
+        this.gatewayId = other.gatewayId;
       }
     }
 
@@ -69323,7 +69314,7 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.airavataExperimentId = null;
-      this.airavataCredStoreToken = null;
+      this.gatewayId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -69374,27 +69365,27 @@ public class Airavata {
       }
     }
 
-    public String getAiravataCredStoreToken() {
-      return this.airavataCredStoreToken;
+    public String getGatewayId() {
+      return this.gatewayId;
     }
 
-    public launchExperiment_args setAiravataCredStoreToken(String airavataCredStoreToken) {
-      this.airavataCredStoreToken = airavataCredStoreToken;
+    public launchExperiment_args setGatewayId(String gatewayId) {
+      this.gatewayId = gatewayId;
       return this;
     }
 
-    public void unsetAiravataCredStoreToken() {
-      this.airavataCredStoreToken = null;
+    public void unsetGatewayId() {
+      this.gatewayId = null;
     }
 
-    /** Returns true if field airavataCredStoreToken is set (has been assigned a value) and false otherwise */
-    public boolean isSetAiravataCredStoreToken() {
-      return this.airavataCredStoreToken != null;
+    /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+    public boolean isSetGatewayId() {
+      return this.gatewayId != null;
     }
 
-    public void setAiravataCredStoreTokenIsSet(boolean value) {
+    public void setGatewayIdIsSet(boolean value) {
       if (!value) {
-        this.airavataCredStoreToken = null;
+        this.gatewayId = null;
       }
     }
 
@@ -69416,11 +69407,11 @@ public class Airavata {
         }
         break;
 
-      case AIRAVATA_CRED_STORE_TOKEN:
+      case GATEWAY_ID:
         if (value == null) {
-          unsetAiravataCredStoreToken();
+          unsetGatewayId();
         } else {
-          setAiravataCredStoreToken((String)value);
+          setGatewayId((String)value);
         }
         break;
 
@@ -69435,8 +69426,8 @@ public class Airavata {
       case AIRAVATA_EXPERIMENT_ID:
         return getAiravataExperimentId();
 
-      case AIRAVATA_CRED_STORE_TOKEN:
-        return getAiravataCredStoreToken();
+      case GATEWAY_ID:
+        return getGatewayId();
 
       }
       throw new IllegalStateException();
@@ -69453,8 +69444,8 @@ public class Airavata {
         return isSetAuthzToken();
       case AIRAVATA_EXPERIMENT_ID:
         return isSetAiravataExperimentId();
-      case AIRAVATA_CRED_STORE_TOKEN:
-        return isSetAiravataCredStoreToken();
+      case GATEWAY_ID:
+        return isSetGatewayId();
       }
       throw new IllegalStateException();
     }
@@ -69490,12 +69481,12 @@ 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))
+      boolean this_present_gatewayId = true && this.isSetGatewayId();
+      boolean that_present_gatewayId = true && that.isSetGatewayId();
+      if (this_present_gatewayId || that_present_gatewayId) {
+        if (!(this_present_gatewayId && that_present_gatewayId))
           return false;
-        if (!this.airavataCredStoreToken.equals(that.airavataCredStoreToken))
+        if (!this.gatewayId.equals(that.gatewayId))
           return false;
       }
 
@@ -69516,10 +69507,10 @@ public class Airavata {
       if (present_airavataExperimentId)
         list.add(airavataExperimentId);
 
-      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)
+        list.add(gatewayId);
 
       return list.hashCode();
     }
@@ -69552,12 +69543,12 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAiravataCredStoreToken()).compareTo(other.isSetAiravataCredStoreToken());
+      lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetAiravataCredStoreToken()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.airavataCredStoreToken, other.airavataCredStoreToken);
+      if (isSetGatewayId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -69598,11 +69589,11 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("airavataCredStoreToken:");
-      if (this.airavataCredStoreToken == null) {
+      sb.append("gatewayId:");
+      if (this.gatewayId == null) {
         sb.append("null");
       } else {
-        sb.append(this.airavataCredStoreToken);
+        sb.append(this.gatewayId);
       }
       first = false;
       sb.append(")");
@@ -69617,8 +69608,8 @@ public class Airavata {
       if (airavataExperimentId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'airavataExperimentId' 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());
       }
       // check for sub-struct validity
       if (authzToken != null) {
@@ -69677,10 +69668,10 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // AIRAVATA_CRED_STORE_TOKEN
+            case 3: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.airavataCredStoreToken = iprot.readString();
-                struct.setAiravataCredStoreTokenIsSet(true);
+                struct.gatewayId = iprot.readString();
+                struct.setGatewayIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -69710,9 +69701,9 @@ public class Airavata {
           oprot.writeString(struct.airavataExperimentId);
           oprot.writeFieldEnd();
         }
-        if (struct.airavataCredStoreToken != null) {
-          oprot.writeFieldBegin(AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC);
-          oprot.writeString(struct.airavataCredStoreToken);
+        if (struct.gatewayId != null) {
+          oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+          oprot.writeString(struct.gatewayId);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -69734,7 +69725,7 @@ public class Airavata {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.airavataExperimentId);
-        oprot.writeString(struct.airavataCredStoreToken);
+        oprot.writeString(struct.gatewayId);
       }
 
       @Override
@@ -69745,8 +69736,8 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.airavataExperimentId = iprot.readString();
         struct.setAiravataExperimentIdIsSet(true);
-        struct.airavataCredStoreToken = iprot.readString();
-        struct.setAiravataCredStoreTokenIsSet(true);
+        struct.gatewayId = iprot.readString();
+        struct.setGatewayIdIsSet(true);
       }
     }
 
@@ -79028,7 +79019,7 @@ public class Airavata {
 
     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_EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataExperimentId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)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)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -79038,13 +79029,13 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public String airavataExperimentId; // required
-    public String tokenId; // required
+    public String gatewayId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
       AIRAVATA_EXPERIMENT_ID((short)2, "airavataExperimentId"),
-      TOKEN_ID((short)3, "tokenId");
+      GATEWAY_ID((short)3, "gatewayId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -79063,8 +79054,8 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // AIRAVATA_EXPERIMENT_ID
             return AIRAVATA_EXPERIMENT_ID;
-          case 3: // TOKEN_ID
-            return TOKEN_ID;
+          case 3: // GATEWAY_ID
+            return GATEWAY_ID;
           default:
             return null;
         }
@@ -79112,7 +79103,7 @@ 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.AIRAVATA_EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("airavataExperimentId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.TOKEN_ID, new org.apache.thrift.meta_data.FieldMetaData("tokenId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+      tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(terminateExperiment_args.class, metaDataMap);
@@ -79124,12 +79115,12 @@ public class Airavata {
     public terminateExperiment_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       String airavataExperimentId,
-      String tokenId)
+      String gatewayId)
     {
       this();
       this.authzToken = authzToken;
       this.airavataExperimentId = airavataExperimentId;
-      this.tokenId = tokenId;
+      this.gatewayId = gatewayId;
     }
 
     /**
@@ -79142,8 +79133,8 @@ public class Airavata {
       if (other.isSetAiravataExperimentId()) {
         this.airavataExperimentId = other.airavataExperimentId;
       }
-      if (other.isSetTokenId()) {
-        this.tokenId = other.tokenId;
+      if (other.isSetGatewayId()) {
+        this.gatewayId = other.gatewayId;
       }
     }
 
@@ -79155,7 +79146,7 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.airavataExperimentId = null;
-      this.tokenId = null;
+      this.gatewayId = null;
     }
 
     public org.apache.airavata.model.security.AuthzToken getAuthzToken() {
@@ -79206,27 +79197,27 @@ public class Airavata {
       }
     }
 
-    public String getTokenId() {
-      return this.tokenId;
+    public String getGatewayId() {
+      return this.gatewayId;
     }
 
-    public terminateExperiment_args setTokenId(String tokenId) {
-      this.tokenId = tokenId;
+    public terminateExperiment_args setGatewayId(String gatewayId) {
+      this.gatewayId = gatewayId;
       return this;
     }
 
-    public void unsetTokenId() {
-      this.tokenId = null;
+    public void unsetGatewayId() {
+      this.gatewayId = null;
     }
 
-    /** Returns true if field tokenId is set (has been assigned a value) and false otherwise */
-    public boolean isSetTokenId() {
-      return this.tokenId != null;
+    /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */
+    public boolean isSetGatewayId() {
+      return this.gatewayId != null;
     }
 
-    public void setTokenIdIsSet(boolean value) {
+    public void setGatewayIdIsSet(boolean value) {
       if (!value) {
-        this.tokenId = null;
+        this.gatewayId = null;
       }
     }
 
@@ -79248,11 +79239,11 @@ public class Airavata {
         }
         break;
 
-      case TOKEN_ID:
+      case GATEWAY_ID:
         if (value == null) {
-          unsetTokenId();
+          unsetGatewayId();
         } else {
-          setTokenId((String)value);
+          setGatewayId((String)value);
         }
         break;
 
@@ -79267,8 +79258,8 @@ public class Airavata {
       case AIRAVATA_EXPERIMENT_ID:
         return getAiravataExperimentId();
 
-      case TOKEN_ID:
-        return getTokenId();
+      case GATEWAY_ID:
+        return getGatewayId();
 
       }
       throw new IllegalStateException();
@@ -79285,8 +79276,8 @@ public class Airavata {
         return isSetAuthzToken();
       case AIRAVATA_EXPERIMENT_ID:
         return isSetAiravataExperimentId();
-      case TOKEN_ID:
-        return isSetTokenId();
+      case GATEWAY_ID:
+        return isSetGatewayId();
       }
       throw new IllegalStateException();
     }
@@ -79322,12 +79313,12 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_tokenId = true && this.isSetTokenId();
-      boolean that_present_tokenId = true && that.isSetTokenId();
-      if (this_present_tokenId || that_present_tokenId) {
-        if (!(this_present_tokenId && that_present_tokenId))
+      boolean this_present_gatewayId = true && this.isSetGatewayId();
+      boolean that_present_gatewayId = true && that.isSetGatewayId();
+      if (this_present_gatewayId || that_present_gatewayId) {
+        if (!(this_present_gatewayId && that_present_gatewayId))
           return false;
-        if (!this.tokenId.equals(that.tokenId))
+        if (!this.gatewayId.equals(that.gatewayId))
           return false;
       }
 
@@ -79348,10 +79339,10 @@ public class Airavata {
       if (present_airavataExperimentId)
         list.add(airavataExperimentId);
 
-      boolean present_tokenId = true && (isSetTokenId());
-      list.add(present_tokenId);
-      if (present_tokenId)
-        list.add(tokenId);
+      boolean present_gatewayId = true && (isSetGatewayId());
+      list.add(present_gatewayId);
+      if (present_gatewayId)
+        list.add(gatewayId);
 
       return list.hashCode();
     }
@@ -79384,12 +79375,12 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetTokenId()).compareTo(other.isSetTokenId());
+      lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetTokenId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tokenId, other.tokenId);
+      if (isSetGatewayId()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -79430,11 +79421,11 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("tokenId:");
-      if (this.tokenId == null) {
+      sb.append("gatewayId:");
+      if (this.gatewayId == null) {
         sb.append("null");
       } else {
-        sb.append(this.tokenId);
+        sb.append(this.gatewayId);
       }
       first = false;
       sb.append(")");
@@ -79503,10 +79494,10 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // TOKEN_ID
+            case 3: // GATEWAY_ID
               if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-                struct.tokenId = iprot.readString();
-                struct.setTokenIdIsSet(true);
+                struct.gatewayId = iprot.readString();
+                struct.setGatewayIdIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -79536,9 +79527,9 @@ public class Airavata {
           oprot.writeString(struct.airavataExperimentId);
           oprot.writeFieldEnd();
         }
-        if (struct.tokenId != null) {
-          oprot.writeFieldBegin(TOKEN_ID_FIELD_DESC);
-          oprot.writeString(struct.tokenId);
+        if (struct.gatewayId != null) {
+          oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC);
+          oprot.writeString(struct.gatewayId);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -79563,15 +79554,15 @@ public class Airavata {
         if (struct.isSetAiravataExperimentId()) {
           optionals.set(0);
         }
-        if (struct.isSetTokenId()) {
+        if (struct.isSetGatewayId()) {
           optionals.set(1);
         }
         oprot.writeBitSet(optionals, 2);
         if (struct.isSetAiravataExperimentId()) {
           oprot.writeString(struct.airavataExperimentId);
         }
-        if (struct.isSetTokenId()) {
-          oprot.writeString(struct.tokenId);
+        if (struct.isSetGatewayId()) {
+          oprot.writeString(struct.gatewayId);
         }
       }
 
@@ -79587,8 +79578,8 @@ public class Airavata {
           struct.setAiravataExperimentIdIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.tokenId = iprot.readString();
-          struct.setTokenIdIsSet(true);
+          struct.gatewayId = iprot.readString();
+          struct.setGatewayIdIsSet(true);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
index 875474e..693e7bb 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.cpp
@@ -10526,7 +10526,7 @@ uint32_t Airavata_launchExperiment_args::read(::apache::thrift::protocol::TProto
 
   bool isset_authzToken = false;
   bool isset_airavataExperimentId = false;
-  bool isset_airavataCredStoreToken = false;
+  bool isset_gatewayId = false;
 
   while (true)
   {
@@ -10554,8 +10554,8 @@ uint32_t Airavata_launchExperiment_args::read(::apache::thrift::protocol::TProto
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->airavataCredStoreToken);
-          isset_airavataCredStoreToken = true;
+          xfer += iprot->readString(this->gatewayId);
+          isset_gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -10573,7 +10573,7 @@ uint32_t Airavata_launchExperiment_args::read(::apache::thrift::protocol::TProto
     throw TProtocolException(TProtocolException::INVALID_DATA);
   if (!isset_airavataExperimentId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_airavataCredStoreToken)
+  if (!isset_gatewayId)
     throw TProtocolException(TProtocolException::INVALID_DATA);
   return xfer;
 }
@@ -10591,8 +10591,8 @@ uint32_t Airavata_launchExperiment_args::write(::apache::thrift::protocol::TProt
   xfer += oprot->writeString(this->airavataExperimentId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->airavataCredStoreToken);
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -10619,8 +10619,8 @@ uint32_t Airavata_launchExperiment_pargs::write(::apache::thrift::protocol::TPro
   xfer += oprot->writeString((*(this->airavataExperimentId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("airavataCredStoreToken", ::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->airavataCredStoreToken)));
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -12855,8 +12855,8 @@ uint32_t Airavata_terminateExperiment_args::read(::apache::thrift::protocol::TPr
         break;
       case 3:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->tokenId);
-          this->__isset.tokenId = true;
+          xfer += iprot->readString(this->gatewayId);
+          this->__isset.gatewayId = true;
         } else {
           xfer += iprot->skip(ftype);
         }
@@ -12888,8 +12888,8 @@ uint32_t Airavata_terminateExperiment_args::write(::apache::thrift::protocol::TP
   xfer += oprot->writeString(this->airavataExperimentId);
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("tokenId", ::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString(this->tokenId);
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString(this->gatewayId);
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -12916,8 +12916,8 @@ uint32_t Airavata_terminateExperiment_pargs::write(::apache::thrift::protocol::T
   xfer += oprot->writeString((*(this->airavataExperimentId)));
   xfer += oprot->writeFieldEnd();
 
-  xfer += oprot->writeFieldBegin("tokenId", ::apache::thrift::protocol::T_STRING, 3);
-  xfer += oprot->writeString((*(this->tokenId)));
+  xfer += oprot->writeFieldBegin("gatewayId", ::apache::thrift::protocol::T_STRING, 3);
+  xfer += oprot->writeString((*(this->gatewayId)));
   xfer += oprot->writeFieldEnd();
 
   xfer += oprot->writeFieldStop();
@@ -40758,13 +40758,13 @@ bool AiravataClient::recv_validateExperiment()
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "validateExperiment failed: unknown result");
 }
 
-void AiravataClient::launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken)
+void AiravataClient::launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
 {
-  send_launchExperiment(authzToken, airavataExperimentId, airavataCredStoreToken);
+  send_launchExperiment(authzToken, airavataExperimentId, gatewayId);
   recv_launchExperiment();
 }
 
-void AiravataClient::send_launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken)
+void AiravataClient::send_launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("launchExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -40772,7 +40772,7 @@ void AiravataClient::send_launchExperiment(const  ::apache::airavata::model::sec
   Airavata_launchExperiment_pargs args;
   args.authzToken = &authzToken;
   args.airavataExperimentId = &airavataExperimentId;
-  args.airavataCredStoreToken = &airavataCredStoreToken;
+  args.gatewayId = &gatewayId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -41273,13 +41273,13 @@ void AiravataClient::recv_cloneExperiment(std::string& _return)
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "cloneExperiment failed: unknown result");
 }
 
-void AiravataClient::terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId)
+void AiravataClient::terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
 {
-  send_terminateExperiment(authzToken, airavataExperimentId, tokenId);
+  send_terminateExperiment(authzToken, airavataExperimentId, gatewayId);
   recv_terminateExperiment();
 }
 
-void AiravataClient::send_terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId)
+void AiravataClient::send_terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("terminateExperiment", ::apache::thrift::protocol::T_CALL, cseqid);
@@ -41287,7 +41287,7 @@ void AiravataClient::send_terminateExperiment(const  ::apache::airavata::model::
   Airavata_terminateExperiment_pargs args;
   args.authzToken = &authzToken;
   args.airavataExperimentId = &airavataExperimentId;
-  args.tokenId = &tokenId;
+  args.gatewayId = &gatewayId;
   args.write(oprot_);
 
   oprot_->writeMessageEnd();
@@ -49421,7 +49421,7 @@ void AiravataProcessor::process_launchExperiment(int32_t seqid, ::apache::thrift
 
   Airavata_launchExperiment_result result;
   try {
-    iface_->launchExperiment(args.authzToken, args.airavataExperimentId, args.airavataCredStoreToken);
+    iface_->launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;
@@ -49903,7 +49903,7 @@ void AiravataProcessor::process_terminateExperiment(int32_t seqid, ::apache::thr
 
   Airavata_terminateExperiment_result result;
   try {
-    iface_->terminateExperiment(args.authzToken, args.airavataExperimentId, args.tokenId);
+    iface_->terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId);
   } catch ( ::apache::airavata::api::error::InvalidRequestException &ire) {
     result.ire = ire;
     result.__isset.ire = true;

http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
index 9923cc0..652e83b 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata.h
@@ -527,15 +527,6 @@ class AiravataIf {
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @param airavataCredStoreToken:
-   *   A requirement to execute experiments within Airavata is to first register the targeted remote computational account
-   *     credentials with Airavata Credential Store. The administrative API (related to credential store) will return a
-   *     generated token associated with the registered credentials. The client has to security posses this token id and is
-   *     required to pass it to Airavata Server for all execution requests.
-   *   Note: At this point only the credential store token is required so the string is directly passed here. In future if
-   *     if more security credentials are enables, then the structure ExecutionSecurityParameters should be used.
-   *   Note: This parameter is not persisted within Airavata Registry for security reasons.
-   * 
    * @return
    *   This method call does not have a return value.
    * 
@@ -565,9 +556,9 @@ class AiravataIf {
    * 
    * @param authzToken
    * @param airavataExperimentId
-   * @param airavataCredStoreToken
+   * @param gatewayId
    */
-  virtual void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken) = 0;
+  virtual void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) = 0;
   virtual void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
   virtual void getExperimentOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
   virtual void getIntermediateOutputs(std::vector< ::apache::airavata::model::application::io::OutputDataObjectType> & _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) = 0;
@@ -654,9 +645,9 @@ class AiravataIf {
    * 
    * @param authzToken
    * @param airavataExperimentId
-   * @param tokenId
+   * @param gatewayId
    */
-  virtual void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId) = 0;
+  virtual void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) = 0;
 
   /**
    * Register a Application Module.
@@ -1846,7 +1837,7 @@ class AiravataNull : virtual public AiravataIf {
     bool _return = false;
     return _return;
   }
-  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */, const std::string& /* airavataCredStoreToken */) {
+  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */, const std::string& /* gatewayId */) {
     return;
   }
   void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */) {
@@ -1867,7 +1858,7 @@ class AiravataNull : virtual public AiravataIf {
   void cloneExperiment(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* existingExperimentID */, const std::string& /* newExperimentName */) {
     return;
   }
-  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */, const std::string& /* tokenId */) {
+  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* airavataExperimentId */, const std::string& /* gatewayId */) {
     return;
   }
   void registerApplicationModule(std::string& /* _return */, const  ::apache::airavata::model::security::AuthzToken& /* authzToken */, const std::string& /* gatewayId */, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& /* applicationModule */) {
@@ -7278,19 +7269,19 @@ class Airavata_launchExperiment_args {
 
   Airavata_launchExperiment_args(const Airavata_launchExperiment_args&);
   Airavata_launchExperiment_args& operator=(const Airavata_launchExperiment_args&);
-  Airavata_launchExperiment_args() : airavataExperimentId(), airavataCredStoreToken() {
+  Airavata_launchExperiment_args() : airavataExperimentId(), gatewayId() {
   }
 
   virtual ~Airavata_launchExperiment_args() throw();
    ::apache::airavata::model::security::AuthzToken authzToken;
   std::string airavataExperimentId;
-  std::string airavataCredStoreToken;
+  std::string gatewayId;
 
   void __set_authzToken(const  ::apache::airavata::model::security::AuthzToken& val);
 
   void __set_airavataExperimentId(const std::string& val);
 
-  void __set_airavataCredStoreToken(const std::string& val);
+  void __set_gatewayId(const std::string& val);
 
   bool operator == (const Airavata_launchExperiment_args & rhs) const
   {
@@ -7298,7 +7289,7 @@ class Airavata_launchExperiment_args {
       return false;
     if (!(airavataExperimentId == rhs.airavataExperimentId))
       return false;
-    if (!(airavataCredStoreToken == rhs.airavataCredStoreToken))
+    if (!(gatewayId == rhs.gatewayId))
       return false;
     return true;
   }
@@ -7325,7 +7316,7 @@ class Airavata_launchExperiment_pargs {
   virtual ~Airavata_launchExperiment_pargs() throw();
   const  ::apache::airavata::model::security::AuthzToken* authzToken;
   const std::string* airavataExperimentId;
-  const std::string* airavataCredStoreToken;
+  const std::string* gatewayId;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -8401,9 +8392,9 @@ class Airavata_cloneExperiment_presult {
 };
 
 typedef struct _Airavata_terminateExperiment_args__isset {
-  _Airavata_terminateExperiment_args__isset() : airavataExperimentId(false), tokenId(false) {}
+  _Airavata_terminateExperiment_args__isset() : airavataExperimentId(false), gatewayId(false) {}
   bool airavataExperimentId :1;
-  bool tokenId :1;
+  bool gatewayId :1;
 } _Airavata_terminateExperiment_args__isset;
 
 class Airavata_terminateExperiment_args {
@@ -8414,13 +8405,13 @@ class Airavata_terminateExperiment_args {
 
   Airavata_terminateExperiment_args(const Airavata_terminateExperiment_args&);
   Airavata_terminateExperiment_args& operator=(const Airavata_terminateExperiment_args&);
-  Airavata_terminateExperiment_args() : airavataExperimentId(), tokenId() {
+  Airavata_terminateExperiment_args() : airavataExperimentId(), gatewayId() {
   }
 
   virtual ~Airavata_terminateExperiment_args() throw();
    ::apache::airavata::model::security::AuthzToken authzToken;
   std::string airavataExperimentId;
-  std::string tokenId;
+  std::string gatewayId;
 
   _Airavata_terminateExperiment_args__isset __isset;
 
@@ -8428,7 +8419,7 @@ class Airavata_terminateExperiment_args {
 
   void __set_airavataExperimentId(const std::string& val);
 
-  void __set_tokenId(const std::string& val);
+  void __set_gatewayId(const std::string& val);
 
   bool operator == (const Airavata_terminateExperiment_args & rhs) const
   {
@@ -8436,7 +8427,7 @@ class Airavata_terminateExperiment_args {
       return false;
     if (!(airavataExperimentId == rhs.airavataExperimentId))
       return false;
-    if (!(tokenId == rhs.tokenId))
+    if (!(gatewayId == rhs.gatewayId))
       return false;
     return true;
   }
@@ -8463,7 +8454,7 @@ class Airavata_terminateExperiment_pargs {
   virtual ~Airavata_terminateExperiment_pargs() throw();
   const  ::apache::airavata::model::security::AuthzToken* authzToken;
   const std::string* airavataExperimentId;
-  const std::string* tokenId;
+  const std::string* gatewayId;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
@@ -21598,8 +21589,8 @@ class AiravataClient : virtual public AiravataIf {
   bool validateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
   void send_validateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
   bool recv_validateExperiment();
-  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken);
-  void send_launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken);
+  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId);
+  void send_launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId);
   void recv_launchExperiment();
   void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
   void send_getExperimentStatus(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId);
@@ -21619,8 +21610,8 @@ class AiravataClient : virtual public AiravataIf {
   void cloneExperiment(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingExperimentID, const std::string& newExperimentName);
   void send_cloneExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& existingExperimentID, const std::string& newExperimentName);
   void recv_cloneExperiment(std::string& _return);
-  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId);
-  void send_terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId);
+  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId);
+  void send_terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId);
   void recv_terminateExperiment();
   void registerApplicationModule(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule);
   void send_registerApplicationModule(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule);
@@ -22474,13 +22465,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return ifaces_[i]->validateExperiment(authzToken, airavataExperimentId);
   }
 
-  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken) {
+  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->launchExperiment(authzToken, airavataExperimentId, airavataCredStoreToken);
+      ifaces_[i]->launchExperiment(authzToken, airavataExperimentId, gatewayId);
     }
-    ifaces_[i]->launchExperiment(authzToken, airavataExperimentId, airavataCredStoreToken);
+    ifaces_[i]->launchExperiment(authzToken, airavataExperimentId, gatewayId);
   }
 
   void getExperimentStatus( ::apache::airavata::model::status::ExperimentStatus& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId) {
@@ -22543,13 +22534,13 @@ class AiravataMultiface : virtual public AiravataIf {
     return;
   }
 
-  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId) {
+  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) {
     size_t sz = ifaces_.size();
     size_t i = 0;
     for (; i < (sz - 1); ++i) {
-      ifaces_[i]->terminateExperiment(authzToken, airavataExperimentId, tokenId);
+      ifaces_[i]->terminateExperiment(authzToken, airavataExperimentId, gatewayId);
     }
-    ifaces_[i]->terminateExperiment(authzToken, airavataExperimentId, tokenId);
+    ifaces_[i]->terminateExperiment(authzToken, airavataExperimentId, gatewayId);
   }
 
   void registerApplicationModule(std::string& _return, const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& gatewayId, const  ::apache::airavata::model::appcatalog::appdeployment::ApplicationModule& applicationModule) {

http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
index 155b8ef..3d0b299 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/Airavata_server.skeleton.cpp
@@ -640,15 +640,6 @@ class AiravataHandler : virtual public AiravataIf {
    * @param airavataExperimentId
    *    The identifier for the requested experiment. This is returned during the create experiment step.
    * 
-   * @param airavataCredStoreToken:
-   *   A requirement to execute experiments within Airavata is to first register the targeted remote computational account
-   *     credentials with Airavata Credential Store. The administrative API (related to credential store) will return a
-   *     generated token associated with the registered credentials. The client has to security posses this token id and is
-   *     required to pass it to Airavata Server for all execution requests.
-   *   Note: At this point only the credential store token is required so the string is directly passed here. In future if
-   *     if more security credentials are enables, then the structure ExecutionSecurityParameters should be used.
-   *   Note: This parameter is not persisted within Airavata Registry for security reasons.
-   * 
    * @return
    *   This method call does not have a return value.
    * 
@@ -678,9 +669,9 @@ class AiravataHandler : virtual public AiravataIf {
    * 
    * @param authzToken
    * @param airavataExperimentId
-   * @param airavataCredStoreToken
+   * @param gatewayId
    */
-  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& airavataCredStoreToken) {
+  void launchExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) {
     // Your implementation goes here
     printf("launchExperiment\n");
   }
@@ -793,9 +784,9 @@ class AiravataHandler : virtual public AiravataIf {
    * 
    * @param authzToken
    * @param airavataExperimentId
-   * @param tokenId
+   * @param gatewayId
    */
-  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& tokenId) {
+  void terminateExperiment(const  ::apache::airavata::model::security::AuthzToken& authzToken, const std::string& airavataExperimentId, const std::string& gatewayId) {
     // Your implementation goes here
     printf("terminateExperiment\n");
   }


Mime
View raw message