You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/05/20 15:23:13 UTC
[3/3] git commit: generating code
generating code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/23c11841
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/23c11841
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/23c11841
Branch: refs/heads/master
Commit: 23c118418520c64a24606c3978b20e57465c35c0
Parents: 3049a0b
Author: samindaw <sa...@gmail.com>
Authored: Tue May 20 06:22:49 2014 -0700
Committer: samindaw <sa...@gmail.com>
Committed: Tue May 20 06:22:49 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 6 +-
.../api/appcatalog/ApplicationCatalogAPI.java | 261 +++++++++++++++--
.../resources/lib/ApplicationCatalogAPI.cpp | 67 ++++-
.../main/resources/lib/ApplicationCatalogAPI.h | 50 ++--
.../ApplicationCatalogAPI_server.skeleton.cpp | 4 +-
.../lib/applicationCatalogDataModel_types.cpp | 284 +++++++++---------
.../lib/applicationCatalogDataModel_types.h | 48 ++--
.../API/AppCatalog/ApplicationCatalogAPI.php | 64 ++++-
.../src/main/resources/lib/Types.php | 286 ++++++++++---------
.../model/appcatalog/ApplicationInterface.java | 36 +--
.../appcatalog/ComputeResourceDescription.java | 152 +++++-----
.../model/appcatalog/GSISSHJobSubmission.java | 200 ++++++-------
.../model/appcatalog/GlobusJobSubmission.java | 177 +++++++-----
.../model/appcatalog/SCPDataMovement.java | 104 +++----
.../model/appcatalog/SSHJobSubmission.java | 104 +++----
15 files changed, 1128 insertions(+), 715 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/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 131d477..1d61f68 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
@@ -28,6 +28,7 @@ import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -37,10 +38,13 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
index d184f0f..385897d 100644
--- a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
+++ b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/appcatalog/ApplicationCatalogAPI.java
@@ -28,6 +28,7 @@ import org.apache.thrift.scheme.StandardScheme;
import org.apache.thrift.scheme.TupleScheme;
import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
import org.apache.thrift.EncodingUtils;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -37,10 +38,13 @@ import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
import java.util.EnumSet;
import java.util.Collections;
import java.util.BitSet;
-
+import java.nio.ByteBuffer;
+import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,9 +107,9 @@ import org.slf4j.LoggerFactory;
*/
public void addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.ApplicationDeployment applicationDeployment) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public List<String> listApplicationDeploymentIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
- public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
+ public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException;
}
@@ -147,9 +151,9 @@ import org.slf4j.LoggerFactory;
public void addApplicationDeployment(String applicationInterfaceId, org.apache.airavata.model.appcatalog.ApplicationDeployment applicationDeployment, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void listApplicationDeploymentIds(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void listApplicationDeploymentIds(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
- public void getApplicationDeployment(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+ public void getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
}
@@ -721,15 +725,16 @@ import org.slf4j.LoggerFactory;
return;
}
- public List<String> listApplicationDeploymentIds() throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public List<String> listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_listApplicationDeploymentIds();
+ send_listApplicationDeploymentIds(applicationInterfaceId);
return recv_listApplicationDeploymentIds();
}
- public void send_listApplicationDeploymentIds() throws org.apache.thrift.TException
+ public void send_listApplicationDeploymentIds(String applicationInterfaceId) throws org.apache.thrift.TException
{
listApplicationDeploymentIds_args args = new listApplicationDeploymentIds_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
sendBase("listApplicationDeploymentIds", args);
}
@@ -752,15 +757,16 @@ import org.slf4j.LoggerFactory;
throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listApplicationDeploymentIds failed: unknown result");
}
- public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
+ public org.apache.airavata.model.appcatalog.ApplicationDeployment getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.thrift.TException
{
- send_getApplicationDeployment(applicationDeploymentId);
+ send_getApplicationDeployment(applicationInterfaceId, applicationDeploymentId);
return recv_getApplicationDeployment();
}
- public void send_getApplicationDeployment(String applicationDeploymentId) throws org.apache.thrift.TException
+ public void send_getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId) throws org.apache.thrift.TException
{
getApplicationDeployment_args args = new getApplicationDeployment_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.setApplicationDeploymentId(applicationDeploymentId);
sendBase("getApplicationDeployment", args);
}
@@ -1384,21 +1390,24 @@ import org.slf4j.LoggerFactory;
}
}
- public void listApplicationDeploymentIds(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void listApplicationDeploymentIds(String applicationInterfaceId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- listApplicationDeploymentIds_call method_call = new listApplicationDeploymentIds_call(resultHandler, this, ___protocolFactory, ___transport);
+ listApplicationDeploymentIds_call method_call = new listApplicationDeploymentIds_call(applicationInterfaceId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class listApplicationDeploymentIds_call extends org.apache.thrift.async.TAsyncMethodCall {
- public listApplicationDeploymentIds_call(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 applicationInterfaceId;
+ public listApplicationDeploymentIds_call(String applicationInterfaceId, 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.applicationInterfaceId = applicationInterfaceId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("listApplicationDeploymentIds", org.apache.thrift.protocol.TMessageType.CALL, 0));
listApplicationDeploymentIds_args args = new listApplicationDeploymentIds_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.write(prot);
prot.writeMessageEnd();
}
@@ -1413,23 +1422,26 @@ import org.slf4j.LoggerFactory;
}
}
- public void getApplicationDeployment(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+ public void getApplicationDeployment(String applicationInterfaceId, String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
checkReady();
- getApplicationDeployment_call method_call = new getApplicationDeployment_call(applicationDeploymentId, resultHandler, this, ___protocolFactory, ___transport);
+ getApplicationDeployment_call method_call = new getApplicationDeployment_call(applicationInterfaceId, applicationDeploymentId, resultHandler, this, ___protocolFactory, ___transport);
this.___currentMethod = method_call;
___manager.call(method_call);
}
public static class getApplicationDeployment_call extends org.apache.thrift.async.TAsyncMethodCall {
+ private String applicationInterfaceId;
private String applicationDeploymentId;
- public getApplicationDeployment_call(String applicationDeploymentId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+ public getApplicationDeployment_call(String applicationInterfaceId, String applicationDeploymentId, 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.applicationInterfaceId = applicationInterfaceId;
this.applicationDeploymentId = applicationDeploymentId;
}
public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getApplicationDeployment", org.apache.thrift.protocol.TMessageType.CALL, 0));
getApplicationDeployment_args args = new getApplicationDeployment_args();
+ args.setApplicationInterfaceId(applicationInterfaceId);
args.setApplicationDeploymentId(applicationDeploymentId);
args.write(prot);
prot.writeMessageEnd();
@@ -1994,7 +2006,7 @@ import org.slf4j.LoggerFactory;
public listApplicationDeploymentIds_result getResult(I iface, listApplicationDeploymentIds_args args) throws org.apache.thrift.TException {
listApplicationDeploymentIds_result result = new listApplicationDeploymentIds_result();
try {
- result.success = iface.listApplicationDeploymentIds();
+ result.success = iface.listApplicationDeploymentIds(args.applicationInterfaceId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -2022,7 +2034,7 @@ import org.slf4j.LoggerFactory;
public getApplicationDeployment_result getResult(I iface, getApplicationDeployment_args args) throws org.apache.thrift.TException {
getApplicationDeployment_result result = new getApplicationDeployment_result();
try {
- result.success = iface.getApplicationDeployment(args.applicationDeploymentId);
+ result.success = iface.getApplicationDeployment(args.applicationInterfaceId, args.applicationDeploymentId);
} catch (org.apache.airavata.model.error.InvalidRequestException ire) {
result.ire = ire;
} catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -3317,7 +3329,7 @@ import org.slf4j.LoggerFactory;
}
public void start(I iface, listApplicationDeploymentIds_args args, org.apache.thrift.async.AsyncMethodCallback<List<String>> resultHandler) throws TException {
- iface.listApplicationDeploymentIds(resultHandler);
+ iface.listApplicationDeploymentIds(args.applicationInterfaceId,resultHandler);
}
}
@@ -3384,7 +3396,7 @@ import org.slf4j.LoggerFactory;
}
public void start(I iface, getApplicationDeployment_args args, org.apache.thrift.async.AsyncMethodCallback<org.apache.airavata.model.appcatalog.ApplicationDeployment> resultHandler) throws TException {
- iface.getApplicationDeployment(args.applicationDeploymentId,resultHandler);
+ iface.getApplicationDeployment(args.applicationInterfaceId, args.applicationDeploymentId,resultHandler);
}
}
@@ -20858,6 +20870,7 @@ import org.slf4j.LoggerFactory;
public static class listApplicationDeploymentIds_args implements org.apache.thrift.TBase<listApplicationDeploymentIds_args, listApplicationDeploymentIds_args._Fields>, java.io.Serializable, Cloneable, Comparable<listApplicationDeploymentIds_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("listApplicationDeploymentIds_args");
+ private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -20865,10 +20878,11 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new listApplicationDeploymentIds_argsTupleSchemeFactory());
}
+ public String applicationInterfaceId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
+ APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -20883,6 +20897,8 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
+ case 1: // APPLICATION_INTERFACE_ID
+ return APPLICATION_INTERFACE_ID;
default:
return null;
}
@@ -20921,9 +20937,13 @@ import org.slf4j.LoggerFactory;
return _fieldName;
}
}
+
+ // isset id assignments
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", 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(listApplicationDeploymentIds_args.class, metaDataMap);
}
@@ -20931,10 +20951,20 @@ import org.slf4j.LoggerFactory;
public listApplicationDeploymentIds_args() {
}
+ public listApplicationDeploymentIds_args(
+ String applicationInterfaceId)
+ {
+ this();
+ this.applicationInterfaceId = applicationInterfaceId;
+ }
+
/**
* Performs a deep copy on <i>other</i>.
*/
public listApplicationDeploymentIds_args(listApplicationDeploymentIds_args other) {
+ if (other.isSetApplicationInterfaceId()) {
+ this.applicationInterfaceId = other.applicationInterfaceId;
+ }
}
public listApplicationDeploymentIds_args deepCopy() {
@@ -20943,15 +20973,51 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
+ this.applicationInterfaceId = null;
+ }
+
+ public String getApplicationInterfaceId() {
+ return this.applicationInterfaceId;
+ }
+
+ public listApplicationDeploymentIds_args setApplicationInterfaceId(String applicationInterfaceId) {
+ this.applicationInterfaceId = applicationInterfaceId;
+ return this;
+ }
+
+ public void unsetApplicationInterfaceId() {
+ this.applicationInterfaceId = null;
+ }
+
+ /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationInterfaceId() {
+ return this.applicationInterfaceId != null;
+ }
+
+ public void setApplicationInterfaceIdIsSet(boolean value) {
+ if (!value) {
+ this.applicationInterfaceId = null;
+ }
}
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ if (value == null) {
+ unsetApplicationInterfaceId();
+ } else {
+ setApplicationInterfaceId((String)value);
+ }
+ break;
+
}
}
public Object getFieldValue(_Fields field) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return getApplicationInterfaceId();
+
}
throw new IllegalStateException();
}
@@ -20963,6 +21029,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return isSetApplicationInterfaceId();
}
throw new IllegalStateException();
}
@@ -20980,6 +21048,15 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
+ boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
+ boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
+ if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
+ if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
+ return false;
+ if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
+ return false;
+ }
+
return true;
}
@@ -20996,6 +21073,16 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetApplicationInterfaceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -21016,12 +21103,22 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("listApplicationDeploymentIds_args(");
boolean first = true;
+ sb.append("applicationInterfaceId:");
+ if (this.applicationInterfaceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.applicationInterfaceId);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ if (applicationInterfaceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' was not present! Struct: " + toString());
+ }
// check for sub-struct validity
}
@@ -21059,6 +21156,14 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
+ case 1: // APPLICATION_INTERFACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -21074,6 +21179,11 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.applicationInterfaceId != null) {
+ oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationInterfaceId);
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -21091,11 +21201,14 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, listApplicationDeploymentIds_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.applicationInterfaceId);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, listApplicationDeploymentIds_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
}
}
@@ -21813,7 +21926,8 @@ import org.slf4j.LoggerFactory;
public static class getApplicationDeployment_args implements org.apache.thrift.TBase<getApplicationDeployment_args, getApplicationDeployment_args._Fields>, java.io.Serializable, Cloneable, Comparable<getApplicationDeployment_args> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getApplicationDeployment_args");
- private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField APPLICATION_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -21821,11 +21935,13 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new getApplicationDeployment_argsTupleSchemeFactory());
}
+ public String applicationInterfaceId; // required
public String applicationDeploymentId; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
- APPLICATION_DEPLOYMENT_ID((short)1, "applicationDeploymentId");
+ APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"),
+ APPLICATION_DEPLOYMENT_ID((short)2, "applicationDeploymentId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -21840,7 +21956,9 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // APPLICATION_DEPLOYMENT_ID
+ case 1: // APPLICATION_INTERFACE_ID
+ return APPLICATION_INTERFACE_ID;
+ case 2: // APPLICATION_DEPLOYMENT_ID
return APPLICATION_DEPLOYMENT_ID;
default:
return null;
@@ -21885,6 +22003,8 @@ import org.slf4j.LoggerFactory;
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.APPLICATION_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationDeploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -21895,9 +22015,11 @@ import org.slf4j.LoggerFactory;
}
public getApplicationDeployment_args(
+ String applicationInterfaceId,
String applicationDeploymentId)
{
this();
+ this.applicationInterfaceId = applicationInterfaceId;
this.applicationDeploymentId = applicationDeploymentId;
}
@@ -21905,6 +22027,9 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public getApplicationDeployment_args(getApplicationDeployment_args other) {
+ if (other.isSetApplicationInterfaceId()) {
+ this.applicationInterfaceId = other.applicationInterfaceId;
+ }
if (other.isSetApplicationDeploymentId()) {
this.applicationDeploymentId = other.applicationDeploymentId;
}
@@ -21916,9 +22041,34 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
+ this.applicationInterfaceId = null;
this.applicationDeploymentId = null;
}
+ public String getApplicationInterfaceId() {
+ return this.applicationInterfaceId;
+ }
+
+ public getApplicationDeployment_args setApplicationInterfaceId(String applicationInterfaceId) {
+ this.applicationInterfaceId = applicationInterfaceId;
+ return this;
+ }
+
+ public void unsetApplicationInterfaceId() {
+ this.applicationInterfaceId = null;
+ }
+
+ /** Returns true if field applicationInterfaceId is set (has been assigned a value) and false otherwise */
+ public boolean isSetApplicationInterfaceId() {
+ return this.applicationInterfaceId != null;
+ }
+
+ public void setApplicationInterfaceIdIsSet(boolean value) {
+ if (!value) {
+ this.applicationInterfaceId = null;
+ }
+ }
+
public String getApplicationDeploymentId() {
return this.applicationDeploymentId;
}
@@ -21945,6 +22095,14 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ if (value == null) {
+ unsetApplicationInterfaceId();
+ } else {
+ setApplicationInterfaceId((String)value);
+ }
+ break;
+
case APPLICATION_DEPLOYMENT_ID:
if (value == null) {
unsetApplicationDeploymentId();
@@ -21958,6 +22116,9 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return getApplicationInterfaceId();
+
case APPLICATION_DEPLOYMENT_ID:
return getApplicationDeploymentId();
@@ -21972,6 +22133,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
+ case APPLICATION_INTERFACE_ID:
+ return isSetApplicationInterfaceId();
case APPLICATION_DEPLOYMENT_ID:
return isSetApplicationDeploymentId();
}
@@ -21991,6 +22154,15 @@ import org.slf4j.LoggerFactory;
if (that == null)
return false;
+ boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId();
+ boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId();
+ if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) {
+ if (!(this_present_applicationInterfaceId && that_present_applicationInterfaceId))
+ return false;
+ if (!this.applicationInterfaceId.equals(that.applicationInterfaceId))
+ return false;
+ }
+
boolean this_present_applicationDeploymentId = true && this.isSetApplicationDeploymentId();
boolean that_present_applicationDeploymentId = true && that.isSetApplicationDeploymentId();
if (this_present_applicationDeploymentId || that_present_applicationDeploymentId) {
@@ -22016,6 +22188,16 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
+ lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetApplicationInterfaceId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.applicationInterfaceId, other.applicationInterfaceId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
lastComparison = Boolean.valueOf(isSetApplicationDeploymentId()).compareTo(other.isSetApplicationDeploymentId());
if (lastComparison != 0) {
return lastComparison;
@@ -22046,6 +22228,14 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("getApplicationDeployment_args(");
boolean first = true;
+ sb.append("applicationInterfaceId:");
+ if (this.applicationInterfaceId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.applicationInterfaceId);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("applicationDeploymentId:");
if (this.applicationDeploymentId == null) {
sb.append("null");
@@ -22059,6 +22249,9 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ if (applicationInterfaceId == null) {
+ throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' was not present! Struct: " + toString());
+ }
if (applicationDeploymentId == null) {
throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationDeploymentId' was not present! Struct: " + toString());
}
@@ -22099,7 +22292,15 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // APPLICATION_DEPLOYMENT_ID
+ case 1: // APPLICATION_INTERFACE_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // APPLICATION_DEPLOYMENT_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.applicationDeploymentId = iprot.readString();
struct.setApplicationDeploymentIdIsSet(true);
@@ -22122,6 +22323,11 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.applicationInterfaceId != null) {
+ oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC);
+ oprot.writeString(struct.applicationInterfaceId);
+ oprot.writeFieldEnd();
+ }
if (struct.applicationDeploymentId != null) {
oprot.writeFieldBegin(APPLICATION_DEPLOYMENT_ID_FIELD_DESC);
oprot.writeString(struct.applicationDeploymentId);
@@ -22144,12 +22350,15 @@ import org.slf4j.LoggerFactory;
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, getApplicationDeployment_args struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
+ oprot.writeString(struct.applicationInterfaceId);
oprot.writeString(struct.applicationDeploymentId);
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, getApplicationDeployment_args struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
+ struct.applicationInterfaceId = iprot.readString();
+ struct.setApplicationInterfaceIdIsSet(true);
struct.applicationDeploymentId = iprot.readString();
struct.setApplicationDeploymentIdIsSet(true);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
index 69b3087..429b558 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.cpp
@@ -3956,6 +3956,7 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_applicationInterfaceId = false;
while (true)
{
@@ -3963,12 +3964,27 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::read(::apache:
if (ftype == ::apache::thrift::protocol::T_STOP) {
break;
}
- xfer += iprot->skip(ftype);
+ switch (fid)
+ {
+ case 1:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->applicationInterfaceId);
+ isset_applicationInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ default:
+ xfer += iprot->skip(ftype);
+ break;
+ }
xfer += iprot->readFieldEnd();
}
xfer += iprot->readStructEnd();
+ if (!isset_applicationInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
}
@@ -3976,6 +3992,10 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_args::write(::apache
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_args");
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->applicationInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -3985,6 +4005,10 @@ uint32_t ApplicationCatalogAPI_listApplicationDeploymentIds_pargs::write(::apach
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_listApplicationDeploymentIds_pargs");
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->applicationInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -4189,6 +4213,7 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
using ::apache::thrift::protocol::TProtocolException;
+ bool isset_applicationInterfaceId = false;
bool isset_applicationDeploymentId = false;
while (true)
@@ -4201,6 +4226,14 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->applicationInterfaceId);
+ isset_applicationInterfaceId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 2:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
xfer += iprot->readString(this->applicationDeploymentId);
isset_applicationDeploymentId = true;
} else {
@@ -4216,6 +4249,8 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::read(::apache::thr
xfer += iprot->readStructEnd();
+ if (!isset_applicationInterfaceId)
+ throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_applicationDeploymentId)
throw TProtocolException(TProtocolException::INVALID_DATA);
return xfer;
@@ -4225,7 +4260,11 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_args::write(::apache::th
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_args");
- xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->applicationInterfaceId);
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString(this->applicationDeploymentId);
xfer += oprot->writeFieldEnd();
@@ -4238,7 +4277,11 @@ uint32_t ApplicationCatalogAPI_getApplicationDeployment_pargs::write(::apache::t
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("ApplicationCatalogAPI_getApplicationDeployment_pargs");
- xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeFieldBegin("applicationInterfaceId", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString((*(this->applicationInterfaceId)));
+ xfer += oprot->writeFieldEnd();
+
+ xfer += oprot->writeFieldBegin("applicationDeploymentId", ::apache::thrift::protocol::T_STRING, 2);
xfer += oprot->writeString((*(this->applicationDeploymentId)));
xfer += oprot->writeFieldEnd();
@@ -5567,18 +5610,19 @@ void ApplicationCatalogAPIClient::recv_addApplicationDeployment()
return;
}
-void ApplicationCatalogAPIClient::listApplicationDeploymentIds(std::vector<std::string> & _return)
+void ApplicationCatalogAPIClient::listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId)
{
- send_listApplicationDeploymentIds();
+ send_listApplicationDeploymentIds(applicationInterfaceId);
recv_listApplicationDeploymentIds(_return);
}
-void ApplicationCatalogAPIClient::send_listApplicationDeploymentIds()
+void ApplicationCatalogAPIClient::send_listApplicationDeploymentIds(const std::string& applicationInterfaceId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("listApplicationDeploymentIds", ::apache::thrift::protocol::T_CALL, cseqid);
ApplicationCatalogAPI_listApplicationDeploymentIds_pargs args;
+ args.applicationInterfaceId = &applicationInterfaceId;
args.write(oprot_);
oprot_->writeMessageEnd();
@@ -5633,18 +5677,19 @@ void ApplicationCatalogAPIClient::recv_listApplicationDeploymentIds(std::vector<
throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "listApplicationDeploymentIds failed: unknown result");
}
-void ApplicationCatalogAPIClient::getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId)
+void ApplicationCatalogAPIClient::getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId)
{
- send_getApplicationDeployment(applicationDeploymentId);
+ send_getApplicationDeployment(applicationInterfaceId, applicationDeploymentId);
recv_getApplicationDeployment(_return);
}
-void ApplicationCatalogAPIClient::send_getApplicationDeployment(const std::string& applicationDeploymentId)
+void ApplicationCatalogAPIClient::send_getApplicationDeployment(const std::string& applicationInterfaceId, const std::string& applicationDeploymentId)
{
int32_t cseqid = 0;
oprot_->writeMessageBegin("getApplicationDeployment", ::apache::thrift::protocol::T_CALL, cseqid);
ApplicationCatalogAPI_getApplicationDeployment_pargs args;
+ args.applicationInterfaceId = &applicationInterfaceId;
args.applicationDeploymentId = &applicationDeploymentId;
args.write(oprot_);
@@ -6860,7 +6905,7 @@ void ApplicationCatalogAPIProcessor::process_listApplicationDeploymentIds(int32_
ApplicationCatalogAPI_listApplicationDeploymentIds_result result;
try {
- iface_->listApplicationDeploymentIds(result.success);
+ iface_->listApplicationDeploymentIds(result.success, args.applicationInterfaceId);
result.__isset.success = true;
} catch ( ::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
@@ -6923,7 +6968,7 @@ void ApplicationCatalogAPIProcessor::process_getApplicationDeployment(int32_t se
ApplicationCatalogAPI_getApplicationDeployment_result result;
try {
- iface_->getApplicationDeployment(result.success, args.applicationDeploymentId);
+ iface_->getApplicationDeployment(result.success, args.applicationInterfaceId, args.applicationDeploymentId);
result.__isset.success = true;
} catch ( ::airavata::api::error::InvalidRequestException &ire) {
result.ire = ire;
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
index ea72ac0..e56ef4a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI.h
@@ -33,8 +33,8 @@ class ApplicationCatalogAPIIf {
virtual void listApplicationInterfaceIds(std::vector<std::string> & _return) = 0;
virtual void getApplicationInterface( ::ApplicationInterface& _return, const std::string& applicationInterfaceId) = 0;
virtual void addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment) = 0;
- virtual void listApplicationDeploymentIds(std::vector<std::string> & _return) = 0;
- virtual void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) = 0;
+ virtual void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) = 0;
+ virtual void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) = 0;
};
class ApplicationCatalogAPIIfFactory {
@@ -119,10 +119,10 @@ class ApplicationCatalogAPINull : virtual public ApplicationCatalogAPIIf {
void addApplicationDeployment(const std::string& /* applicationInterfaceId */, const ::ApplicationDeployment& /* applicationDeployment */) {
return;
}
- void listApplicationDeploymentIds(std::vector<std::string> & /* _return */) {
+ void listApplicationDeploymentIds(std::vector<std::string> & /* _return */, const std::string& /* applicationInterfaceId */) {
return;
}
- void getApplicationDeployment( ::ApplicationDeployment& /* _return */, const std::string& /* applicationDeploymentId */) {
+ void getApplicationDeployment( ::ApplicationDeployment& /* _return */, const std::string& /* applicationInterfaceId */, const std::string& /* applicationDeploymentId */) {
return;
}
};
@@ -2423,14 +2423,21 @@ class ApplicationCatalogAPI_addApplicationDeployment_presult {
class ApplicationCatalogAPI_listApplicationDeploymentIds_args {
public:
- ApplicationCatalogAPI_listApplicationDeploymentIds_args() {
+ ApplicationCatalogAPI_listApplicationDeploymentIds_args() : applicationInterfaceId() {
}
virtual ~ApplicationCatalogAPI_listApplicationDeploymentIds_args() throw() {}
+ std::string applicationInterfaceId;
+
+ void __set_applicationInterfaceId(const std::string& val) {
+ applicationInterfaceId = val;
+ }
- bool operator == (const ApplicationCatalogAPI_listApplicationDeploymentIds_args & /* rhs */) const
+ bool operator == (const ApplicationCatalogAPI_listApplicationDeploymentIds_args & rhs) const
{
+ if (!(applicationInterfaceId == rhs.applicationInterfaceId))
+ return false;
return true;
}
bool operator != (const ApplicationCatalogAPI_listApplicationDeploymentIds_args &rhs) const {
@@ -2451,6 +2458,7 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_pargs {
virtual ~ApplicationCatalogAPI_listApplicationDeploymentIds_pargs() throw() {}
+ const std::string* applicationInterfaceId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -2547,19 +2555,26 @@ class ApplicationCatalogAPI_listApplicationDeploymentIds_presult {
class ApplicationCatalogAPI_getApplicationDeployment_args {
public:
- ApplicationCatalogAPI_getApplicationDeployment_args() : applicationDeploymentId() {
+ ApplicationCatalogAPI_getApplicationDeployment_args() : applicationInterfaceId(), applicationDeploymentId() {
}
virtual ~ApplicationCatalogAPI_getApplicationDeployment_args() throw() {}
+ std::string applicationInterfaceId;
std::string applicationDeploymentId;
+ void __set_applicationInterfaceId(const std::string& val) {
+ applicationInterfaceId = val;
+ }
+
void __set_applicationDeploymentId(const std::string& val) {
applicationDeploymentId = val;
}
bool operator == (const ApplicationCatalogAPI_getApplicationDeployment_args & rhs) const
{
+ if (!(applicationInterfaceId == rhs.applicationInterfaceId))
+ return false;
if (!(applicationDeploymentId == rhs.applicationDeploymentId))
return false;
return true;
@@ -2582,6 +2597,7 @@ class ApplicationCatalogAPI_getApplicationDeployment_pargs {
virtual ~ApplicationCatalogAPI_getApplicationDeployment_pargs() throw() {}
+ const std::string* applicationInterfaceId;
const std::string* applicationDeploymentId;
uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -2749,11 +2765,11 @@ class ApplicationCatalogAPIClient : virtual public ApplicationCatalogAPIIf {
void addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment);
void send_addApplicationDeployment(const std::string& applicationInterfaceId, const ::ApplicationDeployment& applicationDeployment);
void recv_addApplicationDeployment();
- void listApplicationDeploymentIds(std::vector<std::string> & _return);
- void send_listApplicationDeploymentIds();
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId);
+ void send_listApplicationDeploymentIds(const std::string& applicationInterfaceId);
void recv_listApplicationDeploymentIds(std::vector<std::string> & _return);
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId);
- void send_getApplicationDeployment(const std::string& applicationDeploymentId);
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId);
+ void send_getApplicationDeployment(const std::string& applicationInterfaceId, const std::string& applicationDeploymentId);
void recv_getApplicationDeployment( ::ApplicationDeployment& _return);
protected:
boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
@@ -3013,23 +3029,23 @@ class ApplicationCatalogAPIMultiface : virtual public ApplicationCatalogAPIIf {
ifaces_[i]->addApplicationDeployment(applicationInterfaceId, applicationDeployment);
}
- void listApplicationDeploymentIds(std::vector<std::string> & _return) {
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->listApplicationDeploymentIds(_return);
+ ifaces_[i]->listApplicationDeploymentIds(_return, applicationInterfaceId);
}
- ifaces_[i]->listApplicationDeploymentIds(_return);
+ ifaces_[i]->listApplicationDeploymentIds(_return, applicationInterfaceId);
return;
}
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) {
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) {
size_t sz = ifaces_.size();
size_t i = 0;
for (; i < (sz - 1); ++i) {
- ifaces_[i]->getApplicationDeployment(_return, applicationDeploymentId);
+ ifaces_[i]->getApplicationDeployment(_return, applicationInterfaceId, applicationDeploymentId);
}
- ifaces_[i]->getApplicationDeployment(_return, applicationDeploymentId);
+ ifaces_[i]->getApplicationDeployment(_return, applicationInterfaceId, applicationDeploymentId);
return;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
index 2d11705..957e511 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/ApplicationCatalogAPI_server.skeleton.cpp
@@ -112,12 +112,12 @@ class ApplicationCatalogAPIHandler : virtual public ApplicationCatalogAPIIf {
printf("addApplicationDeployment\n");
}
- void listApplicationDeploymentIds(std::vector<std::string> & _return) {
+ void listApplicationDeploymentIds(std::vector<std::string> & _return, const std::string& applicationInterfaceId) {
// Your implementation goes here
printf("listApplicationDeploymentIds\n");
}
- void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationDeploymentId) {
+ void getApplicationDeployment( ::ApplicationDeployment& _return, const std::string& applicationInterfaceId, const std::string& applicationDeploymentId) {
// Your implementation goes here
printf("getApplicationDeployment\n");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/23c11841/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
index a0b5933..6fa5f9a 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/applicationCatalogDataModel_types.cpp
@@ -82,7 +82,7 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
- bool isset_scpDataMovementID = false;
+ bool isset_dataSubmissionDataID = false;
bool isset_securityProtocol = false;
while (true)
@@ -95,8 +95,8 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->scpDataMovementID);
- isset_scpDataMovementID = true;
+ xfer += iprot->readString(this->dataSubmissionDataID);
+ isset_dataSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -128,7 +128,7 @@ uint32_t SCPDataMovement::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->readStructEnd();
- if (!isset_scpDataMovementID)
+ if (!isset_dataSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_securityProtocol)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -139,8 +139,8 @@ uint32_t SCPDataMovement::write(::apache::thrift::protocol::TProtocol* oprot) co
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("SCPDataMovement");
- xfer += oprot->writeFieldBegin("scpDataMovementID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->scpDataMovementID);
+ xfer += oprot->writeFieldBegin("dataSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->dataSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("securityProtocol", ::apache::thrift::protocol::T_I32, 2);
@@ -159,7 +159,7 @@ uint32_t SCPDataMovement::write(::apache::thrift::protocol::TProtocol* oprot) co
void swap(SCPDataMovement &a, SCPDataMovement &b) {
using ::std::swap;
- swap(a.scpDataMovementID, b.scpDataMovementID);
+ swap(a.dataSubmissionDataID, b.dataSubmissionDataID);
swap(a.securityProtocol, b.securityProtocol);
swap(a.sshPort, b.sshPort);
swap(a.__isset, b.__isset);
@@ -179,7 +179,7 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
using ::apache::thrift::protocol::TProtocolException;
- bool isset_sshJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_resourceJobManager = false;
while (true)
@@ -192,8 +192,8 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->sshJobSubmissionID);
- isset_sshJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -225,7 +225,7 @@ uint32_t SSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
xfer += iprot->readStructEnd();
- if (!isset_sshJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_resourceJobManager)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -236,8 +236,8 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("SSHJobSubmission");
- xfer += oprot->writeFieldBegin("sshJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->sshJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 2);
@@ -256,14 +256,14 @@ uint32_t SSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot) c
void swap(SSHJobSubmission &a, SSHJobSubmission &b) {
using ::std::swap;
- swap(a.sshJobSubmissionID, b.sshJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.sshPort, b.sshPort);
swap(a.__isset, b.__isset);
}
-const char* GlobusJobSubmission::ascii_fingerprint = "6B87230A5315302FA994567088F60D3A";
-const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0x6B,0x87,0x23,0x0A,0x53,0x15,0x30,0x2F,0xA9,0x94,0x56,0x70,0x88,0xF6,0x0D,0x3A};
+const char* GlobusJobSubmission::ascii_fingerprint = "DF4253F78D7B543C16FA461660D38A03";
+const uint8_t GlobusJobSubmission::binary_fingerprint[16] = {0xDF,0x42,0x53,0xF7,0x8D,0x7B,0x54,0x3C,0x16,0xFA,0x46,0x16,0x60,0xD3,0x8A,0x03};
uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -276,7 +276,7 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
using ::apache::thrift::protocol::TProtocolException;
- bool isset_globusJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_securityProtocol = false;
bool isset_resourceJobManager = false;
@@ -290,8 +290,8 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->globusJobSubmissionID);
- isset_globusJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -317,8 +317,20 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
}
break;
case 4:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->globusGateKeeperEndPoint);
+ if (ftype == ::apache::thrift::protocol::T_LIST) {
+ {
+ this->globusGateKeeperEndPoint.clear();
+ uint32_t _size4;
+ ::apache::thrift::protocol::TType _etype7;
+ xfer += iprot->readListBegin(_etype7, _size4);
+ this->globusGateKeeperEndPoint.resize(_size4);
+ uint32_t _i8;
+ for (_i8 = 0; _i8 < _size4; ++_i8)
+ {
+ xfer += iprot->readString(this->globusGateKeeperEndPoint[_i8]);
+ }
+ xfer += iprot->readListEnd();
+ }
this->__isset.globusGateKeeperEndPoint = true;
} else {
xfer += iprot->skip(ftype);
@@ -333,7 +345,7 @@ uint32_t GlobusJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->readStructEnd();
- if (!isset_globusJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_securityProtocol)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -346,8 +358,8 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("GlobusJobSubmission");
- xfer += oprot->writeFieldBegin("globusJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->globusJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("securityProtocol", ::apache::thrift::protocol::T_I32, 2);
@@ -359,8 +371,16 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldEnd();
if (this->__isset.globusGateKeeperEndPoint) {
- xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_STRING, 4);
- xfer += oprot->writeString(this->globusGateKeeperEndPoint);
+ xfer += oprot->writeFieldBegin("globusGateKeeperEndPoint", ::apache::thrift::protocol::T_LIST, 4);
+ {
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->globusGateKeeperEndPoint.size()));
+ std::vector<std::string> ::const_iterator _iter9;
+ for (_iter9 = this->globusGateKeeperEndPoint.begin(); _iter9 != this->globusGateKeeperEndPoint.end(); ++_iter9)
+ {
+ xfer += oprot->writeString((*_iter9));
+ }
+ xfer += oprot->writeListEnd();
+ }
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -370,7 +390,7 @@ uint32_t GlobusJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
void swap(GlobusJobSubmission &a, GlobusJobSubmission &b) {
using ::std::swap;
- swap(a.globusJobSubmissionID, b.globusJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.securityProtocol, b.securityProtocol);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.globusGateKeeperEndPoint, b.globusGateKeeperEndPoint);
@@ -391,7 +411,7 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
using ::apache::thrift::protocol::TProtocolException;
- bool isset_gssishJobSubmissionID = false;
+ bool isset_jobSubmissionDataID = false;
bool isset_resourceJobManager = false;
while (true)
@@ -404,17 +424,17 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
{
case 1:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->gssishJobSubmissionID);
- isset_gssishJobSubmissionID = true;
+ xfer += iprot->readString(this->jobSubmissionDataID);
+ isset_jobSubmissionDataID = true;
} else {
xfer += iprot->skip(ftype);
}
break;
case 2:
if (ftype == ::apache::thrift::protocol::T_I32) {
- int32_t ecast4;
- xfer += iprot->readI32(ecast4);
- this->resourceJobManager = (ResourceJobManager::type)ecast4;
+ int32_t ecast10;
+ xfer += iprot->readI32(ecast10);
+ this->resourceJobManager = (ResourceJobManager::type)ecast10;
isset_resourceJobManager = true;
} else {
xfer += iprot->skip(ftype);
@@ -432,15 +452,15 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->exports.clear();
- uint32_t _size5;
- ::apache::thrift::protocol::TType _etype8;
- xfer += iprot->readSetBegin(_etype8, _size5);
- uint32_t _i9;
- for (_i9 = 0; _i9 < _size5; ++_i9)
+ uint32_t _size11;
+ ::apache::thrift::protocol::TType _etype14;
+ xfer += iprot->readSetBegin(_etype14, _size11);
+ uint32_t _i15;
+ for (_i15 = 0; _i15 < _size11; ++_i15)
{
- std::string _elem10;
- xfer += iprot->readString(_elem10);
- this->exports.insert(_elem10);
+ std::string _elem16;
+ xfer += iprot->readString(_elem16);
+ this->exports.insert(_elem16);
}
xfer += iprot->readSetEnd();
}
@@ -453,14 +473,14 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->preJobCommands.clear();
- uint32_t _size11;
- ::apache::thrift::protocol::TType _etype14;
- xfer += iprot->readListBegin(_etype14, _size11);
- this->preJobCommands.resize(_size11);
- uint32_t _i15;
- for (_i15 = 0; _i15 < _size11; ++_i15)
+ uint32_t _size17;
+ ::apache::thrift::protocol::TType _etype20;
+ xfer += iprot->readListBegin(_etype20, _size17);
+ this->preJobCommands.resize(_size17);
+ uint32_t _i21;
+ for (_i21 = 0; _i21 < _size17; ++_i21)
{
- xfer += iprot->readString(this->preJobCommands[_i15]);
+ xfer += iprot->readString(this->preJobCommands[_i21]);
}
xfer += iprot->readListEnd();
}
@@ -473,14 +493,14 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->postJobCommands.clear();
- uint32_t _size16;
- ::apache::thrift::protocol::TType _etype19;
- xfer += iprot->readListBegin(_etype19, _size16);
- this->postJobCommands.resize(_size16);
- uint32_t _i20;
- for (_i20 = 0; _i20 < _size16; ++_i20)
+ uint32_t _size22;
+ ::apache::thrift::protocol::TType _etype25;
+ xfer += iprot->readListBegin(_etype25, _size22);
+ this->postJobCommands.resize(_size22);
+ uint32_t _i26;
+ for (_i26 = 0; _i26 < _size22; ++_i26)
{
- xfer += iprot->readString(this->postJobCommands[_i20]);
+ xfer += iprot->readString(this->postJobCommands[_i26]);
}
xfer += iprot->readListEnd();
}
@@ -514,7 +534,7 @@ uint32_t GSISSHJobSubmission::read(::apache::thrift::protocol::TProtocol* iprot)
xfer += iprot->readStructEnd();
- if (!isset_gssishJobSubmissionID)
+ if (!isset_jobSubmissionDataID)
throw TProtocolException(TProtocolException::INVALID_DATA);
if (!isset_resourceJobManager)
throw TProtocolException(TProtocolException::INVALID_DATA);
@@ -525,8 +545,8 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
uint32_t xfer = 0;
xfer += oprot->writeStructBegin("GSISSHJobSubmission");
- xfer += oprot->writeFieldBegin("gssishJobSubmissionID", ::apache::thrift::protocol::T_STRING, 1);
- xfer += oprot->writeString(this->gssishJobSubmissionID);
+ xfer += oprot->writeFieldBegin("jobSubmissionDataID", ::apache::thrift::protocol::T_STRING, 1);
+ xfer += oprot->writeString(this->jobSubmissionDataID);
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("resourceJobManager", ::apache::thrift::protocol::T_I32, 2);
@@ -542,10 +562,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("exports", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->exports.size()));
- std::set<std::string> ::const_iterator _iter21;
- for (_iter21 = this->exports.begin(); _iter21 != this->exports.end(); ++_iter21)
+ std::set<std::string> ::const_iterator _iter27;
+ for (_iter27 = this->exports.begin(); _iter27 != this->exports.end(); ++_iter27)
{
- xfer += oprot->writeString((*_iter21));
+ xfer += oprot->writeString((*_iter27));
}
xfer += oprot->writeSetEnd();
}
@@ -555,10 +575,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("preJobCommands", ::apache::thrift::protocol::T_LIST, 5);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->preJobCommands.size()));
- std::vector<std::string> ::const_iterator _iter22;
- for (_iter22 = this->preJobCommands.begin(); _iter22 != this->preJobCommands.end(); ++_iter22)
+ std::vector<std::string> ::const_iterator _iter28;
+ for (_iter28 = this->preJobCommands.begin(); _iter28 != this->preJobCommands.end(); ++_iter28)
{
- xfer += oprot->writeString((*_iter22));
+ xfer += oprot->writeString((*_iter28));
}
xfer += oprot->writeListEnd();
}
@@ -568,10 +588,10 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
xfer += oprot->writeFieldBegin("postJobCommands", ::apache::thrift::protocol::T_LIST, 6);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->postJobCommands.size()));
- std::vector<std::string> ::const_iterator _iter23;
- for (_iter23 = this->postJobCommands.begin(); _iter23 != this->postJobCommands.end(); ++_iter23)
+ std::vector<std::string> ::const_iterator _iter29;
+ for (_iter29 = this->postJobCommands.begin(); _iter29 != this->postJobCommands.end(); ++_iter29)
{
- xfer += oprot->writeString((*_iter23));
+ xfer += oprot->writeString((*_iter29));
}
xfer += oprot->writeListEnd();
}
@@ -594,7 +614,7 @@ uint32_t GSISSHJobSubmission::write(::apache::thrift::protocol::TProtocol* oprot
void swap(GSISSHJobSubmission &a, GSISSHJobSubmission &b) {
using ::std::swap;
- swap(a.gssishJobSubmissionID, b.gssishJobSubmissionID);
+ swap(a.jobSubmissionDataID, b.jobSubmissionDataID);
swap(a.resourceJobManager, b.resourceJobManager);
swap(a.sshPort, b.sshPort);
swap(a.exports, b.exports);
@@ -661,15 +681,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->hostAliases.clear();
- uint32_t _size24;
- ::apache::thrift::protocol::TType _etype27;
- xfer += iprot->readSetBegin(_etype27, _size24);
- uint32_t _i28;
- for (_i28 = 0; _i28 < _size24; ++_i28)
+ uint32_t _size30;
+ ::apache::thrift::protocol::TType _etype33;
+ xfer += iprot->readSetBegin(_etype33, _size30);
+ uint32_t _i34;
+ for (_i34 = 0; _i34 < _size30; ++_i34)
{
- std::string _elem29;
- xfer += iprot->readString(_elem29);
- this->hostAliases.insert(_elem29);
+ std::string _elem35;
+ xfer += iprot->readString(_elem35);
+ this->hostAliases.insert(_elem35);
}
xfer += iprot->readSetEnd();
}
@@ -682,15 +702,15 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_SET) {
{
this->ipAddresses.clear();
- uint32_t _size30;
- ::apache::thrift::protocol::TType _etype33;
- xfer += iprot->readSetBegin(_etype33, _size30);
- uint32_t _i34;
- for (_i34 = 0; _i34 < _size30; ++_i34)
+ uint32_t _size36;
+ ::apache::thrift::protocol::TType _etype39;
+ xfer += iprot->readSetBegin(_etype39, _size36);
+ uint32_t _i40;
+ for (_i40 = 0; _i40 < _size36; ++_i40)
{
- std::string _elem35;
- xfer += iprot->readString(_elem35);
- this->ipAddresses.insert(_elem35);
+ std::string _elem41;
+ xfer += iprot->readString(_elem41);
+ this->ipAddresses.insert(_elem41);
}
xfer += iprot->readSetEnd();
}
@@ -727,19 +747,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->jobSubmissionProtocols.clear();
- uint32_t _size36;
- ::apache::thrift::protocol::TType _ktype37;
- ::apache::thrift::protocol::TType _vtype38;
- xfer += iprot->readMapBegin(_ktype37, _vtype38, _size36);
- uint32_t _i40;
- for (_i40 = 0; _i40 < _size36; ++_i40)
+ uint32_t _size42;
+ ::apache::thrift::protocol::TType _ktype43;
+ ::apache::thrift::protocol::TType _vtype44;
+ xfer += iprot->readMapBegin(_ktype43, _vtype44, _size42);
+ uint32_t _i46;
+ for (_i46 = 0; _i46 < _size42; ++_i46)
{
- std::string _key41;
- xfer += iprot->readString(_key41);
- JobSubmissionProtocol::type& _val42 = this->jobSubmissionProtocols[_key41];
- int32_t ecast43;
- xfer += iprot->readI32(ecast43);
- _val42 = (JobSubmissionProtocol::type)ecast43;
+ std::string _key47;
+ xfer += iprot->readString(_key47);
+ JobSubmissionProtocol::type& _val48 = this->jobSubmissionProtocols[_key47];
+ int32_t ecast49;
+ xfer += iprot->readI32(ecast49);
+ _val48 = (JobSubmissionProtocol::type)ecast49;
}
xfer += iprot->readMapEnd();
}
@@ -752,19 +772,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
if (ftype == ::apache::thrift::protocol::T_MAP) {
{
this->dataMovementProtocols.clear();
- uint32_t _size44;
- ::apache::thrift::protocol::TType _ktype45;
- ::apache::thrift::protocol::TType _vtype46;
- xfer += iprot->readMapBegin(_ktype45, _vtype46, _size44);
- uint32_t _i48;
- for (_i48 = 0; _i48 < _size44; ++_i48)
+ uint32_t _size50;
+ ::apache::thrift::protocol::TType _ktype51;
+ ::apache::thrift::protocol::TType _vtype52;
+ xfer += iprot->readMapBegin(_ktype51, _vtype52, _size50);
+ uint32_t _i54;
+ for (_i54 = 0; _i54 < _size50; ++_i54)
{
- std::string _key49;
- xfer += iprot->readString(_key49);
- DataMovementProtocol::type& _val50 = this->dataMovementProtocols[_key49];
- int32_t ecast51;
- xfer += iprot->readI32(ecast51);
- _val50 = (DataMovementProtocol::type)ecast51;
+ std::string _key55;
+ xfer += iprot->readString(_key55);
+ DataMovementProtocol::type& _val56 = this->dataMovementProtocols[_key55];
+ int32_t ecast57;
+ xfer += iprot->readI32(ecast57);
+ _val56 = (DataMovementProtocol::type)ecast57;
}
xfer += iprot->readMapEnd();
}
@@ -815,10 +835,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 4);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size()));
- std::set<std::string> ::const_iterator _iter52;
- for (_iter52 = this->hostAliases.begin(); _iter52 != this->hostAliases.end(); ++_iter52)
+ std::set<std::string> ::const_iterator _iter58;
+ for (_iter58 = this->hostAliases.begin(); _iter58 != this->hostAliases.end(); ++_iter58)
{
- xfer += oprot->writeString((*_iter52));
+ xfer += oprot->writeString((*_iter58));
}
xfer += oprot->writeSetEnd();
}
@@ -828,10 +848,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 5);
{
xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size()));
- std::set<std::string> ::const_iterator _iter53;
- for (_iter53 = this->ipAddresses.begin(); _iter53 != this->ipAddresses.end(); ++_iter53)
+ std::set<std::string> ::const_iterator _iter59;
+ for (_iter59 = this->ipAddresses.begin(); _iter59 != this->ipAddresses.end(); ++_iter59)
{
- xfer += oprot->writeString((*_iter53));
+ xfer += oprot->writeString((*_iter59));
}
xfer += oprot->writeSetEnd();
}
@@ -855,11 +875,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("jobSubmissionProtocols", ::apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->jobSubmissionProtocols.size()));
- std::map<std::string, JobSubmissionProtocol::type> ::const_iterator _iter54;
- for (_iter54 = this->jobSubmissionProtocols.begin(); _iter54 != this->jobSubmissionProtocols.end(); ++_iter54)
+ std::map<std::string, JobSubmissionProtocol::type> ::const_iterator _iter60;
+ for (_iter60 = this->jobSubmissionProtocols.begin(); _iter60 != this->jobSubmissionProtocols.end(); ++_iter60)
{
- xfer += oprot->writeString(_iter54->first);
- xfer += oprot->writeI32((int32_t)_iter54->second);
+ xfer += oprot->writeString(_iter60->first);
+ xfer += oprot->writeI32((int32_t)_iter60->second);
}
xfer += oprot->writeMapEnd();
}
@@ -868,11 +888,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeFieldBegin("dataMovementProtocols", ::apache::thrift::protocol::T_MAP, 10);
{
xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->dataMovementProtocols.size()));
- std::map<std::string, DataMovementProtocol::type> ::const_iterator _iter55;
- for (_iter55 = this->dataMovementProtocols.begin(); _iter55 != this->dataMovementProtocols.end(); ++_iter55)
+ std::map<std::string, DataMovementProtocol::type> ::const_iterator _iter61;
+ for (_iter61 = this->dataMovementProtocols.begin(); _iter61 != this->dataMovementProtocols.end(); ++_iter61)
{
- xfer += oprot->writeString(_iter55->first);
- xfer += oprot->writeI32((int32_t)_iter55->second);
+ xfer += oprot->writeString(_iter61->first);
+ xfer += oprot->writeI32((int32_t)_iter61->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1117,14 +1137,14 @@ uint32_t ApplicationInterface::read(::apache::thrift::protocol::TProtocol* iprot
if (ftype == ::apache::thrift::protocol::T_LIST) {
{
this->applicationDeployments.clear();
- uint32_t _size56;
- ::apache::thrift::protocol::TType _etype59;
- xfer += iprot->readListBegin(_etype59, _size56);
- this->applicationDeployments.resize(_size56);
- uint32_t _i60;
- for (_i60 = 0; _i60 < _size56; ++_i60)
+ uint32_t _size62;
+ ::apache::thrift::protocol::TType _etype65;
+ xfer += iprot->readListBegin(_etype65, _size62);
+ this->applicationDeployments.resize(_size62);
+ uint32_t _i66;
+ for (_i66 = 0; _i66 < _size62; ++_i66)
{
- xfer += this->applicationDeployments[_i60].read(iprot);
+ xfer += this->applicationDeployments[_i66].read(iprot);
}
xfer += iprot->readListEnd();
}
@@ -1164,10 +1184,10 @@ uint32_t ApplicationInterface::write(::apache::thrift::protocol::TProtocol* opro
xfer += oprot->writeFieldBegin("applicationDeployments", ::apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->applicationDeployments.size()));
- std::vector<ApplicationDeployment> ::const_iterator _iter61;
- for (_iter61 = this->applicationDeployments.begin(); _iter61 != this->applicationDeployments.end(); ++_iter61)
+ std::vector<ApplicationDeployment> ::const_iterator _iter67;
+ for (_iter67 = this->applicationDeployments.begin(); _iter67 != this->applicationDeployments.end(); ++_iter67)
{
- xfer += (*_iter61).write(oprot);
+ xfer += (*_iter67).write(oprot);
}
xfer += oprot->writeListEnd();
}