You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/10/08 21:25:38 UTC
[1/4] airavata git commit: get rid of token id from launch experiment
method and use token from compute resource preference
Repository: airavata
Updated Branches:
refs/heads/master ec75efb0e -> e66c52bc6
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
index 298e12d..e1e67d1 100644
--- a/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
+++ b/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
@@ -50,7 +50,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-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-10-8")
public class OrchestratorService {
public interface Iface {
@@ -71,9 +71,9 @@ public class OrchestratorService {
* *
*
* @param experimentId
- * @param airavataCredStoreToken
+ * @param gatewayId
*/
- public boolean launchExperiment(String experimentId, String airavataCredStoreToken) throws org.apache.thrift.TException;
+ public boolean launchExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException;
/**
* * In order to run single applications users should create an associating
@@ -114,9 +114,9 @@ public class OrchestratorService {
* *
*
* @param experimentId
- * @param tokenId
+ * @param gatewayId
*/
- public boolean terminateExperiment(String experimentId, String tokenId) throws org.apache.thrift.TException;
+ public boolean terminateExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException;
}
@@ -124,13 +124,13 @@ public class OrchestratorService {
public void getOrchestratorCPIVersion(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void launchExperiment(String experimentId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void launchExperiment(String experimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void launchProcess(String processId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
public void validateExperiment(String experimentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void terminateExperiment(String experimentId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void terminateExperiment(String experimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -176,17 +176,17 @@ public class OrchestratorService {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOrchestratorCPIVersion failed: unknown result");
}
- public boolean launchExperiment(String experimentId, String airavataCredStoreToken) throws org.apache.thrift.TException
+ public boolean launchExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException
{
- send_launchExperiment(experimentId, airavataCredStoreToken);
+ send_launchExperiment(experimentId, gatewayId);
return recv_launchExperiment();
}
- public void send_launchExperiment(String experimentId, String airavataCredStoreToken) throws org.apache.thrift.TException
+ public void send_launchExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException
{
launchExperiment_args args = new launchExperiment_args();
args.setExperimentId(experimentId);
- args.setAiravataCredStoreToken(airavataCredStoreToken);
+ args.setGatewayId(gatewayId);
sendBase("launchExperiment", args);
}
@@ -250,17 +250,17 @@ public class OrchestratorService {
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "validateExperiment failed: unknown result");
}
- public boolean terminateExperiment(String experimentId, String tokenId) throws org.apache.thrift.TException
+ public boolean terminateExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException
{
- send_terminateExperiment(experimentId, tokenId);
+ send_terminateExperiment(experimentId, gatewayId);
return recv_terminateExperiment();
}
- public void send_terminateExperiment(String experimentId, String tokenId) throws org.apache.thrift.TException
+ public void send_terminateExperiment(String experimentId, String gatewayId) throws org.apache.thrift.TException
{
terminateExperiment_args args = new terminateExperiment_args();
args.setExperimentId(experimentId);
- args.setTokenId(tokenId);
+ args.setGatewayId(gatewayId);
sendBase("terminateExperiment", args);
}
@@ -321,27 +321,27 @@ public class OrchestratorService {
}
}
- public void launchExperiment(String experimentId, String airavataCredStoreToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void launchExperiment(String experimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- launchExperiment_call method_call = new launchExperiment_call(experimentId, airavataCredStoreToken, resultHandler, this, ___protocolFactory, ___transport);
+ launchExperiment_call method_call = new launchExperiment_call(experimentId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class launchExperiment_call extends org.apache.thrift.async.TAsyncMethodCall {
private String experimentId;
- private String airavataCredStoreToken;
- public launchExperiment_call(String experimentId, 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(String experimentId, 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.experimentId = experimentId;
- this.airavataCredStoreToken = airavataCredStoreToken;
+ this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("launchExperiment", org.apache.thrift.protocol.TMessageType.CALL, 0));
launchExperiment_args args = new launchExperiment_args();
args.setExperimentId(experimentId);
- args.setAiravataCredStoreToken(airavataCredStoreToken);
+ args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -423,27 +423,27 @@ public class OrchestratorService {
}
}
- public void terminateExperiment(String experimentId, String tokenId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void terminateExperiment(String experimentId, String gatewayId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- terminateExperiment_call method_call = new terminateExperiment_call(experimentId, tokenId, resultHandler, this, ___protocolFactory, ___transport);
+ terminateExperiment_call method_call = new terminateExperiment_call(experimentId, gatewayId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class terminateExperiment_call extends org.apache.thrift.async.TAsyncMethodCall {
private String experimentId;
- private String tokenId;
- public terminateExperiment_call(String experimentId, 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(String experimentId, 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.experimentId = experimentId;
- this.tokenId = tokenId;
+ this.gatewayId = gatewayId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("terminateExperiment", org.apache.thrift.protocol.TMessageType.CALL, 0));
terminateExperiment_args args = new terminateExperiment_args();
args.setExperimentId(experimentId);
- args.setTokenId(tokenId);
+ args.setGatewayId(gatewayId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -514,7 +514,7 @@ public class OrchestratorService {
public launchExperiment_result getResult(I iface, launchExperiment_args args) throws org.apache.thrift.TException {
launchExperiment_result result = new launchExperiment_result();
- result.success = iface.launchExperiment(args.experimentId, args.airavataCredStoreToken);
+ result.success = iface.launchExperiment(args.experimentId, args.gatewayId);
result.setSuccessIsSet(true);
return result;
}
@@ -581,7 +581,7 @@ public class OrchestratorService {
public terminateExperiment_result getResult(I iface, terminateExperiment_args args) throws org.apache.thrift.TException {
terminateExperiment_result result = new terminateExperiment_result();
- result.success = iface.terminateExperiment(args.experimentId, args.tokenId);
+ result.success = iface.terminateExperiment(args.experimentId, args.gatewayId);
result.setSuccessIsSet(true);
return result;
}
@@ -707,7 +707,7 @@ public class OrchestratorService {
}
public void start(I iface, launchExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.launchExperiment(args.experimentId, args.airavataCredStoreToken,resultHandler);
+ iface.launchExperiment(args.experimentId, args.gatewayId,resultHandler);
}
}
@@ -869,7 +869,7 @@ public class OrchestratorService {
}
public void start(I iface, terminateExperiment_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
- iface.terminateExperiment(args.experimentId, args.tokenId,resultHandler);
+ iface.terminateExperiment(args.experimentId, args.gatewayId,resultHandler);
}
}
@@ -1488,7 +1488,7 @@ public class OrchestratorService {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("launchExperiment_args");
private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField AIRAVATA_CRED_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("airavataCredStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -1497,12 +1497,12 @@ public class OrchestratorService {
}
public String experimentId; // 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 {
EXPERIMENT_ID((short)1, "experimentId"),
- AIRAVATA_CRED_STORE_TOKEN((short)2, "airavataCredStoreToken");
+ GATEWAY_ID((short)2, "gatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -1519,8 +1519,8 @@ public class OrchestratorService {
switch(fieldId) {
case 1: // EXPERIMENT_ID
return EXPERIMENT_ID;
- case 2: // AIRAVATA_CRED_STORE_TOKEN
- return AIRAVATA_CRED_STORE_TOKEN;
+ case 2: // GATEWAY_ID
+ return GATEWAY_ID;
default:
return null;
}
@@ -1566,7 +1566,7 @@ public class OrchestratorService {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", 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);
@@ -1577,11 +1577,11 @@ public class OrchestratorService {
public launchExperiment_args(
String experimentId,
- String airavataCredStoreToken)
+ String gatewayId)
{
this();
this.experimentId = experimentId;
- this.airavataCredStoreToken = airavataCredStoreToken;
+ this.gatewayId = gatewayId;
}
/**
@@ -1591,8 +1591,8 @@ public class OrchestratorService {
if (other.isSetExperimentId()) {
this.experimentId = other.experimentId;
}
- if (other.isSetAiravataCredStoreToken()) {
- this.airavataCredStoreToken = other.airavataCredStoreToken;
+ if (other.isSetGatewayId()) {
+ this.gatewayId = other.gatewayId;
}
}
@@ -1603,7 +1603,7 @@ public class OrchestratorService {
@Override
public void clear() {
this.experimentId = null;
- this.airavataCredStoreToken = null;
+ this.gatewayId = null;
}
public String getExperimentId() {
@@ -1630,27 +1630,27 @@ public class OrchestratorService {
}
}
- 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;
}
}
@@ -1664,11 +1664,11 @@ public class OrchestratorService {
}
break;
- case AIRAVATA_CRED_STORE_TOKEN:
+ case GATEWAY_ID:
if (value == null) {
- unsetAiravataCredStoreToken();
+ unsetGatewayId();
} else {
- setAiravataCredStoreToken((String)value);
+ setGatewayId((String)value);
}
break;
@@ -1680,8 +1680,8 @@ public class OrchestratorService {
case EXPERIMENT_ID:
return getExperimentId();
- case AIRAVATA_CRED_STORE_TOKEN:
- return getAiravataCredStoreToken();
+ case GATEWAY_ID:
+ return getGatewayId();
}
throw new IllegalStateException();
@@ -1696,8 +1696,8 @@ public class OrchestratorService {
switch (field) {
case EXPERIMENT_ID:
return isSetExperimentId();
- case AIRAVATA_CRED_STORE_TOKEN:
- return isSetAiravataCredStoreToken();
+ case GATEWAY_ID:
+ return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -1724,12 +1724,12 @@ public class OrchestratorService {
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;
}
@@ -1745,10 +1745,10 @@ public class OrchestratorService {
if (present_experimentId)
list.add(experimentId);
- 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();
}
@@ -1771,12 +1771,12 @@ public class OrchestratorService {
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;
}
@@ -1809,11 +1809,11 @@ public class OrchestratorService {
}
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(")");
@@ -1825,8 +1825,8 @@ public class OrchestratorService {
if (experimentId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' 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
}
@@ -1873,10 +1873,10 @@ public class OrchestratorService {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // AIRAVATA_CRED_STORE_TOKEN
+ case 2: // 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);
}
@@ -1901,9 +1901,9 @@ public class OrchestratorService {
oprot.writeString(struct.experimentId);
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();
@@ -1924,7 +1924,7 @@ public class OrchestratorService {
public void write(org.apache.thrift.protocol.TProtocol prot, launchExperiment_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
- oprot.writeString(struct.airavataCredStoreToken);
+ oprot.writeString(struct.gatewayId);
}
@Override
@@ -1932,8 +1932,8 @@ public class OrchestratorService {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
- struct.airavataCredStoreToken = iprot.readString();
- struct.setAiravataCredStoreTokenIsSet(true);
+ struct.gatewayId = iprot.readString();
+ struct.setGatewayIdIsSet(true);
}
}
@@ -3942,7 +3942,7 @@ public class OrchestratorService {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("terminateExperiment_args");
private static final org.apache.thrift.protocol.TField EXPERIMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("experimentId", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField TOKEN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tokenId", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -3951,12 +3951,12 @@ public class OrchestratorService {
}
public String experimentId; // 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 {
EXPERIMENT_ID((short)1, "experimentId"),
- TOKEN_ID((short)2, "tokenId");
+ GATEWAY_ID((short)2, "gatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -3973,8 +3973,8 @@ public class OrchestratorService {
switch(fieldId) {
case 1: // EXPERIMENT_ID
return EXPERIMENT_ID;
- case 2: // TOKEN_ID
- return TOKEN_ID;
+ case 2: // GATEWAY_ID
+ return GATEWAY_ID;
default:
return null;
}
@@ -4020,7 +4020,7 @@ public class OrchestratorService {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
tmpMap.put(_Fields.EXPERIMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("experimentId", org.apache.thrift.TFieldRequirementType.REQUIRED,
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.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(terminateExperiment_args.class, metaDataMap);
@@ -4031,11 +4031,11 @@ public class OrchestratorService {
public terminateExperiment_args(
String experimentId,
- String tokenId)
+ String gatewayId)
{
this();
this.experimentId = experimentId;
- this.tokenId = tokenId;
+ this.gatewayId = gatewayId;
}
/**
@@ -4045,8 +4045,8 @@ public class OrchestratorService {
if (other.isSetExperimentId()) {
this.experimentId = other.experimentId;
}
- if (other.isSetTokenId()) {
- this.tokenId = other.tokenId;
+ if (other.isSetGatewayId()) {
+ this.gatewayId = other.gatewayId;
}
}
@@ -4057,7 +4057,7 @@ public class OrchestratorService {
@Override
public void clear() {
this.experimentId = null;
- this.tokenId = null;
+ this.gatewayId = null;
}
public String getExperimentId() {
@@ -4084,27 +4084,27 @@ public class OrchestratorService {
}
}
- 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;
}
}
@@ -4118,11 +4118,11 @@ public class OrchestratorService {
}
break;
- case TOKEN_ID:
+ case GATEWAY_ID:
if (value == null) {
- unsetTokenId();
+ unsetGatewayId();
} else {
- setTokenId((String)value);
+ setGatewayId((String)value);
}
break;
@@ -4134,8 +4134,8 @@ public class OrchestratorService {
case EXPERIMENT_ID:
return getExperimentId();
- case TOKEN_ID:
- return getTokenId();
+ case GATEWAY_ID:
+ return getGatewayId();
}
throw new IllegalStateException();
@@ -4150,8 +4150,8 @@ public class OrchestratorService {
switch (field) {
case EXPERIMENT_ID:
return isSetExperimentId();
- case TOKEN_ID:
- return isSetTokenId();
+ case GATEWAY_ID:
+ return isSetGatewayId();
}
throw new IllegalStateException();
}
@@ -4178,12 +4178,12 @@ public class OrchestratorService {
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;
}
@@ -4199,10 +4199,10 @@ public class OrchestratorService {
if (present_experimentId)
list.add(experimentId);
- 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();
}
@@ -4225,12 +4225,12 @@ public class OrchestratorService {
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;
}
@@ -4263,11 +4263,11 @@ public class OrchestratorService {
}
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(")");
@@ -4279,8 +4279,8 @@ public class OrchestratorService {
if (experimentId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'experimentId' was not present! Struct: " + toString());
}
- if (tokenId == null) {
- throw new org.apache.thrift.protocol.TProtocolException("Required field 'tokenId' 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
}
@@ -4327,10 +4327,10 @@ public class OrchestratorService {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // TOKEN_ID
+ case 2: // 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);
}
@@ -4355,9 +4355,9 @@ public class OrchestratorService {
oprot.writeString(struct.experimentId);
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();
@@ -4378,7 +4378,7 @@ public class OrchestratorService {
public void write(org.apache.thrift.protocol.TProtocol prot, terminateExperiment_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.experimentId);
- oprot.writeString(struct.tokenId);
+ oprot.writeString(struct.gatewayId);
}
@Override
@@ -4386,8 +4386,8 @@ public class OrchestratorService {
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.experimentId = iprot.readString();
struct.setExperimentIdIsSet(true);
- 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/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 5862b7a..4aeebaa 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -39,6 +39,7 @@ import org.apache.airavata.messaging.core.impl.RabbitMQStatusConsumer;
import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription;
import org.apache.airavata.model.appcatalog.appinterface.ApplicationInterfaceDescription;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
+import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference;
import org.apache.airavata.model.error.LaunchValidationException;
import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.experiment.ExperimentType;
@@ -132,7 +133,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
*
* @param experimentId
*/
- public boolean launchExperiment(String experimentId, String token) throws TException {
+ public boolean launchExperiment(String experimentId, String gatewayId) throws TException {
ExperimentModel experiment = null;
try {
experiment = (ExperimentModel) experimentCatalog.get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
@@ -140,21 +141,13 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
log.error(experimentId, "Error retrieving the Experiment by the given experimentID: {} ", experimentId);
return false;
}
- CredentialReader credentialReader = GFacUtils.getCredentialReader();
- String gatewayId = null;
- if (credentialReader != null) {
- try {
- gatewayId = credentialReader.getGatewayID(token);
- } catch (Exception e) {
- log.error(e.getLocalizedMessage());
- }
- }
- if (gatewayId == null) {
- gatewayId = ServerSettings.getDefaultUserGateway();
- log.info("Couldn't identify the gateway Id using the credential token, Use default gateway Id");
-// throw new AiravataException("Couldn't identify the gateway Id using the credential token");
+ ComputeResourcePreference computeResourcePreference = appCatalog.getGatewayProfile().getComputeResourcePreference(gatewayId, experiment.getUserConfigurationData().getComputationalResourceScheduling().getResourceHostId());
+ String token = computeResourcePreference.getResourceSpecificCredentialStoreToken();
+ if (token == null || token.isEmpty()){
+ log.error("You have not configured resource specific credential store token. Please provide the correct token at compute resource preference.");
+ return false;
}
- String experimentNodePath = GFacUtils.getExperimentNodePath (experimentId);
+ String experimentNodePath = GFacUtils.getExperimentNodePath (experimentId);
ZKPaths.mkdirs(curatorClient.getZookeeperClient().getZooKeeper(), experimentNodePath);
String experimentCancelNode = ZKPaths.makePath(experimentNodePath, ZkConstants.ZOOKEEPER_CANCEL_LISTENER_NODE);
ZKPaths.mkdirs(curatorClient.getZookeeperClient().getZooKeeper(), experimentCancelNode);
@@ -170,7 +163,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
MessageContext messageContext = new MessageContext(event, MessageType.EXPERIMENT, messageId, gatewayId);
messageContext.setUpdatedTime(AiravataUtils.getCurrentTimestamp());
publisher.publish(messageContext);
- OrchestratorServerThreadPoolExecutor.getCachedThreadPool().execute(new SingleAppExperimentRunner(experimentId, token));
+ OrchestratorServerThreadPoolExecutor.getCachedThreadPool().execute(new SingleAppExperimentRunner(experimentId, token, gatewayId));
} else if (executionType == ExperimentType.WORKFLOW) {
//its a workflow execution experiment
log.debug(experimentId, "Launching workflow experiment {}.", experimentId);
@@ -213,7 +206,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
return false;
}
- /**
+ /**
* This can be used to cancel a running experiment and store the status to
* terminated in registry
*
@@ -221,10 +214,10 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
* @return
* @throws TException
*/
- public boolean terminateExperiment(String experimentId, String tokenId) throws TException {
+ public boolean terminateExperiment(String experimentId, String gatewayId) throws TException {
log.info(experimentId, "Experiment: {} is cancelling !!!!!", experimentId);
try {
- return validateStatesAndCancel(experimentId, tokenId);
+ return validateStatesAndCancel(experimentId, gatewayId);
} catch (Exception e) {
log.error("expId : " + experimentId + " :- Error while cancelling experiment", e);
return false;
@@ -316,7 +309,7 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
return selectedModuleId;
}
- private boolean validateStatesAndCancel(String experimentId, String tokenId) throws Exception {
+ private boolean validateStatesAndCancel(String experimentId, String gatewayId) throws Exception {
String expCancelNodePath = ZKPaths.makePath(ZKPaths.makePath(ZkConstants.ZOOKEEPER_EXPERIMENT_NODE,
experimentId), ZkConstants.ZOOKEEPER_CANCEL_LISTENER_NODE);
Stat stat = curatorClient.checkExists().forPath(expCancelNodePath);
@@ -353,9 +346,11 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
String experimentId;
String airavataCredStoreToken;
- public SingleAppExperimentRunner(String experimentId,String airavataCredStoreToken){
+ String gatewayId;
+ public SingleAppExperimentRunner(String experimentId,String airavataCredStoreToken, String gatewayId){
this.experimentId = experimentId;
this.airavataCredStoreToken = airavataCredStoreToken;
+ this.gatewayId = gatewayId;
}
@Override
public void run() {
@@ -370,19 +365,6 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
try {
List<String> processIds = experimentCatalog.getIds(ExperimentCatalogModelType.PROCESS, AbstractExpCatResource.ProcessConstants.EXPERIMENT_ID, experimentId);
for (String processId : processIds) {
- String gatewayId = null;
- CredentialReader credentialReader = GFacUtils.getCredentialReader();
- if (credentialReader != null) {
- try {
- gatewayId = credentialReader.getGatewayID(airavataCredStoreToken);
- } catch (Exception e) {
- log.error(e.getLocalizedMessage());
- }
- }
- if (gatewayId == null || gatewayId.isEmpty()) {
- gatewayId = ServerSettings.getDefaultUserGateway();
- }
-
launchProcess(processId, airavataCredStoreToken);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/thrift-interface-descriptions/airavata-api/airavata_api.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/airavata_api.thrift b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
index 5da95cc..3ad051f 100644
--- a/thrift-interface-descriptions/airavata-api/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-api/airavata_api.thrift
@@ -667,15 +667,6 @@ service 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.
*
@@ -704,8 +695,8 @@ service Airavata {
*
*/
void launchExperiment(1: required security_model.AuthzToken authzToken,
- 2: required string airavataExperimentId
- 3: required string airavataCredStoreToken)
+ 2: required string airavataExperimentId,
+ 3: required string gatewayId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.ExperimentNotFoundException enf,
3: airavata_errors.AiravataClientException ace,
@@ -838,7 +829,7 @@ service Airavata {
*/
void terminateExperiment(1: required security_model.AuthzToken authzToken,
2: string airavataExperimentId,
- 3: string tokenId)
+ 3: string gatewayId)
throws (1: airavata_errors.InvalidRequestException ire,
2: airavata_errors.ExperimentNotFoundException enf,
3: airavata_errors.AiravataClientException ace,
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/thrift-interface-descriptions/orchestrator-cpi/orchestrator.cpi.service.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/orchestrator-cpi/orchestrator.cpi.service.thrift b/thrift-interface-descriptions/orchestrator-cpi/orchestrator.cpi.service.thrift
index b24de58..257f391 100644
--- a/thrift-interface-descriptions/orchestrator-cpi/orchestrator.cpi.service.thrift
+++ b/thrift-interface-descriptions/orchestrator-cpi/orchestrator.cpi.service.thrift
@@ -42,7 +42,7 @@ service OrchestratorService {
* @return sucess/failure
*
**/
- bool launchExperiment (1: required string experimentId, 2: required string airavataCredStoreToken),
+ bool launchExperiment (1: required string experimentId, 2: required string gatewayId),
/**
* In order to run single applications users should create an associating
@@ -74,5 +74,5 @@ service OrchestratorService {
* @return sucess/failure
*
**/
- bool terminateExperiment (1: required string experimentId, 2: required string tokenId)
+ bool terminateExperiment (1: required string experimentId, 2: required string gatewayId)
}
[3/4] airavata git commit: get rid of token id from launch experiment
method and use token from compute resource preference
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
index f274185..77ad7cd 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/API/Airavata.php
@@ -704,15 +704,6 @@ interface 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.
*
@@ -742,14 +733,14 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
- * @param string $airavataCredStoreToken
+ * @param string $gatewayId
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $airavataCredStoreToken);
+ public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
/**
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
@@ -901,14 +892,14 @@ interface AiravataIf {
*
* @param \Airavata\Model\Security\AuthzToken $authzToken
* @param string $airavataExperimentId
- * @param string $tokenId
+ * @param string $gatewayId
* @throws \Airavata\API\Error\InvalidRequestException
* @throws \Airavata\API\Error\ExperimentNotFoundException
* @throws \Airavata\API\Error\AiravataClientException
* @throws \Airavata\API\Error\AiravataSystemException
* @throws \Airavata\API\Error\AuthorizationException
*/
- public function terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $tokenId);
+ public function terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId);
/**
* Register a Application Module.
*
@@ -4701,18 +4692,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("validateExperiment failed: unknown result");
}
- public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $airavataCredStoreToken)
+ public function launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
- $this->send_launchExperiment($authzToken, $airavataExperimentId, $airavataCredStoreToken);
+ $this->send_launchExperiment($authzToken, $airavataExperimentId, $gatewayId);
$this->recv_launchExperiment();
}
- public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $airavataCredStoreToken)
+ public function send_launchExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
$args = new \Airavata\API\Airavata_launchExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->airavataCredStoreToken = $airavataCredStoreToken;
+ $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -5169,18 +5160,18 @@ class AiravataClient implements \Airavata\API\AiravataIf {
throw new \Exception("cloneExperiment failed: unknown result");
}
- public function terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $tokenId)
+ public function terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
- $this->send_terminateExperiment($authzToken, $airavataExperimentId, $tokenId);
+ $this->send_terminateExperiment($authzToken, $airavataExperimentId, $gatewayId);
$this->recv_terminateExperiment();
}
- public function send_terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $tokenId)
+ public function send_terminateExperiment(\Airavata\Model\Security\AuthzToken $authzToken, $airavataExperimentId, $gatewayId)
{
$args = new \Airavata\API\Airavata_terminateExperiment_args();
$args->authzToken = $authzToken;
$args->airavataExperimentId = $airavataExperimentId;
- $args->tokenId = $tokenId;
+ $args->gatewayId = $gatewayId;
$bin_accel = ($this->output_ instanceof TBinaryProtocolAccelerated) && function_exists('thrift_protocol_write_binary');
if ($bin_accel)
{
@@ -20955,7 +20946,7 @@ class Airavata_launchExperiment_args {
/**
* @var string
*/
- public $airavataCredStoreToken = null;
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -20970,7 +20961,7 @@ class Airavata_launchExperiment_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'airavataCredStoreToken',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
);
@@ -20982,8 +20973,8 @@ class Airavata_launchExperiment_args {
if (isset($vals['airavataExperimentId'])) {
$this->airavataExperimentId = $vals['airavataExperimentId'];
}
- if (isset($vals['airavataCredStoreToken'])) {
- $this->airavataCredStoreToken = $vals['airavataCredStoreToken'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
}
}
@@ -21024,7 +21015,7 @@ class Airavata_launchExperiment_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->airavataCredStoreToken);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -21055,9 +21046,9 @@ class Airavata_launchExperiment_args {
$xfer += $output->writeString($this->airavataExperimentId);
$xfer += $output->writeFieldEnd();
}
- if ($this->airavataCredStoreToken !== null) {
- $xfer += $output->writeFieldBegin('airavataCredStoreToken', TType::STRING, 3);
- $xfer += $output->writeString($this->airavataCredStoreToken);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
@@ -23224,7 +23215,7 @@ class Airavata_terminateExperiment_args {
/**
* @var string
*/
- public $tokenId = null;
+ public $gatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -23239,7 +23230,7 @@ class Airavata_terminateExperiment_args {
'type' => TType::STRING,
),
3 => array(
- 'var' => 'tokenId',
+ 'var' => 'gatewayId',
'type' => TType::STRING,
),
);
@@ -23251,8 +23242,8 @@ class Airavata_terminateExperiment_args {
if (isset($vals['airavataExperimentId'])) {
$this->airavataExperimentId = $vals['airavataExperimentId'];
}
- if (isset($vals['tokenId'])) {
- $this->tokenId = $vals['tokenId'];
+ if (isset($vals['gatewayId'])) {
+ $this->gatewayId = $vals['gatewayId'];
}
}
}
@@ -23293,7 +23284,7 @@ class Airavata_terminateExperiment_args {
break;
case 3:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->tokenId);
+ $xfer += $input->readString($this->gatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -23324,9 +23315,9 @@ class Airavata_terminateExperiment_args {
$xfer += $output->writeString($this->airavataExperimentId);
$xfer += $output->writeFieldEnd();
}
- if ($this->tokenId !== null) {
- $xfer += $output->writeFieldBegin('tokenId', TType::STRING, 3);
- $xfer += $output->writeString($this->tokenId);
+ if ($this->gatewayId !== null) {
+ $xfer += $output->writeFieldBegin('gatewayId', TType::STRING, 3);
+ $xfer += $output->writeString($this->gatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
index 0acd73a..2b1b742 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata-remote
@@ -56,14 +56,14 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print(' void updateExperimentConfiguration(AuthzToken authzToken, string airavataExperimentId, UserConfigurationDataModel userConfiguration)')
print(' void updateResourceScheduleing(AuthzToken authzToken, string airavataExperimentId, ComputationalResourceSchedulingModel resourceScheduling)')
print(' bool validateExperiment(AuthzToken authzToken, string airavataExperimentId)')
- print(' void launchExperiment(AuthzToken authzToken, string airavataExperimentId, string airavataCredStoreToken)')
+ print(' void launchExperiment(AuthzToken authzToken, string airavataExperimentId, string gatewayId)')
print(' ExperimentStatus getExperimentStatus(AuthzToken authzToken, string airavataExperimentId)')
print(' getExperimentOutputs(AuthzToken authzToken, string airavataExperimentId)')
print(' getIntermediateOutputs(AuthzToken authzToken, string airavataExperimentId)')
print(' getJobStatuses(AuthzToken authzToken, string airavataExperimentId)')
print(' getJobDetails(AuthzToken authzToken, string airavataExperimentId)')
print(' string cloneExperiment(AuthzToken authzToken, string existingExperimentID, string newExperimentName)')
- print(' void terminateExperiment(AuthzToken authzToken, string airavataExperimentId, string tokenId)')
+ print(' void terminateExperiment(AuthzToken authzToken, string airavataExperimentId, string gatewayId)')
print(' string registerApplicationModule(AuthzToken authzToken, string gatewayId, ApplicationModule applicationModule)')
print(' ApplicationModule getApplicationModule(AuthzToken authzToken, string appModuleId)')
print(' bool updateApplicationModule(AuthzToken authzToken, string appModuleId, ApplicationModule applicationModule)')
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
index 6cd34d3..45e39d5 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/api/Airavata.py
@@ -627,7 +627,7 @@ class Iface:
"""
pass
- def launchExperiment(self, authzToken, airavataExperimentId, airavataCredStoreToken):
+ def launchExperiment(self, authzToken, airavataExperimentId, gatewayId):
"""
Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
notifications and intermediate and output data will be subsequently available for this experiment.
@@ -635,15 +635,6 @@ class 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.
@@ -674,7 +665,7 @@ class Iface:
Parameters:
- authzToken
- airavataExperimentId
- - airavataCredStoreToken
+ - gatewayId
"""
pass
@@ -765,7 +756,7 @@ class Iface:
"""
pass
- def terminateExperiment(self, authzToken, airavataExperimentId, tokenId):
+ def terminateExperiment(self, authzToken, airavataExperimentId, gatewayId):
"""
Terminate a running experiment.
@@ -802,7 +793,7 @@ class Iface:
Parameters:
- authzToken
- airavataExperimentId
- - tokenId
+ - gatewayId
"""
pass
@@ -3865,7 +3856,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "validateExperiment failed: unknown result");
- def launchExperiment(self, authzToken, airavataExperimentId, airavataCredStoreToken):
+ def launchExperiment(self, authzToken, airavataExperimentId, gatewayId):
"""
Launch a previously created and configured experiment. Airavata Server will then start processing the request and appropriate
notifications and intermediate and output data will be subsequently available for this experiment.
@@ -3873,15 +3864,6 @@ class Client(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.
@@ -3912,17 +3894,17 @@ class Client(Iface):
Parameters:
- authzToken
- airavataExperimentId
- - airavataCredStoreToken
+ - gatewayId
"""
- self.send_launchExperiment(authzToken, airavataExperimentId, airavataCredStoreToken)
+ self.send_launchExperiment(authzToken, airavataExperimentId, gatewayId)
self.recv_launchExperiment()
- def send_launchExperiment(self, authzToken, airavataExperimentId, airavataCredStoreToken):
+ def send_launchExperiment(self, authzToken, airavataExperimentId, gatewayId):
self._oprot.writeMessageBegin('launchExperiment', TMessageType.CALL, self._seqid)
args = launchExperiment_args()
args.authzToken = authzToken
args.airavataExperimentId = airavataExperimentId
- args.airavataCredStoreToken = airavataCredStoreToken
+ args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -4248,7 +4230,7 @@ class Client(Iface):
raise result.ae
raise TApplicationException(TApplicationException.MISSING_RESULT, "cloneExperiment failed: unknown result");
- def terminateExperiment(self, authzToken, airavataExperimentId, tokenId):
+ def terminateExperiment(self, authzToken, airavataExperimentId, gatewayId):
"""
Terminate a running experiment.
@@ -4285,17 +4267,17 @@ class Client(Iface):
Parameters:
- authzToken
- airavataExperimentId
- - tokenId
+ - gatewayId
"""
- self.send_terminateExperiment(authzToken, airavataExperimentId, tokenId)
+ self.send_terminateExperiment(authzToken, airavataExperimentId, gatewayId)
self.recv_terminateExperiment()
- def send_terminateExperiment(self, authzToken, airavataExperimentId, tokenId):
+ def send_terminateExperiment(self, authzToken, airavataExperimentId, gatewayId):
self._oprot.writeMessageBegin('terminateExperiment', TMessageType.CALL, self._seqid)
args = terminateExperiment_args()
args.authzToken = authzToken
args.airavataExperimentId = airavataExperimentId
- args.tokenId = tokenId
+ args.gatewayId = gatewayId
args.write(self._oprot)
self._oprot.writeMessageEnd()
self._oprot.trans.flush()
@@ -9246,7 +9228,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = launchExperiment_result()
try:
- self._handler.launchExperiment(args.authzToken, args.airavataExperimentId, args.airavataCredStoreToken)
+ self._handler.launchExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.ExperimentNotFoundException, enf:
@@ -9400,7 +9382,7 @@ class Processor(Iface, TProcessor):
iprot.readMessageEnd()
result = terminateExperiment_result()
try:
- self._handler.terminateExperiment(args.authzToken, args.airavataExperimentId, args.tokenId)
+ self._handler.terminateExperiment(args.authzToken, args.airavataExperimentId, args.gatewayId)
except apache.airavata.api.error.ttypes.InvalidRequestException, ire:
result.ire = ire
except apache.airavata.api.error.ttypes.ExperimentNotFoundException, enf:
@@ -18380,20 +18362,20 @@ class launchExperiment_args:
Attributes:
- authzToken
- airavataExperimentId
- - airavataCredStoreToken
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
- (3, TType.STRING, 'airavataCredStoreToken', None, None, ), # 3
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None, airavataCredStoreToken=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None, gatewayId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
- self.airavataCredStoreToken = airavataCredStoreToken
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -18417,7 +18399,7 @@ class launchExperiment_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.airavataCredStoreToken = iprot.readString();
+ self.gatewayId = iprot.readString();
else:
iprot.skip(ftype)
else:
@@ -18438,9 +18420,9 @@ class launchExperiment_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.airavataCredStoreToken is not None:
- oprot.writeFieldBegin('airavataCredStoreToken', TType.STRING, 3)
- oprot.writeString(self.airavataCredStoreToken)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -18450,8 +18432,8 @@ class launchExperiment_args:
raise TProtocol.TProtocolException(message='Required field authzToken is unset!')
if self.airavataExperimentId is None:
raise TProtocol.TProtocolException(message='Required field airavataExperimentId is unset!')
- if self.airavataCredStoreToken is None:
- raise TProtocol.TProtocolException(message='Required field airavataCredStoreToken is unset!')
+ if self.gatewayId is None:
+ raise TProtocol.TProtocolException(message='Required field gatewayId is unset!')
return
@@ -18459,7 +18441,7 @@ class launchExperiment_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.airavataCredStoreToken)
+ value = (value * 31) ^ hash(self.gatewayId)
return value
def __repr__(self):
@@ -19952,20 +19934,20 @@ class terminateExperiment_args:
Attributes:
- authzToken
- airavataExperimentId
- - tokenId
+ - gatewayId
"""
thrift_spec = (
None, # 0
(1, TType.STRUCT, 'authzToken', (apache.airavata.model.security.ttypes.AuthzToken, apache.airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ), # 1
(2, TType.STRING, 'airavataExperimentId', None, None, ), # 2
- (3, TType.STRING, 'tokenId', None, None, ), # 3
+ (3, TType.STRING, 'gatewayId', None, None, ), # 3
)
- def __init__(self, authzToken=None, airavataExperimentId=None, tokenId=None,):
+ def __init__(self, authzToken=None, airavataExperimentId=None, gatewayId=None,):
self.authzToken = authzToken
self.airavataExperimentId = airavataExperimentId
- self.tokenId = tokenId
+ self.gatewayId = gatewayId
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -19989,7 +19971,7 @@ class terminateExperiment_args:
iprot.skip(ftype)
elif fid == 3:
if ftype == TType.STRING:
- self.tokenId = iprot.readString();
+ self.gatewayId = iprot.readString();
else:
iprot.skip(ftype)
else:
@@ -20010,9 +19992,9 @@ class terminateExperiment_args:
oprot.writeFieldBegin('airavataExperimentId', TType.STRING, 2)
oprot.writeString(self.airavataExperimentId)
oprot.writeFieldEnd()
- if self.tokenId is not None:
- oprot.writeFieldBegin('tokenId', TType.STRING, 3)
- oprot.writeString(self.tokenId)
+ if self.gatewayId is not None:
+ oprot.writeFieldBegin('gatewayId', TType.STRING, 3)
+ oprot.writeString(self.gatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -20027,7 +20009,7 @@ class terminateExperiment_args:
value = 17
value = (value * 31) ^ hash(self.authzToken)
value = (value * 31) ^ hash(self.airavataExperimentId)
- value = (value * 31) ^ hash(self.tokenId)
+ value = (value * 31) ^ hash(self.gatewayId)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
index 45856df..be287d5 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CancelExperiments.java
@@ -38,7 +38,7 @@ public class CancelExperiments {
public static final int THRIFT_SERVER_PORT = 8930;
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
private static final String DEFAULT_USER = "default.registry.user";
- private static final String DEFAULT_GATEWAY = "default.registry.gateway";
+ private static final String DEFAULT_GATEWAY = "default";
private static Airavata.Client client;
@@ -60,8 +60,7 @@ public class CancelExperiments {
public static void terminateExperiment(Airavata.Client client, String expId)
throws TException {
try {
- String tokenId = "-0bbb-403b-a88a-42b6dbe198e9";
- client.terminateExperiment(new AuthzToken(""), expId, tokenId);
+ client.terminateExperiment(new AuthzToken(""), expId, DEFAULT_GATEWAY);
} catch (ExperimentNotFoundException e) {
logger.error("Error occured while launching the experiment...", e.getMessage());
throw new ExperimentNotFoundException(e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
index 42314f2..406715a 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java
@@ -162,8 +162,7 @@ public class CreateLaunchBES {
public static void launchExperiment(Airavata.Client client, String expId)
throws TException {
try {
- String tokenId = "-0bbb-403b-a88a-42b6dbe198e9";
- client.launchExperiment(new AuthzToken(""), expId, tokenId);
+ client.launchExperiment(new AuthzToken(""), expId, DEFAULT_GATEWAY);
} catch (ExperimentNotFoundException e) {
logger.error("Error occured while launching the experiment...", e.getMessage());
throw new ExperimentNotFoundException(e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index be06fbd..212c191 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -53,7 +53,7 @@ import java.util.Map;
public class CreateLaunchExperiment {
//FIXME: Read from a config file
- public static final String THRIFT_SERVER_HOST = "gw56.iu.xsede.org";
+ public static final String THRIFT_SERVER_HOST = "gw119.iu.xsede.org";
public static final int THRIFT_SERVER_PORT = 8930;
// public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
// public static final int THRIFT_SERVER_PORT = 9930;
@@ -98,7 +98,7 @@ public class CreateLaunchExperiment {
// System.out.println(jobId);
// System.out.println(jobStatus.getJobState().toString());
// }
- createAndLaunchExp();
+// createAndLaunchExp();
}
private static String fsdResourceId;
@@ -1452,8 +1452,7 @@ public class CreateLaunchExperiment {
public static void launchExperiment(Airavata.Client client, String expId)
throws TException {
try {
- String tokenId = "47507a08-1579-4883-be03-3c8e3b7da061";
- client.launchExperiment(new AuthzToken(""), expId, tokenId);
+ client.launchExperiment(new AuthzToken(""), expId, DEFAULT_GATEWAY);
} catch (ExperimentNotFoundException e) {
logger.error("Error occured while launching the experiment...", e.getMessage());
throw new ExperimentNotFoundException(e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 56049d4..84c7db2 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -536,7 +536,7 @@ public class CreateLaunchExperimentUS3 {
public static void launchExperiment (Airavata.Client client, String expId)
throws TException{
try {
- client.launchExperiment(new AuthzToken(""), expId, "testToken");
+ client.launchExperiment(new AuthzToken(""), expId, DEFAULT_GATEWAY);
} catch (ExperimentNotFoundException e) {
logger.error("Error occured while launching the experiment...", e.getMessage());
throw new ExperimentNotFoundException(e);
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
deleted file mode 100644
index 18cb2ab..0000000
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.client.samples;
-
-import org.apache.airavata.api.Airavata;
-import org.apache.airavata.api.client.AiravataClientFactory;
-import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule;
-import org.apache.airavata.model.error.AiravataClientException;
-import org.apache.airavata.model.error.AiravataSystemException;
-import org.apache.airavata.model.error.InvalidRequestException;
-import org.apache.airavata.model.security.AuthzToken;
-import org.apache.airavata.model.experiment.*;
-import org.apache.thrift.TException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
-
-public class TestCreateLaunchExperiment {
-
- /*//FIXME: Read from a config file
- public static final String THRIFT_SERVER_HOST = "localhost";
- public static final int THRIFT_SERVER_PORT = 8930;
- private final static Logger logger = LoggerFactory.getLogger(TestCreateLaunchExperiment.class);
- private static final String DEFAULT_USER = "default.registry.user";
- private static final String DEFAULT_GATEWAY = "default.registry.gateway";
-
- public static void main(String[] args) {
- try {
- final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
- System.out.println("API version is " + airavata.getAPIVersion(null));
- Calendar cal1 = Calendar.getInstance();
- cal1.add(Calendar.DATE, -1);
- Long from = cal1.getTimeInMillis();
- Calendar cal2 = Calendar.getInstance();
- Long to = cal2.getTimeInMillis();
-
- List<JobDetails> jobDetailsList = getJobDetails(airavata, "echoExperiment_14a83cee-5611-4e37-b90c-4444d28359b6");
- for (JobDetails job : jobDetailsList){
-// System.out.println(experimentSummary.getExperimentID());
- System.out.println("job description : " + job.getJobDescription());
-// System.out.println(experimentSummary.getExperimentStatus().getExperimentState().toString());
- }
-
- List<DataTransferDetails> dataTransferDetails = getDataTransferDetails(airavata, "echoExperiment_6c32f45d-7755-4d1f-9915-69b9a6972770");
- for (DataTransferDetails dt : dataTransferDetails){
-// System.out.println(experimentSummary.getExperimentID());
- System.out.println("data transfer description " + dt.getTransferDescription());
-// System.out.println(experimentSummary.getExperimentStatus().getExperimentState().toString());
- }
-// getAllComputeResources(airavata);
-// getAppModule(airavata, "amber_c476de64-ca5c-415a-94e9-b77fbe67b806");
-// getAVailableComputeResourcesForApp(airavata, "Amber_0cecdf39-1ce2-4d98-bc76-87447e10fd4d");
-// for (int i = 0; i < 10 ; i++){
-// long time = System.currentTimeMillis();
-// List<ExperimentSummary> experiments = getExperimentsForApplication(airavata, "ultrascan", "US3Application");
-// int count = i+1;
-// System.out.println("Experiment count : " + experiments.size());
-// System.out.println("iteration : " + String.valueOf(count));
-// System.out.println(System.currentTimeMillis() - time);
-// }
-// List<Experiment> experiments = getExperimentsForUser(airavata, "admin");
-// System.out.println("Experiment count : " + experiments.size());
-// for (Experiment ex : experiments){
-// System.out.println(ex.getExperimentID());
-// }
-
- } catch (Exception e) {
- logger.error("Error while connecting with server", e.getMessage());
- e.printStackTrace();
- }
- }
-
-// private static AiravataAPI getAiravataAPI() throws AiravataAPIInvocationException, ApplicationSettingsException {
-// AiravataAPI airavataAPI;
-// try {
-// String sysUser = ClientSettings.getSetting(DEFAULT_USER);
-// String gateway = ClientSettings.getSetting(DEFAULT_GATEWAY);
-// airavataAPI = AiravataAPIFactory.getAPI(gateway, sysUser);
-// } catch (AiravataAPIInvocationException e) {
-// logger.error("Unable to create airavata API", e.getMessage());
-// throw new AiravataAPIInvocationException(e);
-// } catch (ApplicationSettingsException e) {
-// logger.error("Unable to create airavata API", e.getMessage());
-// throw new ApplicationSettingsException(e.getMessage());
-// }
-// return airavataAPI;
-// }
-
- public static List<Experiment> getExperimentsForUser (Airavata.Client client, String user){
- try {
- return client.getAllUserExperiments(DEFAULT_GATEWAY, user);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<JobDetails> getJobDetails (Airavata.Client client, String experimentId){
- try {
- return client.getJobDetails(experimentId);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<DataTransferDetails> getDataTransferDetails (Airavata.Client client, String experimentId){
- try {
- return client.getDataTransferDetails(experimentId);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummary> getExperimentsForApplication (Airavata.Client client, String user, String application){
- try {
- return client.searchExperimentsByApplication(DEFAULT_GATEWAY, user, application);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummary> searchExperimentsByStatus (Airavata.Client client, String user, ExperimentState experimentState){
- try {
- return client.searchExperimentsByStatus(DEFAULT_GATEWAY, user, experimentState);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
- public static List<ExperimentSummary> searchExperimentsByDate (Airavata.Client client, String user, Long from, Long to){
- try {
- return client.searchExperimentsByCreationTime(DEFAULT_GATEWAY, user, from, to);
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e){
- e.printStackTrace();
- }
- return null;
- }
-
-
- public static void getAllComputeResources (Airavata.Client client){
- try {
- Map<String, String> allComputeResourceNames = client.getAllComputeResourceNames();
- for (String id : allComputeResourceNames.keySet()){
- System.out.println("resource id : " + id);
- System.out.println("resource name : " + allComputeResourceNames.get(id));
- }
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e) {
- e.printStackTrace();
- }
- }
-
- public static void getAllAppInterfaces (Airavata.Client client){
- try {
- Map<String, String> allApps = client.getAllApplicationInterfaceNames(DEFAULT_GATEWAY);
- for (String id : allApps.keySet()){
- System.out.println("app id : " + id);
- System.out.println("app name : " + allApps.get(id));
- }
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e) {
- e.printStackTrace();
- }
- }
-
- public static void getAppModule (Airavata.Client client, String moduleId){
- try {
- ApplicationModule applicationModule = client.getApplicationModule(moduleId);
- if (applicationModule != null){
- System.out.println("module name :" + applicationModule.getAppModuleName());
- System.out.println("module version :" + applicationModule.getAppModuleVersion());
- }
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e) {
- e.printStackTrace();
- }
- }
-
-
- public static void getAVailableComputeResourcesForApp (Airavata.Client client, String applicationName){
- try {
- Map<String, String> resources = client.getAvailableAppInterfaceComputeResources(applicationName);
- for (Map.Entry<String, String> entry : resources.entrySet()) {
- System.out.println("resource id : = " + entry.getKey() + ", resource name : = " + entry.getValue());
- }
- } catch (AiravataSystemException e) {
- e.printStackTrace();
- } catch (InvalidRequestException e) {
- e.printStackTrace();
- } catch (AiravataClientException e) {
- e.printStackTrace();
- }catch (TException e) {
- e.printStackTrace();
- }
- }*/
-
-}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
index b287aa2..ea5d885 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/Workflow.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 Workflow implements org.apache.thrift.TBase<Workflow, Workflow._Fields>, java.io.Serializable, Cloneable, Comparable<Workflow> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Workflow");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
index cc7f867..48cdd97 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* assigns to the environment variable "NAME" the value
*
*/
-@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 ApplicationDeploymentDescription implements org.apache.thrift.TBase<ApplicationDeploymentDescription, ApplicationDeploymentDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationDeploymentDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationDeploymentDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
index 3d919d4..0f75a60 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationModule.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* Descriprion of the Module
*
*/
-@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 ApplicationModule implements org.apache.thrift.TBase<ApplicationModule, ApplicationModule._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationModule> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationModule");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
index 0e851f7..389fef6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/SetEnvPaths.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* value:
* Value of the environment variable to set
*/
-@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 SetEnvPaths implements org.apache.thrift.TBase<SetEnvPaths, SetEnvPaths._Fields>, java.io.Serializable, Cloneable, Comparable<SetEnvPaths> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SetEnvPaths");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
index f8d96b8..c4c430c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* Outputs generated from the application
*
*/
-@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 ApplicationInterfaceDescription implements org.apache.thrift.TBase<ApplicationInterfaceDescription, ApplicationInterfaceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ApplicationInterfaceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ApplicationInterfaceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
index e10c8c5..fae00ef 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/BatchQueue.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* maxRunTime:
* Maximum allowed run time in hours.
*/
-@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 BatchQueue implements org.apache.thrift.TBase<BatchQueue, BatchQueue._Fields>, java.io.Serializable, Cloneable, Comparable<BatchQueue> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchQueue");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
index 02ec8a7..bf5b7f3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/CloudJobSubmission.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@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 CloudJobSubmission implements org.apache.thrift.TBase<CloudJobSubmission, CloudJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<CloudJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CloudJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
index f915e51..d674b66 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
* Map of file systems type and the path.
*
*/
-@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 ComputeResourceDescription implements org.apache.thrift.TBase<ComputeResourceDescription, ComputeResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
index 58b5978..7a34833 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/DataMovementInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@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 DataMovementInterface implements org.apache.thrift.TBase<DataMovementInterface, DataMovementInterface._Fields>, java.io.Serializable, Cloneable, Comparable<DataMovementInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataMovementInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
index c120a12..4c1896b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GlobusJobSubmission.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 GlobusJobSubmission implements org.apache.thrift.TBase<GlobusJobSubmission, GlobusJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<GlobusJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobusJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
index 6a97127..f519455 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/GridFTPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@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 GridFTPDataMovement implements org.apache.thrift.TBase<GridFTPDataMovement, GridFTPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<GridFTPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GridFTPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
index 2aaac97..13dde3a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/JobSubmissionInterface.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* Lower the numerical number, higher the priority
*
*/
-@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 JobSubmissionInterface implements org.apache.thrift.TBase<JobSubmissionInterface, JobSubmissionInterface._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionInterface> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionInterface");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
index 785db4d..9a3f04d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-defualt port needs to used, specify it.
*/
-@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 LOCALDataMovement implements org.apache.thrift.TBase<LOCALDataMovement, LOCALDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
index 3a7089f..ee3e12f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/LOCALSubmission.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@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 LOCALSubmission implements org.apache.thrift.TBase<LOCALSubmission, LOCALSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<LOCALSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LOCALSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
index d4e4367..ff62884 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
* An enumeration of commonly used manager commands.
*
*/
-@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 ResourceJobManager implements org.apache.thrift.TBase<ResourceJobManager, ResourceJobManager._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceJobManager> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceJobManager");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
index 51a0e58..472a40d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SCPDataMovement.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* sshPort:
* If a non-default port needs to used, specify it.
*/
-@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 SCPDataMovement implements org.apache.thrift.TBase<SCPDataMovement, SCPDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<SCPDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SCPDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
index ad4dfbf..a069e1d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/SSHJobSubmission.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* the same. Example: *@*.example.com or *@example.com
*
*/
-@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 SSHJobSubmission implements org.apache.thrift.TBase<SSHJobSubmission, SSHJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<SSHJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
index 696cc40..e530c4c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreDataMovement.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
* unicoreEndPointURL:
* unicoreGateway End Point. The provider will query this service to fetch required service end points.
*/
-@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 UnicoreDataMovement implements org.apache.thrift.TBase<UnicoreDataMovement, UnicoreDataMovement._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreDataMovement> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreDataMovement");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
index 4e3a0da..6f58364 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/UnicoreJobSubmission.java
@@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory;
* authenticationMode
* The authenticationMode defines the way certificate is fetched.
*/
-@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 UnicoreJobSubmission implements org.apache.thrift.TBase<UnicoreJobSubmission, UnicoreJobSubmission._Fields>, java.io.Serializable, Cloneable, Comparable<UnicoreJobSubmission> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnicoreJobSubmission");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
index b3f5be4..7b23098 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/ComputeResourcePreference.java
@@ -85,7 +85,7 @@ import org.slf4j.LoggerFactory;
* default credential store.
*
*/
-@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 ComputeResourcePreference implements org.apache.thrift.TBase<ComputeResourcePreference, ComputeResourcePreference._Fields>, java.io.Serializable, Cloneable, Comparable<ComputeResourcePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputeResourcePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
index da0a8d1..20d831c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/DataStoragePreference.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 DataStoragePreference implements org.apache.thrift.TBase<DataStoragePreference, DataStoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<DataStoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
index 5d41389..1e0befa 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/GatewayResourceProfile.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* List of resource preferences for each of the registered compute resources.
*
*/
-@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 GatewayResourceProfile implements org.apache.thrift.TBase<GatewayResourceProfile, GatewayResourceProfile._Fields>, java.io.Serializable, Cloneable, Comparable<GatewayResourceProfile> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GatewayResourceProfile");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
index 4e33c5f..9178b2e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@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 InputDataObjectType implements org.apache.thrift.TBase<InputDataObjectType, InputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<InputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
index 2fd2a98..6bac020 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/OutputDataObjectType.java
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
* Any metadat. This is typically ignore by Airavata and is used by gateways for application configuration.
*
*/
-@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 OutputDataObjectType implements org.apache.thrift.TBase<OutputDataObjectType, OutputDataObjectType._Fields>, java.io.Serializable, Cloneable, Comparable<OutputDataObjectType> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OutputDataObjectType");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
index eafc22a..4241558 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ErrorModel.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 ErrorModel implements org.apache.thrift.TBase<ErrorModel, ErrorModel._Fields>, java.io.Serializable, Cloneable, Comparable<ErrorModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ErrorModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
index 276cb2b..cb009f1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidationResults.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 ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
index 318f5c7..01f8489 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/commons/ValidatorResult.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* during the experiment launch operation
*
*/
-@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 ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
index 0af93cf..d757ff1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataClientException.java
@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
* parameter: If the error applied to a particular input parameter, this will
* indicate which parameter.
*/
-@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 AiravataClientException extends TException implements org.apache.thrift.TBase<AiravataClientException, AiravataClientException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataClientException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataClientException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
index 98e0eb2..c9c3c52 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AiravataSystemException.java
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
* message: This may contain additional information about the error
*
*/
-@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 AiravataSystemException extends TException implements org.apache.thrift.TBase<AiravataSystemException, AiravataSystemException._Fields>, java.io.Serializable, Cloneable, Comparable<AiravataSystemException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AiravataSystemException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
index 4c890d1..8aa4877 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthenticationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the cause of the authorization failure.
*/
-@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 AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
index 7ffe1b6..7ec1363 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/AuthorizationException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the authorization failure message
*/
-@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 AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
[2/4] airavata git commit: get rid of token id from launch experiment
method and use token from compute resource preference
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
index d9abe2a..e9f085e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ExperimentNotFoundException.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
*
* key: The value passed from the client in the identifier, which was not found.
*/
-@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 ExperimentNotFoundException extends TException implements org.apache.thrift.TBase<ExperimentNotFoundException, ExperimentNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
index 1034799..313aa55 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/InvalidRequestException.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
*
* message: contains the associated error message.
*/
-@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 InvalidRequestException extends TException implements org.apache.thrift.TBase<InvalidRequestException, InvalidRequestException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidRequestException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidRequestException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
index 444e669..c6deda0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/LaunchValidationException.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 LaunchValidationException extends TException implements org.apache.thrift.TBase<LaunchValidationException, LaunchValidationException._Fields>, java.io.Serializable, Cloneable, Comparable<LaunchValidationException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LaunchValidationException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
index 7bd7c42..e5a6d5c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ProjectNotFoundException.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
* 2: optional string key
*
*/
-@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 ProjectNotFoundException extends TException implements org.apache.thrift.TBase<ProjectNotFoundException, ProjectNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<ProjectNotFoundException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProjectNotFoundException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
index cb17d38..bab528d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/TimedOutException.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* This exception is thrown when RPC timeout gets exceeded.
*/
-@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 TimedOutException extends TException implements org.apache.thrift.TBase<TimedOutException, TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TimedOutException");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
index 94d8db0..5337192 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidationResults.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 ValidationResults implements org.apache.thrift.TBase<ValidationResults, ValidationResults._Fields>, java.io.Serializable, Cloneable, Comparable<ValidationResults> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidationResults");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
index 264659a..83c89b0 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/error/ValidatorResult.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 ValidatorResult implements org.apache.thrift.TBase<ValidatorResult, ValidatorResult._Fields>, java.io.Serializable, Cloneable, Comparable<ValidatorResult> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ValidatorResult");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
index 1123271..6393b75 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentModel.java
@@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory;
* experimentDescription:
* The verbose description of the experiment. This is an optional parameter.
*/
-@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 ExperimentModel implements org.apache.thrift.TBase<ExperimentModel, ExperimentModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
index 8070abc..31349cc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentStatistics.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 ExperimentStatistics implements org.apache.thrift.TBase<ExperimentStatistics, ExperimentStatistics._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatistics> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatistics");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
index 50026b4..d965379 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/ExperimentSummaryModel.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 ExperimentSummaryModel implements org.apache.thrift.TBase<ExperimentSummaryModel, ExperimentSummaryModel._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentSummaryModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentSummaryModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
index c7bbe33..c7943ca 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/experiment/UserConfigurationDataModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@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 UserConfigurationDataModel implements org.apache.thrift.TBase<UserConfigurationDataModel, UserConfigurationDataModel._Fields>, java.io.Serializable, Cloneable, Comparable<UserConfigurationDataModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserConfigurationDataModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
index ad45007..e66a854 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/job/JobModel.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 JobModel implements org.apache.thrift.TBase<JobModel, JobModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
index b246be3..d15f2db 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ExperimentStatusChangeEvent.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 ExperimentStatusChangeEvent implements org.apache.thrift.TBase<ExperimentStatusChangeEvent, ExperimentStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
index 2aaf959..225b7c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobIdentifier.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 JobIdentifier implements org.apache.thrift.TBase<JobIdentifier, JobIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<JobIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
index 864e749..2554e7b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeEvent.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 JobStatusChangeEvent implements org.apache.thrift.TBase<JobStatusChangeEvent, JobStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
index 465ff6e..47bd0bb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/JobStatusChangeRequestEvent.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 JobStatusChangeRequestEvent implements org.apache.thrift.TBase<JobStatusChangeRequestEvent, JobStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
index fbda7b1..26dff0d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/Message.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 Message implements org.apache.thrift.TBase<Message, Message._Fields>, java.io.Serializable, Cloneable, Comparable<Message> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Message");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
index 3f28775..68e4d60 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessIdentifier.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 ProcessIdentifier implements org.apache.thrift.TBase<ProcessIdentifier, ProcessIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
index f2e1468..a9d9e4e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeEvent.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 ProcessStatusChangeEvent implements org.apache.thrift.TBase<ProcessStatusChangeEvent, ProcessStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
index 5375112..90dbb29 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessStatusChangeRequestEvent.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 ProcessStatusChangeRequestEvent implements org.apache.thrift.TBase<ProcessStatusChangeRequestEvent, ProcessStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
index c885a96..0fa315e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessSubmitEvent.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 ProcessSubmitEvent implements org.apache.thrift.TBase<ProcessSubmitEvent, ProcessSubmitEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessSubmitEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessSubmitEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
index 55256ea..43e35ea 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/ProcessTerminateEvent.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 ProcessTerminateEvent implements org.apache.thrift.TBase<ProcessTerminateEvent, ProcessTerminateEvent._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessTerminateEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessTerminateEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
index ad31d24..22d9de7 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskIdentifier.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 TaskIdentifier implements org.apache.thrift.TBase<TaskIdentifier, TaskIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TaskIdentifier> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskIdentifier");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
index 0cc2e5d..3b94c24 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskOutputChangeEvent.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 TaskOutputChangeEvent implements org.apache.thrift.TBase<TaskOutputChangeEvent, TaskOutputChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskOutputChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskOutputChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
index c3340a4..fee69c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeEvent.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 TaskStatusChangeEvent implements org.apache.thrift.TBase<TaskStatusChangeEvent, TaskStatusChangeEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
index dba9c34..1acaf2b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/TaskStatusChangeRequestEvent.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 TaskStatusChangeRequestEvent implements org.apache.thrift.TBase<TaskStatusChangeRequestEvent, TaskStatusChangeRequestEvent._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatusChangeRequestEvent> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatusChangeRequestEvent");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
index 13ca9da..8353f9b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/process/ProcessModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@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 ProcessModel implements org.apache.thrift.TBase<ProcessModel, ProcessModel._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
index a2050b3..157e365 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/scheduling/ComputationalResourceSchedulingModel.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@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 ComputationalResourceSchedulingModel implements org.apache.thrift.TBase<ComputationalResourceSchedulingModel, ComputationalResourceSchedulingModel._Fields>, java.io.Serializable, Cloneable, Comparable<ComputationalResourceSchedulingModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComputationalResourceSchedulingModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
index 98529a4..464d042 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/security/AuthzToken.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 AuthzToken implements org.apache.thrift.TBase<AuthzToken, AuthzToken._Fields>, java.io.Serializable, Cloneable, Comparable<AuthzToken> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthzToken");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index d4b025b..709cdfb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
* User friendly reason on how the state is inferred.
*
*/
-@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 ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index 969c2b9..2f59f9f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.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 JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>, java.io.Serializable, Cloneable, Comparable<JobStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index c613fb1..b1974e4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.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 ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 0aa1cf5..702a44c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.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 TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TaskStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 8406dfd..7a01918 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
* A friendly description of the task, usally used to communicate information to users.
*
*/
-@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 DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel, DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index af02139..7342baf 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* subTaskModel:
* A generic byte object for the Task developer to store internal serialized data into registry catalogs.
*/
-@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 TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<TaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 67be95c..34a3d57 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.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 Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>, java.io.Serializable, Cloneable, Comparable<Gateway> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index 17cfd44..12533c1 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.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 Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable, Cloneable, Comparable<Group> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 02f4260..3cdb809 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.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 Project implements org.apache.thrift.TBase<Project, Project._Fields>, java.io.Serializable, Cloneable, Comparable<Project> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 12d5c8a..078f510 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.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 User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable, Cloneable, Comparable<User> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/modules/credential-store/credential-store-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 882e2ec..d7a23da 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -62,11 +62,11 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>mysql</groupId>-->
- <!--<artifactId>mysql-connector-java</artifactId>-->
- <!--<version>5.1.34</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.34</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e66c52bc/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
index e5fed60..703ee7d 100644
--- a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
+++ b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/SSHCredentialTest.java
@@ -38,11 +38,11 @@ import java.io.IOException;
public class SSHCredentialTest {
public static void main(String[] args) {
- String jdbcURL = "jdbc:mysql://gw85.iu.xsede.org:3306/airavata_dev";
+ String jdbcURL = "jdbc:mysql://gw85.iu.xsede.org:3306/airavata_gw119";
String jdbcDriver = "com.mysql.jdbc.Driver";
String userName = "gtaDevUser";
String password = "gtaDevPWD";
- String gatewayId = "sdsc";
+ String gatewayId = "phasta";
String privateKeyPath = "/Users/chathuri/Desktop/ssh_gw111/id_rsa";
String pubKeyPath = "/Users/chathuri/Desktop/ssh_gw111/id_rsa.pub";
@@ -53,7 +53,7 @@ public class SSHCredentialTest {
sshCredential.setGateway(gatewayId);
String token = TokenGenerator.generateToken(gatewayId, null);
sshCredential.setToken(token);
- sshCredential.setPortalUserName("kenneth");
+ sshCredential.setPortalUserName("phasta");
FileInputStream privateKeyStream = new FileInputStream(privateKeyPath);
File filePri = new File(privateKeyPath);
byte[] bFilePri = new byte[(int) filePri.length()];
@@ -66,7 +66,7 @@ public class SSHCredentialTest {
pubKeyStream.close();
sshCredential.setPrivateKey(bFilePri);
sshCredential.setPublicKey(bFilePub);
- sshCredential.setPassphrase("");
+ sshCredential.setPassphrase("ultrascan");
writer.writeCredentials(sshCredential);
System.out.println(token);
} catch (ClassNotFoundException e) {
[4/4] airavata git commit: get rid of token id from launch experiment
method and use token from compute resource preference
Posted by ch...@apache.org.
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 <ch...@apache.org>
Authored: Thu Oct 8 15:25:25 2015 -0400
Committer: Chathuri Wimalasena <ch...@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");
}