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 2016/02/24 21:08:07 UTC
[01/16] airavata git commit: Removing log message
Repository: airavata
Updated Branches:
refs/heads/master 6718650be -> e6d682711
Removing log message
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3a9a18af
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3a9a18af
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3a9a18af
Branch: refs/heads/master
Commit: 3a9a18af022f519d2be82e8d0e83020c48919664
Parents: fa6b4d8
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Fri Feb 19 14:20:40 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Fri Feb 19 14:20:40 2016 -0500
----------------------------------------------------------------------
.../airavata/credential/store/server/CredentialStoreServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3a9a18af/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index bb802ad..694680f 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@ -102,7 +102,7 @@ public class CredentialStoreServer implements IServer {
}.start();
} catch (TTransportException e) {
setStatus(ServerStatus.FAILED);
- logger.error("Error while starting the credential store service", e);
+// logger.error("Error while starting the credential store service", e);
throw new Exception("Error while starting the credential store service", e);
}
}
[04/16] airavata git commit: adding gateway usage reporting
AIRAVATA-1895
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 872b71f..4a057e9 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 9318707..ef67949 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 5d9e8a0..79a9d0f 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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");
@@ -72,6 +72,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private static final org.apache.thrift.protocol.TField CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("credentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourcePreferences", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField XSEDE_USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("xsedeUsageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -83,13 +84,15 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private String credentialStoreToken; // optional
private List<ComputeResourcePreference> computeResourcePreferences; // optional
private List<StoragePreference> storagePreferences; // optional
+ private String xsedeUsageReportingGatewayId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
GATEWAY_ID((short)1, "gatewayID"),
CREDENTIAL_STORE_TOKEN((short)2, "credentialStoreToken"),
COMPUTE_RESOURCE_PREFERENCES((short)3, "computeResourcePreferences"),
- STORAGE_PREFERENCES((short)4, "storagePreferences");
+ STORAGE_PREFERENCES((short)4, "storagePreferences"),
+ XSEDE_USAGE_REPORTING_GATEWAY_ID((short)5, "xsedeUsageReportingGatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -112,6 +115,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return COMPUTE_RESOURCE_PREFERENCES;
case 4: // STORAGE_PREFERENCES
return STORAGE_PREFERENCES;
+ case 5: // XSEDE_USAGE_REPORTING_GATEWAY_ID
+ return XSEDE_USAGE_REPORTING_GATEWAY_ID;
default:
return null;
}
@@ -152,7 +157,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES};
+ private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.XSEDE_USAGE_REPORTING_GATEWAY_ID};
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);
@@ -166,6 +171,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
tmpMap.put(_Fields.STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("storagePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoragePreference.class))));
+ tmpMap.put(_Fields.XSEDE_USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("xsedeUsageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayResourceProfile.class, metaDataMap);
}
@@ -204,6 +211,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
this.storagePreferences = __this__storagePreferences;
}
+ if (other.isSetXsedeUsageReportingGatewayId()) {
+ this.xsedeUsageReportingGatewayId = other.xsedeUsageReportingGatewayId;
+ }
}
public GatewayResourceProfile deepCopy() {
@@ -216,6 +226,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
this.credentialStoreToken = null;
this.computeResourcePreferences = null;
this.storagePreferences = null;
+ this.xsedeUsageReportingGatewayId = null;
}
public String getGatewayID() {
@@ -340,6 +351,29 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
+ public String getXsedeUsageReportingGatewayId() {
+ return this.xsedeUsageReportingGatewayId;
+ }
+
+ public void setXsedeUsageReportingGatewayId(String xsedeUsageReportingGatewayId) {
+ this.xsedeUsageReportingGatewayId = xsedeUsageReportingGatewayId;
+ }
+
+ public void unsetXsedeUsageReportingGatewayId() {
+ this.xsedeUsageReportingGatewayId = null;
+ }
+
+ /** Returns true if field xsedeUsageReportingGatewayId is set (has been assigned a value) and false otherwise */
+ public boolean isSetXsedeUsageReportingGatewayId() {
+ return this.xsedeUsageReportingGatewayId != null;
+ }
+
+ public void setXsedeUsageReportingGatewayIdIsSet(boolean value) {
+ if (!value) {
+ this.xsedeUsageReportingGatewayId = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case GATEWAY_ID:
@@ -374,6 +408,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
break;
+ case XSEDE_USAGE_REPORTING_GATEWAY_ID:
+ if (value == null) {
+ unsetXsedeUsageReportingGatewayId();
+ } else {
+ setXsedeUsageReportingGatewayId((String)value);
+ }
+ break;
+
}
}
@@ -391,6 +433,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
case STORAGE_PREFERENCES:
return getStoragePreferences();
+ case XSEDE_USAGE_REPORTING_GATEWAY_ID:
+ return getXsedeUsageReportingGatewayId();
+
}
throw new IllegalStateException();
}
@@ -410,6 +455,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return isSetComputeResourcePreferences();
case STORAGE_PREFERENCES:
return isSetStoragePreferences();
+ case XSEDE_USAGE_REPORTING_GATEWAY_ID:
+ return isSetXsedeUsageReportingGatewayId();
}
throw new IllegalStateException();
}
@@ -463,6 +510,15 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return false;
}
+ boolean this_present_xsedeUsageReportingGatewayId = true && this.isSetXsedeUsageReportingGatewayId();
+ boolean that_present_xsedeUsageReportingGatewayId = true && that.isSetXsedeUsageReportingGatewayId();
+ if (this_present_xsedeUsageReportingGatewayId || that_present_xsedeUsageReportingGatewayId) {
+ if (!(this_present_xsedeUsageReportingGatewayId && that_present_xsedeUsageReportingGatewayId))
+ return false;
+ if (!this.xsedeUsageReportingGatewayId.equals(that.xsedeUsageReportingGatewayId))
+ return false;
+ }
+
return true;
}
@@ -490,6 +546,11 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (present_storagePreferences)
list.add(storagePreferences);
+ boolean present_xsedeUsageReportingGatewayId = true && (isSetXsedeUsageReportingGatewayId());
+ list.add(present_xsedeUsageReportingGatewayId);
+ if (present_xsedeUsageReportingGatewayId)
+ list.add(xsedeUsageReportingGatewayId);
+
return list.hashCode();
}
@@ -541,6 +602,16 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetXsedeUsageReportingGatewayId()).compareTo(other.isSetXsedeUsageReportingGatewayId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetXsedeUsageReportingGatewayId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.xsedeUsageReportingGatewayId, other.xsedeUsageReportingGatewayId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -598,6 +669,16 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
first = false;
}
+ if (isSetXsedeUsageReportingGatewayId()) {
+ if (!first) sb.append(", ");
+ sb.append("xsedeUsageReportingGatewayId:");
+ if (this.xsedeUsageReportingGatewayId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.xsedeUsageReportingGatewayId);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -699,6 +780,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 5: // XSEDE_USAGE_REPORTING_GATEWAY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.xsedeUsageReportingGatewayId = iprot.readString();
+ struct.setXsedeUsageReportingGatewayIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -752,6 +841,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
oprot.writeFieldEnd();
}
}
+ if (struct.xsedeUsageReportingGatewayId != null) {
+ if (struct.isSetXsedeUsageReportingGatewayId()) {
+ oprot.writeFieldBegin(XSEDE_USAGE_REPORTING_GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.xsedeUsageReportingGatewayId);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -780,7 +876,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (struct.isSetStoragePreferences()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetXsedeUsageReportingGatewayId()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetCredentialStoreToken()) {
oprot.writeString(struct.credentialStoreToken);
}
@@ -802,6 +901,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
}
+ if (struct.isSetXsedeUsageReportingGatewayId()) {
+ oprot.writeString(struct.xsedeUsageReportingGatewayId);
+ }
}
@Override
@@ -809,7 +911,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.gatewayID = iprot.readString();
struct.setGatewayIDIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.credentialStoreToken = iprot.readString();
struct.setCredentialStoreTokenIsSet(true);
@@ -842,6 +944,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
struct.setStoragePreferencesIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.xsedeUsageReportingGatewayId = iprot.readString();
+ struct.setXsedeUsageReportingGatewayIdIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index b757b2d..255ba6d 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index c41f948..431dc39 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 5c490be..4b965d6 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 6efb3e7..f547b0a 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 06fb01e..b92399f 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 ab2119c..64bdcd9 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 e73157e..4f3de96 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 4bddfe0..2f89d85 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 661f543..751ac75 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index f0659c6..becbfc9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index a8a416e..c4e9f1a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index 12ce83c..dced6df 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
index 654a28d..6537665 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
index 8725646..7cfec4f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 4e0304e..69320ac 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 5fff620..1b70a15 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 bf47b25..6f79463 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 021603a..2ac4d87 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 f36643c..639b1b0 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 347fc16..f9c97a0 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 d1f2c4c..b64ad84 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 f43093c..3827da5 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 461ea69..03aa3da 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 8eee059..7c5da0a 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 622a539..a14c54f 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 b078a44..471ed71 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 39989f6..793740d 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 0f33b6d..9b8f4ec 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 0d6b216..d3e5f1c 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 484f0c1..9183b48 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 7711d95..59ceddb 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 4c501f3..931e6a1 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 3150197..4861d70 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 459f1f9..31c8a6c 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 2e4339d..5ae31da 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 23cbbb6..dab4a5c 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 887b4c1..bb3a527 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 17586d3..99c91ec 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 051e238..2c190b7 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 ac6443b..c018a29 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 01f1725d..56b3d30 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 c387843..5d4539f 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 40a0d65..bba5119 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 6fdd0cd..df5e3b4 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 3c3ab36..271461e 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 64ee7ab..7fc93db 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 285957d..8da297a 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 d1f194d..34cf318 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 bb19105..0d7aa71 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 5158419..fb789d5 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 c366a30..7bbda7e 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 0d2eb37..5f4aa7c 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
@@ -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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index f797f1e..ebffadd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
[13/16] airavata git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by ch...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b09ce0cf
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b09ce0cf
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b09ce0cf
Branch: refs/heads/master
Commit: b09ce0cf9a4c59e1a17d21b9deeec76d6e0a7112
Parents: 48e2593 f22acb8
Author: smarru <sm...@apache.org>
Authored: Wed Feb 24 12:02:42 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Wed Feb 24 12:02:42 2016 -0500
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 10 +-
.../server/util/CredentialStoreInitUtil.java | 156 +++++++++++++++++++
.../scripts/credential-store-h2.sql | 42 -----
.../scripts/credential-store-mysql.sql | 38 -----
.../src/main/resources/credstore-derby.sql | 39 +++++
.../src/main/resources/credstore-mysql.sql | 39 +++++
.../src/main/resources/expcatalog-derby.sql | 21 +--
.../src/main/resources/expcatalog-mysql.sql | 21 +--
8 files changed, 242 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
[10/16] airavata git commit: Moving usage reporting gateway id into
resource preference
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
index 21f66d5..6a2ac8b 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
@@ -42,7 +42,6 @@ public class GatewayProfileResource extends AppCatAbstractResource {
private Timestamp createdTime;
private Timestamp updatedTime;
private String credentialStoreToken;
- private String usageReportingGWId;
public Timestamp getCreatedTime() {
return createdTime;
@@ -64,14 +63,6 @@ public class GatewayProfileResource extends AppCatAbstractResource {
return credentialStoreToken;
}
- public String getUsageReportingGWId() {
- return usageReportingGWId;
- }
-
- public void setUsageReportingGWId(String usageReportingGWId) {
- this.usageReportingGWId = usageReportingGWId;
- }
-
public void setCredentialStoreToken(String credentialStoreToken) {
this.credentialStoreToken = credentialStoreToken;
}
@@ -324,7 +315,6 @@ public class GatewayProfileResource extends AppCatAbstractResource {
em.getTransaction().begin();
if (existingGatewayProfile != null) {
existingGatewayProfile.setUpdateTime(AiravataUtils.getCurrentTimestamp());
- existingGatewayProfile.setUsageReportingGWId(getUsageReportingGWId());
if (credentialStoreToken != null){
existingGatewayProfile.setCredentialStoreToken(credentialStoreToken);
}
@@ -332,7 +322,6 @@ public class GatewayProfileResource extends AppCatAbstractResource {
} else {
GatewayProfile gatewayProfile = new GatewayProfile();
gatewayProfile.setGatewayID(gatewayID);
- gatewayProfile.setUsageReportingGWId(usageReportingGWId);
gatewayProfile.setCreationTime(AiravataUtils.getCurrentTimestamp());
if (credentialStoreToken != null){
gatewayProfile.setCredentialStoreToken(credentialStoreToken);
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index a754114..d5e7549 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -845,7 +845,6 @@ public class AppCatalogJPAUtils {
resource.setGatewayID(o.getGatewayID());
resource.setCreatedTime(o.getCreationTime());
resource.setCredentialStoreToken(o.getCredentialStoreToken());
- resource.setUsageReportingGWId(o.getUsageReportingGWId());
if (o.getUpdateTime() != null) {
resource.setUpdatedTime(o.getUpdateTime());
}
@@ -866,6 +865,7 @@ public class AppCatalogJPAUtils {
resource.setProjectNumber(o.getProjectNumber());
resource.setLoginUserName(o.getLoginUserName());
resource.setResourceCSToken(o.getComputeResourceCSToken());
+ resource.setUsageReportingGatewayId(o.getUsageReportingGWId());
resource.setComputeHostResource((ComputeResourceResource) createComputeResource(o.getComputeHostResource()));
resource.setGatewayProfile((GatewayProfileResource) createGatewayProfile(o.getGatewayProfile()));
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 770e29c..b788109 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -819,6 +819,7 @@ public class AppCatalogThriftConversion {
preference.setAllocationProjectNumber(resource.getProjectNumber());
preference.setLoginUserName(resource.getLoginUserName());
preference.setResourceSpecificCredentialStoreToken(resource.getResourceCSToken());
+ preference.setUsageReportingGatewayId(resource.getGatewayId());
return preference;
}
@@ -857,7 +858,6 @@ public class AppCatalogThriftConversion {
gatewayProfile.setCredentialStoreToken(gw.getCredentialStoreToken());
gatewayProfile.setComputeResourcePreferences(preferences);
gatewayProfile.setStoragePreferences(storagePreferences);
- gatewayProfile.setUsageReportingGatewayId(gw.getUsageReportingGWId());
return gatewayProfile;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index f08ed83..078cd73 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -323,7 +323,6 @@ CREATE TABLE GATEWAY_PROFILE
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
CS_TOKEN VARCHAR (255),
- USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID)
);
@@ -339,6 +338,7 @@ CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
ALLOCATION_PROJECT_NUMBER VARCHAR(255),
LOGIN_USERNAME VARCHAR(255),
RESOURCE_CS_TOKEN VARCHAR(255),
+ USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index a201897..25024f5 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -321,7 +321,6 @@ CREATE TABLE GATEWAY_PROFILE
CREATION_TIME TIMESTAMP DEFAULT NOW(),
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
CS_TOKEN VARCHAR (255),
- USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID)
);
@@ -337,6 +336,7 @@ CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
ALLOCATION_PROJECT_NUMBER VARCHAR(255),
LOGIN_USERNAME VARCHAR(255),
RESOURCE_CS_TOKEN VARCHAR(255),
+ USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
index 9447e97..23074f6 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
@@ -69,7 +69,8 @@ struct ComputeResourcePreference {
6: optional string preferredBatchQueue,
7: optional string scratchLocation,
8: optional string allocationProjectNumber,
- 9: optional string resourceSpecificCredentialStoreToken
+ 9: optional string resourceSpecificCredentialStoreToken,
+ 10: optional string usageReportingGatewayId
}
struct StoragePreference {
@@ -96,6 +97,5 @@ struct GatewayResourceProfile {
1: required string gatewayID,
2: optional string credentialStoreToken,
3: optional list<ComputeResourcePreference> computeResourcePreferences,
- 4: optional list<StoragePreference> storagePreferences,
- 5: optional string usageReportingGatewayId
+ 4: optional list<StoragePreference> storagePreferences
}
[12/16] airavata git commit: Moving usage reporting gateway id into
resource preference
Posted by ch...@apache.org.
Moving usage reporting gateway id into resource preference
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/48e2593e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/48e2593e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/48e2593e
Branch: refs/heads/master
Commit: 48e2593ec724cea9861ce27ff47c3aced2a56349
Parents: e303bb5
Author: smarru <sm...@apache.org>
Authored: Wed Feb 24 12:02:15 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Wed Feb 24 12:02:16 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../gateway_resource_profile_model_types.cpp | 44 +++----
.../gateway_resource_profile_model_types.h | 24 ++--
.../Model/AppCatalog/GatewayProfile/Types.php | 46 ++++----
.../model/appcatalog/gatewayprofile/ttypes.py | 30 ++---
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 116 ++++++++++++++++++-
.../gatewayprofile/GatewayResourceProfile.java | 116 +------------------
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.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 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.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 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.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 +-
.../catalog/impl/GwyResourceProfileImpl.java | 6 +-
.../model/ComputeResourcePreference.java | 10 ++
.../core/app/catalog/model/GatewayProfile.java | 11 --
.../ComputeHostPreferenceResource.java | 11 ++
.../resources/GatewayProfileResource.java | 11 --
.../app/catalog/util/AppCatalogJPAUtils.java | 2 +-
.../util/AppCatalogThriftConversion.java | 2 +-
.../src/main/resources/appcatalog-derby.sql | 2 +-
.../src/main/resources/appcatalog-mysql.sql | 2 +-
.../gateway_resource_profile_model.thrift | 6 +-
97 files changed, 300 insertions(+), 301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 828c8b4..9f1ebc4 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index 70d5ff6..544b525 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -78,6 +78,11 @@ void ComputeResourcePreference::__set_resourceSpecificCredentialStoreToken(const
__isset.resourceSpecificCredentialStoreToken = true;
}
+void ComputeResourcePreference::__set_usageReportingGatewayId(const std::string& val) {
+ this->usageReportingGatewayId = val;
+__isset.usageReportingGatewayId = true;
+}
+
uint32_t ComputeResourcePreference::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -177,6 +182,14 @@ uint32_t ComputeResourcePreference::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
+ case 10:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->usageReportingGatewayId);
+ this->__isset.usageReportingGatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -241,6 +254,11 @@ uint32_t ComputeResourcePreference::write(::apache::thrift::protocol::TProtocol*
xfer += oprot->writeString(this->resourceSpecificCredentialStoreToken);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.usageReportingGatewayId) {
+ xfer += oprot->writeFieldBegin("usageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 10);
+ xfer += oprot->writeString(this->usageReportingGatewayId);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -257,6 +275,7 @@ void swap(ComputeResourcePreference &a, ComputeResourcePreference &b) {
swap(a.scratchLocation, b.scratchLocation);
swap(a.allocationProjectNumber, b.allocationProjectNumber);
swap(a.resourceSpecificCredentialStoreToken, b.resourceSpecificCredentialStoreToken);
+ swap(a.usageReportingGatewayId, b.usageReportingGatewayId);
swap(a.__isset, b.__isset);
}
@@ -270,6 +289,7 @@ ComputeResourcePreference::ComputeResourcePreference(const ComputeResourcePrefer
scratchLocation = other2.scratchLocation;
allocationProjectNumber = other2.allocationProjectNumber;
resourceSpecificCredentialStoreToken = other2.resourceSpecificCredentialStoreToken;
+ usageReportingGatewayId = other2.usageReportingGatewayId;
__isset = other2.__isset;
}
ComputeResourcePreference& ComputeResourcePreference::operator=(const ComputeResourcePreference& other3) {
@@ -282,6 +302,7 @@ ComputeResourcePreference& ComputeResourcePreference::operator=(const ComputeRes
scratchLocation = other3.scratchLocation;
allocationProjectNumber = other3.allocationProjectNumber;
resourceSpecificCredentialStoreToken = other3.resourceSpecificCredentialStoreToken;
+ usageReportingGatewayId = other3.usageReportingGatewayId;
__isset = other3.__isset;
return *this;
}
@@ -297,6 +318,7 @@ void ComputeResourcePreference::printTo(std::ostream& out) const {
out << ", " << "scratchLocation="; (__isset.scratchLocation ? (out << to_string(scratchLocation)) : (out << "<null>"));
out << ", " << "allocationProjectNumber="; (__isset.allocationProjectNumber ? (out << to_string(allocationProjectNumber)) : (out << "<null>"));
out << ", " << "resourceSpecificCredentialStoreToken="; (__isset.resourceSpecificCredentialStoreToken ? (out << to_string(resourceSpecificCredentialStoreToken)) : (out << "<null>"));
+ out << ", " << "usageReportingGatewayId="; (__isset.usageReportingGatewayId ? (out << to_string(usageReportingGatewayId)) : (out << "<null>"));
out << ")";
}
@@ -479,11 +501,6 @@ void GatewayResourceProfile::__set_storagePreferences(const std::vector<StorageP
__isset.storagePreferences = true;
}
-void GatewayResourceProfile::__set_usageReportingGatewayId(const std::string& val) {
- this->usageReportingGatewayId = val;
-__isset.usageReportingGatewayId = true;
-}
-
uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -562,14 +579,6 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
xfer += iprot->skip(ftype);
}
break;
- case 5:
- if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->usageReportingGatewayId);
- this->__isset.usageReportingGatewayId = true;
- } else {
- xfer += iprot->skip(ftype);
- }
- break;
default:
xfer += iprot->skip(ftype);
break;
@@ -624,11 +633,6 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.usageReportingGatewayId) {
- xfer += oprot->writeFieldBegin("usageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 5);
- xfer += oprot->writeString(this->usageReportingGatewayId);
- xfer += oprot->writeFieldEnd();
- }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -640,7 +644,6 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
swap(a.storagePreferences, b.storagePreferences);
- swap(a.usageReportingGatewayId, b.usageReportingGatewayId);
swap(a.__isset, b.__isset);
}
@@ -649,7 +652,6 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
storagePreferences = other18.storagePreferences;
- usageReportingGatewayId = other18.usageReportingGatewayId;
__isset = other18.__isset;
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
@@ -657,7 +659,6 @@ GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceP
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
storagePreferences = other19.storagePreferences;
- usageReportingGatewayId = other19.usageReportingGatewayId;
__isset = other19.__isset;
return *this;
}
@@ -668,7 +669,6 @@ void GatewayResourceProfile::printTo(std::ostream& out) const {
out << ", " << "credentialStoreToken="; (__isset.credentialStoreToken ? (out << to_string(credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (__isset.computeResourcePreferences ? (out << to_string(computeResourcePreferences)) : (out << "<null>"));
out << ", " << "storagePreferences="; (__isset.storagePreferences ? (out << to_string(storagePreferences)) : (out << "<null>"));
- out << ", " << "usageReportingGatewayId="; (__isset.usageReportingGatewayId ? (out << to_string(usageReportingGatewayId)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index d24a778..e570976 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -45,7 +45,7 @@ class StoragePreference;
class GatewayResourceProfile;
typedef struct _ComputeResourcePreference__isset {
- _ComputeResourcePreference__isset() : loginUserName(false), preferredJobSubmissionProtocol(false), preferredDataMovementProtocol(false), preferredBatchQueue(false), scratchLocation(false), allocationProjectNumber(false), resourceSpecificCredentialStoreToken(false) {}
+ _ComputeResourcePreference__isset() : loginUserName(false), preferredJobSubmissionProtocol(false), preferredDataMovementProtocol(false), preferredBatchQueue(false), scratchLocation(false), allocationProjectNumber(false), resourceSpecificCredentialStoreToken(false), usageReportingGatewayId(false) {}
bool loginUserName :1;
bool preferredJobSubmissionProtocol :1;
bool preferredDataMovementProtocol :1;
@@ -53,6 +53,7 @@ typedef struct _ComputeResourcePreference__isset {
bool scratchLocation :1;
bool allocationProjectNumber :1;
bool resourceSpecificCredentialStoreToken :1;
+ bool usageReportingGatewayId :1;
} _ComputeResourcePreference__isset;
class ComputeResourcePreference {
@@ -60,7 +61,7 @@ class ComputeResourcePreference {
ComputeResourcePreference(const ComputeResourcePreference&);
ComputeResourcePreference& operator=(const ComputeResourcePreference&);
- ComputeResourcePreference() : computeResourceId(), overridebyAiravata(true), loginUserName(), preferredJobSubmissionProtocol(( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)0), preferredDataMovementProtocol(( ::apache::airavata::model::data::movement::DataMovementProtocol::type)0), preferredBatchQueue(), scratchLocation(), allocationProjectNumber(), resourceSpecificCredentialStoreToken() {
+ ComputeResourcePreference() : computeResourceId(), overridebyAiravata(true), loginUserName(), preferredJobSubmissionProtocol(( ::apache::airavata::model::appcatalog::computeresource::JobSubmissionProtocol::type)0), preferredDataMovementProtocol(( ::apache::airavata::model::data::movement::DataMovementProtocol::type)0), preferredBatchQueue(), scratchLocation(), allocationProjectNumber(), resourceSpecificCredentialStoreToken(), usageReportingGatewayId() {
}
virtual ~ComputeResourcePreference() throw();
@@ -73,6 +74,7 @@ class ComputeResourcePreference {
std::string scratchLocation;
std::string allocationProjectNumber;
std::string resourceSpecificCredentialStoreToken;
+ std::string usageReportingGatewayId;
_ComputeResourcePreference__isset __isset;
@@ -94,6 +96,8 @@ class ComputeResourcePreference {
void __set_resourceSpecificCredentialStoreToken(const std::string& val);
+ void __set_usageReportingGatewayId(const std::string& val);
+
bool operator == (const ComputeResourcePreference & rhs) const
{
if (!(computeResourceId == rhs.computeResourceId))
@@ -128,6 +132,10 @@ class ComputeResourcePreference {
return false;
else if (__isset.resourceSpecificCredentialStoreToken && !(resourceSpecificCredentialStoreToken == rhs.resourceSpecificCredentialStoreToken))
return false;
+ if (__isset.usageReportingGatewayId != rhs.__isset.usageReportingGatewayId)
+ return false;
+ else if (__isset.usageReportingGatewayId && !(usageReportingGatewayId == rhs.usageReportingGatewayId))
+ return false;
return true;
}
bool operator != (const ComputeResourcePreference &rhs) const {
@@ -220,11 +228,10 @@ inline std::ostream& operator<<(std::ostream& out, const StoragePreference& obj)
}
typedef struct _GatewayResourceProfile__isset {
- _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false), usageReportingGatewayId(false) {}
+ _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false) {}
bool credentialStoreToken :1;
bool computeResourcePreferences :1;
bool storagePreferences :1;
- bool usageReportingGatewayId :1;
} _GatewayResourceProfile__isset;
class GatewayResourceProfile {
@@ -232,7 +239,7 @@ class GatewayResourceProfile {
GatewayResourceProfile(const GatewayResourceProfile&);
GatewayResourceProfile& operator=(const GatewayResourceProfile&);
- GatewayResourceProfile() : gatewayID(), credentialStoreToken(), usageReportingGatewayId() {
+ GatewayResourceProfile() : gatewayID(), credentialStoreToken() {
}
virtual ~GatewayResourceProfile() throw();
@@ -240,7 +247,6 @@ class GatewayResourceProfile {
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
std::vector<StoragePreference> storagePreferences;
- std::string usageReportingGatewayId;
_GatewayResourceProfile__isset __isset;
@@ -252,8 +258,6 @@ class GatewayResourceProfile {
void __set_storagePreferences(const std::vector<StoragePreference> & val);
- void __set_usageReportingGatewayId(const std::string& val);
-
bool operator == (const GatewayResourceProfile & rhs) const
{
if (!(gatewayID == rhs.gatewayID))
@@ -270,10 +274,6 @@ class GatewayResourceProfile {
return false;
else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
return false;
- if (__isset.usageReportingGatewayId != rhs.__isset.usageReportingGatewayId)
- return false;
- else if (__isset.usageReportingGatewayId && !(usageReportingGatewayId == rhs.usageReportingGatewayId))
- return false;
return true;
}
bool operator != (const GatewayResourceProfile &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 37e7837..7f0d412 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -90,6 +90,10 @@ class ComputeResourcePreference {
* @var string
*/
public $resourceSpecificCredentialStoreToken = null;
+ /**
+ * @var string
+ */
+ public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -130,6 +134,10 @@ class ComputeResourcePreference {
'var' => 'resourceSpecificCredentialStoreToken',
'type' => TType::STRING,
),
+ 10 => array(
+ 'var' => 'usageReportingGatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -160,6 +168,9 @@ class ComputeResourcePreference {
if (isset($vals['resourceSpecificCredentialStoreToken'])) {
$this->resourceSpecificCredentialStoreToken = $vals['resourceSpecificCredentialStoreToken'];
}
+ if (isset($vals['usageReportingGatewayId'])) {
+ $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
+ }
}
}
@@ -245,6 +256,13 @@ class ComputeResourcePreference {
$xfer += $input->skip($ftype);
}
break;
+ case 10:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->usageReportingGatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -303,6 +321,11 @@ class ComputeResourcePreference {
$xfer += $output->writeString($this->resourceSpecificCredentialStoreToken);
$xfer += $output->writeFieldEnd();
}
+ if ($this->usageReportingGatewayId !== null) {
+ $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 10);
+ $xfer += $output->writeString($this->usageReportingGatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -486,10 +509,6 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
- /**
- * @var string
- */
- public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -520,10 +539,6 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
- 5 => array(
- 'var' => 'usageReportingGatewayId',
- 'type' => TType::STRING,
- ),
);
}
if (is_array($vals)) {
@@ -539,9 +554,6 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['usageReportingGatewayId'])) {
- $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
- }
}
}
@@ -614,13 +626,6 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
- case 5:
- if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->usageReportingGatewayId);
- } else {
- $xfer += $input->skip($ftype);
- }
- break;
default:
$xfer += $input->skip($ftype);
break;
@@ -678,11 +683,6 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->usageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->usageReportingGatewayId);
- $xfer += $output->writeFieldEnd();
- }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index ddd0723..9755340 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -65,6 +65,7 @@ class ComputeResourcePreference:
- scratchLocation
- allocationProjectNumber
- resourceSpecificCredentialStoreToken
+ - usageReportingGatewayId
"""
thrift_spec = (
@@ -78,9 +79,10 @@ class ComputeResourcePreference:
(7, TType.STRING, 'scratchLocation', None, None, ), # 7
(8, TType.STRING, 'allocationProjectNumber', None, None, ), # 8
(9, TType.STRING, 'resourceSpecificCredentialStoreToken', None, None, ), # 9
+ (10, TType.STRING, 'usageReportingGatewayId', None, None, ), # 10
)
- def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None,):
+ def __init__(self, computeResourceId=None, overridebyAiravata=thrift_spec[2][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None,):
self.computeResourceId = computeResourceId
self.overridebyAiravata = overridebyAiravata
self.loginUserName = loginUserName
@@ -90,6 +92,7 @@ class ComputeResourcePreference:
self.scratchLocation = scratchLocation
self.allocationProjectNumber = allocationProjectNumber
self.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken
+ self.usageReportingGatewayId = usageReportingGatewayId
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:
@@ -145,6 +148,11 @@ class ComputeResourcePreference:
self.resourceSpecificCredentialStoreToken = iprot.readString()
else:
iprot.skip(ftype)
+ elif fid == 10:
+ if ftype == TType.STRING:
+ self.usageReportingGatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -191,6 +199,10 @@ class ComputeResourcePreference:
oprot.writeFieldBegin('resourceSpecificCredentialStoreToken', TType.STRING, 9)
oprot.writeString(self.resourceSpecificCredentialStoreToken)
oprot.writeFieldEnd()
+ if self.usageReportingGatewayId is not None:
+ oprot.writeFieldBegin('usageReportingGatewayId', TType.STRING, 10)
+ oprot.writeString(self.usageReportingGatewayId)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -213,6 +225,7 @@ class ComputeResourcePreference:
value = (value * 31) ^ hash(self.scratchLocation)
value = (value * 31) ^ hash(self.allocationProjectNumber)
value = (value * 31) ^ hash(self.resourceSpecificCredentialStoreToken)
+ value = (value * 31) ^ hash(self.usageReportingGatewayId)
return value
def __repr__(self):
@@ -351,7 +364,6 @@ class GatewayResourceProfile:
- credentialStoreToken
- computeResourcePreferences
- storagePreferences
- - usageReportingGatewayId
"""
thrift_spec = (
@@ -360,15 +372,13 @@ class GatewayResourceProfile:
(2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
(3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
(4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
- (5, TType.STRING, 'usageReportingGatewayId', None, None, ), # 5
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None, usageReportingGatewayId=None,):
+ def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None,):
self.gatewayID = gatewayID
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
self.storagePreferences = storagePreferences
- self.usageReportingGatewayId = usageReportingGatewayId
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:
@@ -411,11 +421,6 @@ class GatewayResourceProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
- elif fid == 5:
- if ftype == TType.STRING:
- self.usageReportingGatewayId = iprot.readString()
- else:
- iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -448,10 +453,6 @@ class GatewayResourceProfile:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.usageReportingGatewayId is not None:
- oprot.writeFieldBegin('usageReportingGatewayId', TType.STRING, 5)
- oprot.writeString(self.usageReportingGatewayId)
- oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -467,7 +468,6 @@ class GatewayResourceProfile:
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
value = (value * 31) ^ hash(self.storagePreferences)
- value = (value * 31) ^ hash(self.usageReportingGatewayId)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index 9ce3882..f3d6395 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index fbdba25..681e161 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index d1d2efc..30a7001 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 778f245..586b3f9 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index 053bbd4..180ed8a 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index 9ba3d45..4cbb384 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 8176d8c..8ad556e 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 bf8e8b3..22e4a62 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index f04f144..27185f4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 91d5fd8..90abf0b 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
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 e567ff0..a968715 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 7559a07..43e2084 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 6148630..ffb8e4b 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 5c4511c..91fc6ef 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 024f506..5d1f786 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 a277ca3..9ee2d14 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 357f791..a320fd6 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 d695b54..4b4c67c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 cc74357..9cf626e 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 4a057e9..81574f5 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 ef67949..3d9d990 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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");
@@ -98,6 +98,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
private static final org.apache.thrift.protocol.TField SCRATCH_LOCATION_FIELD_DESC = new org.apache.thrift.protocol.TField("scratchLocation", org.apache.thrift.protocol.TType.STRING, (short)7);
private static final org.apache.thrift.protocol.TField ALLOCATION_PROJECT_NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("allocationProjectNumber", org.apache.thrift.protocol.TType.STRING, (short)8);
private static final org.apache.thrift.protocol.TField RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceSpecificCredentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)9);
+ private static final org.apache.thrift.protocol.TField USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("usageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)10);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -114,6 +115,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
private String scratchLocation; // optional
private String allocationProjectNumber; // optional
private String resourceSpecificCredentialStoreToken; // optional
+ private String usageReportingGatewayId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -133,7 +135,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
PREFERRED_BATCH_QUEUE((short)6, "preferredBatchQueue"),
SCRATCH_LOCATION((short)7, "scratchLocation"),
ALLOCATION_PROJECT_NUMBER((short)8, "allocationProjectNumber"),
- RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)9, "resourceSpecificCredentialStoreToken");
+ RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)9, "resourceSpecificCredentialStoreToken"),
+ USAGE_REPORTING_GATEWAY_ID((short)10, "usageReportingGatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -166,6 +169,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
return ALLOCATION_PROJECT_NUMBER;
case 9: // RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN
return RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN;
+ case 10: // USAGE_REPORTING_GATEWAY_ID
+ return USAGE_REPORTING_GATEWAY_ID;
default:
return null;
}
@@ -208,7 +213,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
// isset id assignments
private static final int __OVERRIDEBYAIRAVATA_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN};
+ private static final _Fields optionals[] = {_Fields.LOGIN_USER_NAME,_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER,_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN,_Fields.USAGE_REPORTING_GATEWAY_ID};
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);
@@ -230,6 +235,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("resourceSpecificCredentialStoreToken", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("usageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourcePreference.class, metaDataMap);
}
@@ -279,6 +286,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
if (other.isSetResourceSpecificCredentialStoreToken()) {
this.resourceSpecificCredentialStoreToken = other.resourceSpecificCredentialStoreToken;
}
+ if (other.isSetUsageReportingGatewayId()) {
+ this.usageReportingGatewayId = other.usageReportingGatewayId;
+ }
}
public ComputeResourcePreference deepCopy() {
@@ -297,6 +307,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
this.scratchLocation = null;
this.allocationProjectNumber = null;
this.resourceSpecificCredentialStoreToken = null;
+ this.usageReportingGatewayId = null;
}
public String getComputeResourceId() {
@@ -521,6 +532,29 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
}
}
+ public String getUsageReportingGatewayId() {
+ return this.usageReportingGatewayId;
+ }
+
+ public void setUsageReportingGatewayId(String usageReportingGatewayId) {
+ this.usageReportingGatewayId = usageReportingGatewayId;
+ }
+
+ public void unsetUsageReportingGatewayId() {
+ this.usageReportingGatewayId = null;
+ }
+
+ /** Returns true if field usageReportingGatewayId is set (has been assigned a value) and false otherwise */
+ public boolean isSetUsageReportingGatewayId() {
+ return this.usageReportingGatewayId != null;
+ }
+
+ public void setUsageReportingGatewayIdIsSet(boolean value) {
+ if (!value) {
+ this.usageReportingGatewayId = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case COMPUTE_RESOURCE_ID:
@@ -595,6 +629,14 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
}
break;
+ case USAGE_REPORTING_GATEWAY_ID:
+ if (value == null) {
+ unsetUsageReportingGatewayId();
+ } else {
+ setUsageReportingGatewayId((String)value);
+ }
+ break;
+
}
}
@@ -627,6 +669,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
return getResourceSpecificCredentialStoreToken();
+ case USAGE_REPORTING_GATEWAY_ID:
+ return getUsageReportingGatewayId();
+
}
throw new IllegalStateException();
}
@@ -656,6 +701,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
return isSetAllocationProjectNumber();
case RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN:
return isSetResourceSpecificCredentialStoreToken();
+ case USAGE_REPORTING_GATEWAY_ID:
+ return isSetUsageReportingGatewayId();
}
throw new IllegalStateException();
}
@@ -754,6 +801,15 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
return false;
}
+ boolean this_present_usageReportingGatewayId = true && this.isSetUsageReportingGatewayId();
+ boolean that_present_usageReportingGatewayId = true && that.isSetUsageReportingGatewayId();
+ if (this_present_usageReportingGatewayId || that_present_usageReportingGatewayId) {
+ if (!(this_present_usageReportingGatewayId && that_present_usageReportingGatewayId))
+ return false;
+ if (!this.usageReportingGatewayId.equals(that.usageReportingGatewayId))
+ return false;
+ }
+
return true;
}
@@ -806,6 +862,11 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
if (present_resourceSpecificCredentialStoreToken)
list.add(resourceSpecificCredentialStoreToken);
+ boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId());
+ list.add(present_usageReportingGatewayId);
+ if (present_usageReportingGatewayId)
+ list.add(usageReportingGatewayId);
+
return list.hashCode();
}
@@ -907,6 +968,16 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUsageReportingGatewayId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usageReportingGatewayId, other.usageReportingGatewayId);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1008,6 +1079,16 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
}
first = false;
}
+ if (isSetUsageReportingGatewayId()) {
+ if (!first) sb.append(", ");
+ sb.append("usageReportingGatewayId:");
+ if (this.usageReportingGatewayId == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.usageReportingGatewayId);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1133,6 +1214,14 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 10: // USAGE_REPORTING_GATEWAY_ID
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.usageReportingGatewayId = iprot.readString();
+ struct.setUsageReportingGatewayIdIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1203,6 +1292,13 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
oprot.writeFieldEnd();
}
}
+ if (struct.usageReportingGatewayId != null) {
+ if (struct.isSetUsageReportingGatewayId()) {
+ oprot.writeFieldBegin(USAGE_REPORTING_GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.usageReportingGatewayId);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1244,7 +1340,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
if (struct.isSetResourceSpecificCredentialStoreToken()) {
optionals.set(6);
}
- oprot.writeBitSet(optionals, 7);
+ if (struct.isSetUsageReportingGatewayId()) {
+ optionals.set(7);
+ }
+ oprot.writeBitSet(optionals, 8);
if (struct.isSetLoginUserName()) {
oprot.writeString(struct.loginUserName);
}
@@ -1266,6 +1365,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
if (struct.isSetResourceSpecificCredentialStoreToken()) {
oprot.writeString(struct.resourceSpecificCredentialStoreToken);
}
+ if (struct.isSetUsageReportingGatewayId()) {
+ oprot.writeString(struct.usageReportingGatewayId);
+ }
}
@Override
@@ -1275,7 +1377,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
struct.setComputeResourceIdIsSet(true);
struct.overridebyAiravata = iprot.readBool();
struct.setOverridebyAiravataIsSet(true);
- BitSet incoming = iprot.readBitSet(7);
+ BitSet incoming = iprot.readBitSet(8);
if (incoming.get(0)) {
struct.loginUserName = iprot.readString();
struct.setLoginUserNameIsSet(true);
@@ -1304,6 +1406,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput
struct.resourceSpecificCredentialStoreToken = iprot.readString();
struct.setResourceSpecificCredentialStoreTokenIsSet(true);
}
+ if (incoming.get(7)) {
+ struct.usageReportingGatewayId = iprot.readString();
+ struct.setUsageReportingGatewayIdIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 ea29157..faefdf4 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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");
@@ -72,7 +72,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private static final org.apache.thrift.protocol.TField CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("credentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourcePreferences", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
- private static final org.apache.thrift.protocol.TField USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("usageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -84,15 +83,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private String credentialStoreToken; // optional
private List<ComputeResourcePreference> computeResourcePreferences; // optional
private List<StoragePreference> storagePreferences; // optional
- private String usageReportingGatewayId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
GATEWAY_ID((short)1, "gatewayID"),
CREDENTIAL_STORE_TOKEN((short)2, "credentialStoreToken"),
COMPUTE_RESOURCE_PREFERENCES((short)3, "computeResourcePreferences"),
- STORAGE_PREFERENCES((short)4, "storagePreferences"),
- USAGE_REPORTING_GATEWAY_ID((short)5, "usageReportingGatewayId");
+ STORAGE_PREFERENCES((short)4, "storagePreferences");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -115,8 +112,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return COMPUTE_RESOURCE_PREFERENCES;
case 4: // STORAGE_PREFERENCES
return STORAGE_PREFERENCES;
- case 5: // USAGE_REPORTING_GATEWAY_ID
- return USAGE_REPORTING_GATEWAY_ID;
default:
return null;
}
@@ -157,7 +152,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.USAGE_REPORTING_GATEWAY_ID};
+ private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES};
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);
@@ -171,8 +166,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
tmpMap.put(_Fields.STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("storagePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoragePreference.class))));
- tmpMap.put(_Fields.USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("usageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayResourceProfile.class, metaDataMap);
}
@@ -211,9 +204,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
this.storagePreferences = __this__storagePreferences;
}
- if (other.isSetUsageReportingGatewayId()) {
- this.usageReportingGatewayId = other.usageReportingGatewayId;
- }
}
public GatewayResourceProfile deepCopy() {
@@ -226,7 +216,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
this.credentialStoreToken = null;
this.computeResourcePreferences = null;
this.storagePreferences = null;
- this.usageReportingGatewayId = null;
}
public String getGatewayID() {
@@ -351,29 +340,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
- public String getUsageReportingGatewayId() {
- return this.usageReportingGatewayId;
- }
-
- public void setUsageReportingGatewayId(String usageReportingGatewayId) {
- this.usageReportingGatewayId = usageReportingGatewayId;
- }
-
- public void unsetUsageReportingGatewayId() {
- this.usageReportingGatewayId = null;
- }
-
- /** Returns true if field usageReportingGatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetUsageReportingGatewayId() {
- return this.usageReportingGatewayId != null;
- }
-
- public void setUsageReportingGatewayIdIsSet(boolean value) {
- if (!value) {
- this.usageReportingGatewayId = null;
- }
- }
-
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case GATEWAY_ID:
@@ -408,14 +374,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
break;
- case USAGE_REPORTING_GATEWAY_ID:
- if (value == null) {
- unsetUsageReportingGatewayId();
- } else {
- setUsageReportingGatewayId((String)value);
- }
- break;
-
}
}
@@ -433,9 +391,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
case STORAGE_PREFERENCES:
return getStoragePreferences();
- case USAGE_REPORTING_GATEWAY_ID:
- return getUsageReportingGatewayId();
-
}
throw new IllegalStateException();
}
@@ -455,8 +410,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return isSetComputeResourcePreferences();
case STORAGE_PREFERENCES:
return isSetStoragePreferences();
- case USAGE_REPORTING_GATEWAY_ID:
- return isSetUsageReportingGatewayId();
}
throw new IllegalStateException();
}
@@ -510,15 +463,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return false;
}
- boolean this_present_usageReportingGatewayId = true && this.isSetUsageReportingGatewayId();
- boolean that_present_usageReportingGatewayId = true && that.isSetUsageReportingGatewayId();
- if (this_present_usageReportingGatewayId || that_present_usageReportingGatewayId) {
- if (!(this_present_usageReportingGatewayId && that_present_usageReportingGatewayId))
- return false;
- if (!this.usageReportingGatewayId.equals(that.usageReportingGatewayId))
- return false;
- }
-
return true;
}
@@ -546,11 +490,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (present_storagePreferences)
list.add(storagePreferences);
- boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId());
- list.add(present_usageReportingGatewayId);
- if (present_usageReportingGatewayId)
- list.add(usageReportingGatewayId);
-
return list.hashCode();
}
@@ -602,16 +541,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetUsageReportingGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usageReportingGatewayId, other.usageReportingGatewayId);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
return 0;
}
@@ -669,16 +598,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
first = false;
}
- if (isSetUsageReportingGatewayId()) {
- if (!first) sb.append(", ");
- sb.append("usageReportingGatewayId:");
- if (this.usageReportingGatewayId == null) {
- sb.append("null");
- } else {
- sb.append(this.usageReportingGatewayId);
- }
- first = false;
- }
sb.append(")");
return sb.toString();
}
@@ -780,14 +699,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // USAGE_REPORTING_GATEWAY_ID
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.usageReportingGatewayId = iprot.readString();
- struct.setUsageReportingGatewayIdIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -841,13 +752,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
oprot.writeFieldEnd();
}
}
- if (struct.usageReportingGatewayId != null) {
- if (struct.isSetUsageReportingGatewayId()) {
- oprot.writeFieldBegin(USAGE_REPORTING_GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.usageReportingGatewayId);
- oprot.writeFieldEnd();
- }
- }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -876,10 +780,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (struct.isSetStoragePreferences()) {
optionals.set(2);
}
- if (struct.isSetUsageReportingGatewayId()) {
- optionals.set(3);
- }
- oprot.writeBitSet(optionals, 4);
+ oprot.writeBitSet(optionals, 3);
if (struct.isSetCredentialStoreToken()) {
oprot.writeString(struct.credentialStoreToken);
}
@@ -901,9 +802,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
}
- if (struct.isSetUsageReportingGatewayId()) {
- oprot.writeString(struct.usageReportingGatewayId);
- }
}
@Override
@@ -911,7 +809,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
TTupleProtocol iprot = (TTupleProtocol) prot;
struct.gatewayID = iprot.readString();
struct.setGatewayIDIsSet(true);
- BitSet incoming = iprot.readBitSet(4);
+ BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
struct.credentialStoreToken = iprot.readString();
struct.setCredentialStoreTokenIsSet(true);
@@ -944,10 +842,6 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
struct.setStoragePreferencesIsSet(true);
}
- if (incoming.get(3)) {
- struct.usageReportingGatewayId = iprot.readString();
- struct.setUsageReportingGatewayIdIsSet(true);
- }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
index 255ba6d..6cd68e6 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/gatewayprofile/StoragePreference.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class StoragePreference implements org.apache.thrift.TBase<StoragePreference, StoragePreference._Fields>, java.io.Serializable, Cloneable, Comparable<StoragePreference> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StoragePreference");
[08/16] airavata git commit: cleaning up airavata-server properties
Posted by ch...@apache.org.
cleaning up airavata-server properties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e303bb5f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e303bb5f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e303bb5f
Branch: refs/heads/master
Commit: e303bb5f1931de285d1b5aa89c049f38069a5815
Parents: 3ac76fe
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 10:33:25 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 10:33:25 2016 -0500
----------------------------------------------------------------------
.../common/utils/ApplicationSettings.java | 16 ----
.../airavata/common/utils/ServerSettings.java | 3 +-
.../main/resources/airavata-server.properties | 16 +---
.../store/server/CredentialStoreServer.java | 84 ++++++++++----------
4 files changed, 44 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e303bb5f/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index b521962..b6afb18 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -351,18 +351,6 @@ public class ApplicationSettings {
return getSetting("credential.store.keystore.url");
}
- public static String getCredentialStoreThriftServerKeyStorePath() throws ApplicationSettingsException {
- return getSetting("credential.store.thrift.server.keystore");
- }
-
- public static boolean isCredentialStoreStartEnabled() throws ApplicationSettingsException {
- String enableCredentialStore = getSetting("start.credential.store");
- if (enableCredentialStore.equals("true")){
- return true;
- }
- return false;
- }
-
public static String getCredentialStoreKeyAlias() throws ApplicationSettingsException {
return getSetting("credential.store.keystore.alias");
}
@@ -371,10 +359,6 @@ public class ApplicationSettings {
return getSetting("credential.store.keystore.password");
}
- public static String getCredentialStoreThriftServerKeyStorePassword() throws ApplicationSettingsException {
- return getSetting("credential.store.thrift.server.keystore.password");
- }
-
public static String getCredentialStoreServerHost() throws ApplicationSettingsException {
return getSetting("credential.store.server.host");
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e303bb5f/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
index becad00..c75e73e 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
@@ -35,7 +35,6 @@ public class ServerSettings extends ApplicationSettings {
private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_USER_PASSWORD = "default.registry.password";
private static final String DEFAULT_USER_GATEWAY = "default.registry.gateway";
- private static final String LOCAL_DATA_DIR = "local.data.dir";
public static final String IP = "ip";
@@ -376,6 +375,6 @@ public class ServerSettings extends ApplicationSettings {
}
public static String getLocalDataLocation() {
- return getSetting(LOCAL_DATA_DIR, System.getProperty("java.io.tmpdir"));
+ return System.getProperty("java.io.tmpdir");
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e303bb5f/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 160f49d..0b7be61 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -48,10 +48,6 @@ default.registry.user=admin
default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=php_reference_gateway
-# this is the path used to store intermediate data, this will be removed with third party file transfer implementation.
-local.data.dir=/home/airavata/experimentData/
-
-#ip=127.0.0.1
###########################################################################
# Application Catalog DB Configuration
@@ -96,8 +92,6 @@ workflowcatalog.validationQuery=SELECT 1 from CONFIGURATION
# Server module Configuration
###########################################################################
servers=apiserver,orchestrator,gfac,credentialstore
-#shutdown.trategy=NONE
-shutdown.trategy=SELF_TERMINATE
###########################################################################
@@ -124,9 +118,6 @@ orchestrator.server.name=orchestrator-node0
orchestrator.server.host=localhost
orchestrator.server.port=8940
orchestrator.server.min.threads=50
-#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter
-#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter
-#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACRPCJobSubmitter
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
submitter.interval=10000
threadpool.size=10
@@ -173,7 +164,6 @@ job.notification.flags=abe
###########################################################################
# Credential Store module Configuration
###########################################################################
-start.credential.store=true
credential.store.keystore.url=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata_sym.jks
credential.store.keystore.alias=airavata
credential.store.keystore.password=airavata
@@ -184,9 +174,8 @@ credential.store.jdbc.driver=org.apache.derby.jdbc.ClientDriver
credential.store.server.host=localhost
credential.store.server.port=8960
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
-credential.store.thrift.server.keystore=/Users/chathuri/dev/airavata/credential-store/oa4mp/airavata.jks
-credential.store.thrift.server.keystore.password=airavata
+# these properties used by credential store email notifications
email.server=smtp.googlemail.com
email.server.port=465
email.user=airavata
@@ -230,16 +219,15 @@ email.based.monitor.folder.name=INBOX
email.based.monitor.store.protocol=imaps
#These property will be used to query the email server periodically. value in milliseconds(ms).
email.based.monitoring.period=10000
+
###########################################################################
# AMQP Notification Configuration
###########################################################################
-#publisher
#for simple scenarios we can use the guest user
rabbitmq.broker.url=amqp://localhost:5672
#for production scenarios, give url as amqp://userName:password@hostName:portNumber/virtualHost, create user, virtualhost
# and give permissions, refer: http://blog.dtzq.com/2012/06/rabbitmq-users-and-virtual-hosts.html
#rabbitmq.broker.url=amqp://airavata:airavata@localhost:5672/messaging
-
status.publisher=org.apache.airavata.messaging.core.impl.RabbitMQStatusPublisher
task.launch.publisher=org.apache.airavata.messaging.core.impl.RabbitMQProcessLaunchPublisher
rabbitmq.status.exchange.name=airavata_rabbitmq_exchange
http://git-wip-us.apache.org/repos/asf/airavata/blob/e303bb5f/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index 694680f..2e3db05 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@ -58,53 +58,51 @@ public class CredentialStoreServer implements IServer {
@Override
public void start() throws Exception {
- if(ServerSettings.isCredentialStoreStartEnabled()) {
- try {
- setStatus(ServerStatus.STARTING);
- final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
- final String serverHost = ServerSettings.getCredentialStoreServerHost();
- CredentialStoreService.Processor processor = new CredentialStoreService.Processor(new CredentialStoreServerHandler());
-
- TServerTransport serverTransport;
-
- if(serverHost == null){
- serverTransport = new TServerSocket(serverPort);
- }else{
- InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
- serverTransport = new TServerSocket(inetSocketAddress);
+ try {
+ setStatus(ServerStatus.STARTING);
+ final int serverPort = Integer.parseInt(ServerSettings.getCredentialStoreServerPort());
+ final String serverHost = ServerSettings.getCredentialStoreServerHost();
+ CredentialStoreService.Processor processor = new CredentialStoreService.Processor(new CredentialStoreServerHandler());
+
+ TServerTransport serverTransport;
+
+ if (serverHost == null) {
+ serverTransport = new TServerSocket(serverPort);
+ } else {
+ InetSocketAddress inetSocketAddress = new InetSocketAddress(serverHost, serverPort);
+ serverTransport = new TServerSocket(inetSocketAddress);
+ }
+ TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
+ options.minWorkerThreads = 30;
+ server = new TThreadPoolServer(options.processor(processor));
+
+ new Thread() {
+ public void run() {
+ server.serve();
+ setStatus(ServerStatus.STOPPED);
+ logger.info("Credential store Server Stopped.");
}
- TThreadPoolServer.Args options = new TThreadPoolServer.Args(serverTransport);
- options.minWorkerThreads = 30;
- server = new TThreadPoolServer(options.processor(processor));
-
- new Thread() {
- public void run() {
- server.serve();
- setStatus(ServerStatus.STOPPED);
- logger.info("Credential store Server Stopped.");
- }
- }.start();
- new Thread() {
- public void run() {
- while(!server.isServing()){
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- break;
- }
- }
- if (server.isServing()){
- setStatus(ServerStatus.STARTED);
- logger.info("Starting Credential store Server on Port " + serverPort);
- logger.info("Listening to Credential store clients ....");
+ }.start();
+ new Thread() {
+ public void run() {
+ while (!server.isServing()) {
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ break;
}
}
- }.start();
- } catch (TTransportException e) {
- setStatus(ServerStatus.FAILED);
+ if (server.isServing()) {
+ setStatus(ServerStatus.STARTED);
+ logger.info("Starting Credential store Server on Port " + serverPort);
+ logger.info("Listening to Credential store clients ....");
+ }
+ }
+ }.start();
+ } catch (TTransportException e) {
+ setStatus(ServerStatus.FAILED);
// logger.error("Error while starting the credential store service", e);
- throw new Exception("Error while starting the credential store service", e);
- }
+ throw new Exception("Error while starting the credential store service", e);
}
}
[03/16] airavata git commit: adding gateway usage reporting
AIRAVATA-1895
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index 7ee190d..cd2ae96 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index e5ea2ed..bce6884 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 fc4f4a0..8591446 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 eb47eee..037893a 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 12a13da..ae64373 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 ebd840a..2b7573f 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 c7e12c0..7ac3467 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
index ded9c4f..44ff7ab 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
@@ -262,8 +262,6 @@ struct UnicoreJobSubmission {
3: required string unicoreEndPointURL,
}
-
-
/**
* Provider name
**/
@@ -346,5 +344,8 @@ struct ComputeResourceDescription {
8: optional map<FileSystems, string> fileSystems,
9: optional list<JobSubmissionInterface> jobSubmissionInterfaces,
10: optional list<data_movement_models.DataMovementInterface> dataMovementInterfaces,
- 11: optional i32 maxMemoryPerNode
+ 11: optional i32 maxMemoryPerNode,
+ 12: optional bool xsedeGatewayUsageReporting,
+ 13: optional string gatewayUsageModuleLoadCommand,
+ 14: optional string gatewayUsageExecutable
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
index de76c7d..6bd3001 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
@@ -95,6 +95,7 @@ struct StoragePreference {
struct GatewayResourceProfile {
1: required string gatewayID,
2: optional string credentialStoreToken,
- 3: optional list<ComputeResourcePreference> computeResourcePreferences
- 4: optional list<StoragePreference> storagePreferences
+ 3: optional list<ComputeResourcePreference> computeResourcePreferences,
+ 4: optional list<StoragePreference> storagePreferences,
+ 5: optional string xsedeUsageReportingGatewayId
}
[05/16] airavata git commit: adding gateway usage reporting
AIRAVATA-1895
Posted by ch...@apache.org.
adding gateway usage reporting AIRAVATA-1895
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dad110bc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dad110bc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dad110bc
Branch: refs/heads/master
Commit: dad110bcd4a3d0469aacbabffdc76c7408666beb
Parents: c72a90e
Author: smarru <sm...@apache.org>
Authored: Tue Feb 23 14:59:15 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Feb 23 14:59:15 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../airavata/compute_resource_model_types.cpp | 66 ++++
.../lib/airavata/compute_resource_model_types.h | 28 +-
.../gateway_resource_profile_model_types.cpp | 22 ++
.../gateway_resource_profile_model_types.h | 12 +-
.../Model/AppCatalog/ComputeResource/Types.php | 69 ++++
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++
.../model/appcatalog/computeresource/ttypes.py | 41 ++-
.../model/appcatalog/gatewayprofile/ttypes.py | 15 +-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 321 ++++++++++++++++++-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 2 +-
.../gatewayprofile/GatewayResourceProfile.java | 116 ++++++-
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.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 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.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 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.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 +-
.../compute_resource_model.thrift | 7 +-
.../gateway_resource_profile_model.thrift | 5 +-
93 files changed, 785 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 d666e2f..828c8b4 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class Airavata {
public interface Iface {
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
index ca207ca..13bdf38 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
@@ -1633,6 +1633,21 @@ void ComputeResourceDescription::__set_maxMemoryPerNode(const int32_t val) {
__isset.maxMemoryPerNode = true;
}
+void ComputeResourceDescription::__set_xsedeGatewayUsageReporting(const bool val) {
+ this->xsedeGatewayUsageReporting = val;
+__isset.xsedeGatewayUsageReporting = true;
+}
+
+void ComputeResourceDescription::__set_gatewayUsageModuleLoadCommand(const std::string& val) {
+ this->gatewayUsageModuleLoadCommand = val;
+__isset.gatewayUsageModuleLoadCommand = true;
+}
+
+void ComputeResourceDescription::__set_gatewayUsageExecutable(const std::string& val) {
+ this->gatewayUsageExecutable = val;
+__isset.gatewayUsageExecutable = true;
+}
+
uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -1821,6 +1836,30 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
xfer += iprot->skip(ftype);
}
break;
+ case 12:
+ if (ftype == ::apache::thrift::protocol::T_BOOL) {
+ xfer += iprot->readBool(this->xsedeGatewayUsageReporting);
+ this->__isset.xsedeGatewayUsageReporting = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 13:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayUsageModuleLoadCommand);
+ this->__isset.gatewayUsageModuleLoadCommand = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
+ case 14:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->gatewayUsageExecutable);
+ this->__isset.gatewayUsageExecutable = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -1944,6 +1983,21 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeI32(this->maxMemoryPerNode);
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.xsedeGatewayUsageReporting) {
+ xfer += oprot->writeFieldBegin("xsedeGatewayUsageReporting", ::apache::thrift::protocol::T_BOOL, 12);
+ xfer += oprot->writeBool(this->xsedeGatewayUsageReporting);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayUsageModuleLoadCommand) {
+ xfer += oprot->writeFieldBegin("gatewayUsageModuleLoadCommand", ::apache::thrift::protocol::T_STRING, 13);
+ xfer += oprot->writeString(this->gatewayUsageModuleLoadCommand);
+ xfer += oprot->writeFieldEnd();
+ }
+ if (this->__isset.gatewayUsageExecutable) {
+ xfer += oprot->writeFieldBegin("gatewayUsageExecutable", ::apache::thrift::protocol::T_STRING, 14);
+ xfer += oprot->writeString(this->gatewayUsageExecutable);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -1962,6 +2016,9 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
swap(a.jobSubmissionInterfaces, b.jobSubmissionInterfaces);
swap(a.dataMovementInterfaces, b.dataMovementInterfaces);
swap(a.maxMemoryPerNode, b.maxMemoryPerNode);
+ swap(a.xsedeGatewayUsageReporting, b.xsedeGatewayUsageReporting);
+ swap(a.gatewayUsageModuleLoadCommand, b.gatewayUsageModuleLoadCommand);
+ swap(a.gatewayUsageExecutable, b.gatewayUsageExecutable);
swap(a.__isset, b.__isset);
}
@@ -1977,6 +2034,9 @@ ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDesc
jobSubmissionInterfaces = other85.jobSubmissionInterfaces;
dataMovementInterfaces = other85.dataMovementInterfaces;
maxMemoryPerNode = other85.maxMemoryPerNode;
+ xsedeGatewayUsageReporting = other85.xsedeGatewayUsageReporting;
+ gatewayUsageModuleLoadCommand = other85.gatewayUsageModuleLoadCommand;
+ gatewayUsageExecutable = other85.gatewayUsageExecutable;
__isset = other85.__isset;
}
ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeResourceDescription& other86) {
@@ -1991,6 +2051,9 @@ ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeR
jobSubmissionInterfaces = other86.jobSubmissionInterfaces;
dataMovementInterfaces = other86.dataMovementInterfaces;
maxMemoryPerNode = other86.maxMemoryPerNode;
+ xsedeGatewayUsageReporting = other86.xsedeGatewayUsageReporting;
+ gatewayUsageModuleLoadCommand = other86.gatewayUsageModuleLoadCommand;
+ gatewayUsageExecutable = other86.gatewayUsageExecutable;
__isset = other86.__isset;
return *this;
}
@@ -2008,6 +2071,9 @@ void ComputeResourceDescription::printTo(std::ostream& out) const {
out << ", " << "jobSubmissionInterfaces="; (__isset.jobSubmissionInterfaces ? (out << to_string(jobSubmissionInterfaces)) : (out << "<null>"));
out << ", " << "dataMovementInterfaces="; (__isset.dataMovementInterfaces ? (out << to_string(dataMovementInterfaces)) : (out << "<null>"));
out << ", " << "maxMemoryPerNode="; (__isset.maxMemoryPerNode ? (out << to_string(maxMemoryPerNode)) : (out << "<null>"));
+ out << ", " << "xsedeGatewayUsageReporting="; (__isset.xsedeGatewayUsageReporting ? (out << to_string(xsedeGatewayUsageReporting)) : (out << "<null>"));
+ out << ", " << "gatewayUsageModuleLoadCommand="; (__isset.gatewayUsageModuleLoadCommand ? (out << to_string(gatewayUsageModuleLoadCommand)) : (out << "<null>"));
+ out << ", " << "gatewayUsageExecutable="; (__isset.gatewayUsageExecutable ? (out << to_string(gatewayUsageExecutable)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
index 5457284..82ffc70 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
@@ -666,7 +666,7 @@ inline std::ostream& operator<<(std::ostream& out, const JobSubmissionInterface&
}
typedef struct _ComputeResourceDescription__isset {
- _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false) {}
+ _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), xsedeGatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false) {}
bool hostAliases :1;
bool ipAddresses :1;
bool resourceDescription :1;
@@ -676,6 +676,9 @@ typedef struct _ComputeResourceDescription__isset {
bool jobSubmissionInterfaces :1;
bool dataMovementInterfaces :1;
bool maxMemoryPerNode :1;
+ bool xsedeGatewayUsageReporting :1;
+ bool gatewayUsageModuleLoadCommand :1;
+ bool gatewayUsageExecutable :1;
} _ComputeResourceDescription__isset;
class ComputeResourceDescription {
@@ -683,7 +686,7 @@ class ComputeResourceDescription {
ComputeResourceDescription(const ComputeResourceDescription&);
ComputeResourceDescription& operator=(const ComputeResourceDescription&);
- ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0) {
+ ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), xsedeGatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable() {
}
virtual ~ComputeResourceDescription() throw();
@@ -698,6 +701,9 @@ class ComputeResourceDescription {
std::vector<JobSubmissionInterface> jobSubmissionInterfaces;
std::vector< ::apache::airavata::model::data::movement::DataMovementInterface> dataMovementInterfaces;
int32_t maxMemoryPerNode;
+ bool xsedeGatewayUsageReporting;
+ std::string gatewayUsageModuleLoadCommand;
+ std::string gatewayUsageExecutable;
_ComputeResourceDescription__isset __isset;
@@ -723,6 +729,12 @@ class ComputeResourceDescription {
void __set_maxMemoryPerNode(const int32_t val);
+ void __set_xsedeGatewayUsageReporting(const bool val);
+
+ void __set_gatewayUsageModuleLoadCommand(const std::string& val);
+
+ void __set_gatewayUsageExecutable(const std::string& val);
+
bool operator == (const ComputeResourceDescription & rhs) const
{
if (!(computeResourceId == rhs.computeResourceId))
@@ -765,6 +777,18 @@ class ComputeResourceDescription {
return false;
else if (__isset.maxMemoryPerNode && !(maxMemoryPerNode == rhs.maxMemoryPerNode))
return false;
+ if (__isset.xsedeGatewayUsageReporting != rhs.__isset.xsedeGatewayUsageReporting)
+ return false;
+ else if (__isset.xsedeGatewayUsageReporting && !(xsedeGatewayUsageReporting == rhs.xsedeGatewayUsageReporting))
+ return false;
+ if (__isset.gatewayUsageModuleLoadCommand != rhs.__isset.gatewayUsageModuleLoadCommand)
+ return false;
+ else if (__isset.gatewayUsageModuleLoadCommand && !(gatewayUsageModuleLoadCommand == rhs.gatewayUsageModuleLoadCommand))
+ return false;
+ if (__isset.gatewayUsageExecutable != rhs.__isset.gatewayUsageExecutable)
+ return false;
+ else if (__isset.gatewayUsageExecutable && !(gatewayUsageExecutable == rhs.gatewayUsageExecutable))
+ return false;
return true;
}
bool operator != (const ComputeResourceDescription &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index b395c16..761c232 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -479,6 +479,11 @@ void GatewayResourceProfile::__set_storagePreferences(const std::vector<StorageP
__isset.storagePreferences = true;
}
+void GatewayResourceProfile::__set_xsedeUsageReportingGatewayId(const std::string& val) {
+ this->xsedeUsageReportingGatewayId = val;
+__isset.xsedeUsageReportingGatewayId = true;
+}
+
uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
@@ -557,6 +562,14 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
xfer += iprot->skip(ftype);
}
break;
+ case 5:
+ if (ftype == ::apache::thrift::protocol::T_STRING) {
+ xfer += iprot->readString(this->xsedeUsageReportingGatewayId);
+ this->__isset.xsedeUsageReportingGatewayId = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -611,6 +624,11 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
}
xfer += oprot->writeFieldEnd();
}
+ if (this->__isset.xsedeUsageReportingGatewayId) {
+ xfer += oprot->writeFieldBegin("xsedeUsageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeString(this->xsedeUsageReportingGatewayId);
+ xfer += oprot->writeFieldEnd();
+ }
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -622,6 +640,7 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
swap(a.storagePreferences, b.storagePreferences);
+ swap(a.xsedeUsageReportingGatewayId, b.xsedeUsageReportingGatewayId);
swap(a.__isset, b.__isset);
}
@@ -630,6 +649,7 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
storagePreferences = other18.storagePreferences;
+ xsedeUsageReportingGatewayId = other18.xsedeUsageReportingGatewayId;
__isset = other18.__isset;
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
@@ -637,6 +657,7 @@ GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceP
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
storagePreferences = other19.storagePreferences;
+ xsedeUsageReportingGatewayId = other19.xsedeUsageReportingGatewayId;
__isset = other19.__isset;
return *this;
}
@@ -647,6 +668,7 @@ void GatewayResourceProfile::printTo(std::ostream& out) const {
out << ", " << "credentialStoreToken="; (__isset.credentialStoreToken ? (out << to_string(credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (__isset.computeResourcePreferences ? (out << to_string(computeResourcePreferences)) : (out << "<null>"));
out << ", " << "storagePreferences="; (__isset.storagePreferences ? (out << to_string(storagePreferences)) : (out << "<null>"));
+ out << ", " << "xsedeUsageReportingGatewayId="; (__isset.xsedeUsageReportingGatewayId ? (out << to_string(xsedeUsageReportingGatewayId)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index cd52776..c858a90 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -220,10 +220,11 @@ inline std::ostream& operator<<(std::ostream& out, const StoragePreference& obj)
}
typedef struct _GatewayResourceProfile__isset {
- _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false) {}
+ _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false), xsedeUsageReportingGatewayId(false) {}
bool credentialStoreToken :1;
bool computeResourcePreferences :1;
bool storagePreferences :1;
+ bool xsedeUsageReportingGatewayId :1;
} _GatewayResourceProfile__isset;
class GatewayResourceProfile {
@@ -231,7 +232,7 @@ class GatewayResourceProfile {
GatewayResourceProfile(const GatewayResourceProfile&);
GatewayResourceProfile& operator=(const GatewayResourceProfile&);
- GatewayResourceProfile() : gatewayID(), credentialStoreToken() {
+ GatewayResourceProfile() : gatewayID(), credentialStoreToken(), xsedeUsageReportingGatewayId() {
}
virtual ~GatewayResourceProfile() throw();
@@ -239,6 +240,7 @@ class GatewayResourceProfile {
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
std::vector<StoragePreference> storagePreferences;
+ std::string xsedeUsageReportingGatewayId;
_GatewayResourceProfile__isset __isset;
@@ -250,6 +252,8 @@ class GatewayResourceProfile {
void __set_storagePreferences(const std::vector<StoragePreference> & val);
+ void __set_xsedeUsageReportingGatewayId(const std::string& val);
+
bool operator == (const GatewayResourceProfile & rhs) const
{
if (!(gatewayID == rhs.gatewayID))
@@ -266,6 +270,10 @@ class GatewayResourceProfile {
return false;
else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
return false;
+ if (__isset.xsedeUsageReportingGatewayId != rhs.__isset.xsedeUsageReportingGatewayId)
+ return false;
+ else if (__isset.xsedeUsageReportingGatewayId && !(xsedeUsageReportingGatewayId == rhs.xsedeUsageReportingGatewayId))
+ return false;
return true;
}
bool operator != (const GatewayResourceProfile &rhs) const {
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 00f7e6c..85d77e7 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1716,6 +1716,18 @@ class ComputeResourceDescription {
* @var int
*/
public $maxMemoryPerNode = null;
+ /**
+ * @var bool
+ */
+ public $xsedeGatewayUsageReporting = null;
+ /**
+ * @var string
+ */
+ public $gatewayUsageModuleLoadCommand = null;
+ /**
+ * @var string
+ */
+ public $gatewayUsageExecutable = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -1795,6 +1807,18 @@ class ComputeResourceDescription {
'var' => 'maxMemoryPerNode',
'type' => TType::I32,
),
+ 12 => array(
+ 'var' => 'xsedeGatewayUsageReporting',
+ 'type' => TType::BOOL,
+ ),
+ 13 => array(
+ 'var' => 'gatewayUsageModuleLoadCommand',
+ 'type' => TType::STRING,
+ ),
+ 14 => array(
+ 'var' => 'gatewayUsageExecutable',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -1831,6 +1855,15 @@ class ComputeResourceDescription {
if (isset($vals['maxMemoryPerNode'])) {
$this->maxMemoryPerNode = $vals['maxMemoryPerNode'];
}
+ if (isset($vals['xsedeGatewayUsageReporting'])) {
+ $this->xsedeGatewayUsageReporting = $vals['xsedeGatewayUsageReporting'];
+ }
+ if (isset($vals['gatewayUsageModuleLoadCommand'])) {
+ $this->gatewayUsageModuleLoadCommand = $vals['gatewayUsageModuleLoadCommand'];
+ }
+ if (isset($vals['gatewayUsageExecutable'])) {
+ $this->gatewayUsageExecutable = $vals['gatewayUsageExecutable'];
+ }
}
}
@@ -1996,6 +2029,27 @@ class ComputeResourceDescription {
$xfer += $input->skip($ftype);
}
break;
+ case 12:
+ if ($ftype == TType::BOOL) {
+ $xfer += $input->readBool($this->xsedeGatewayUsageReporting);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 13:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayUsageModuleLoadCommand);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
+ case 14:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->gatewayUsageExecutable);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -2137,6 +2191,21 @@ class ComputeResourceDescription {
$xfer += $output->writeI32($this->maxMemoryPerNode);
$xfer += $output->writeFieldEnd();
}
+ if ($this->xsedeGatewayUsageReporting !== null) {
+ $xfer += $output->writeFieldBegin('xsedeGatewayUsageReporting', TType::BOOL, 12);
+ $xfer += $output->writeBool($this->xsedeGatewayUsageReporting);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayUsageModuleLoadCommand !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageModuleLoadCommand', TType::STRING, 13);
+ $xfer += $output->writeString($this->gatewayUsageModuleLoadCommand);
+ $xfer += $output->writeFieldEnd();
+ }
+ if ($this->gatewayUsageExecutable !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageExecutable', TType::STRING, 14);
+ $xfer += $output->writeString($this->gatewayUsageExecutable);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 46f89a0..3374c24 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -486,6 +486,10 @@ class GatewayResourceProfile {
* @var \Airavata\Model\AppCatalog\GatewayProfile\StoragePreference[]
*/
public $storagePreferences = null;
+ /**
+ * @var string
+ */
+ public $xsedeUsageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -516,6 +520,10 @@ class GatewayResourceProfile {
'class' => '\Airavata\Model\AppCatalog\GatewayProfile\StoragePreference',
),
),
+ 5 => array(
+ 'var' => 'xsedeUsageReportingGatewayId',
+ 'type' => TType::STRING,
+ ),
);
}
if (is_array($vals)) {
@@ -531,6 +539,9 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
+ if (isset($vals['xsedeUsageReportingGatewayId'])) {
+ $this->xsedeUsageReportingGatewayId = $vals['xsedeUsageReportingGatewayId'];
+ }
}
}
@@ -603,6 +614,13 @@ class GatewayResourceProfile {
$xfer += $input->skip($ftype);
}
break;
+ case 5:
+ if ($ftype == TType::STRING) {
+ $xfer += $input->readString($this->xsedeUsageReportingGatewayId);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -660,6 +678,11 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
+ if ($this->xsedeUsageReportingGatewayId !== null) {
+ $xfer += $output->writeFieldBegin('xsedeUsageReportingGatewayId', TType::STRING, 5);
+ $xfer += $output->writeString($this->xsedeUsageReportingGatewayId);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
index 5a091bf..36e403d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
@@ -1340,6 +1340,9 @@ class ComputeResourceDescription:
- jobSubmissionInterfaces
- dataMovementInterfaces
- maxMemoryPerNode
+ - xsedeGatewayUsageReporting
+ - gatewayUsageModuleLoadCommand
+ - gatewayUsageExecutable
"""
thrift_spec = (
@@ -1355,9 +1358,12 @@ class ComputeResourceDescription:
(9, TType.LIST, 'jobSubmissionInterfaces', (TType.STRUCT,(JobSubmissionInterface, JobSubmissionInterface.thrift_spec)), None, ), # 9
(10, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT,(apache.airavata.model.data.movement.ttypes.DataMovementInterface, apache.airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec)), None, ), # 10
(11, TType.I32, 'maxMemoryPerNode', None, None, ), # 11
+ (12, TType.BOOL, 'xsedeGatewayUsageReporting', None, None, ), # 12
+ (13, TType.STRING, 'gatewayUsageModuleLoadCommand', None, None, ), # 13
+ (14, TType.STRING, 'gatewayUsageExecutable', None, None, ), # 14
)
- def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None,):
+ def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, xsedeGatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None,):
self.computeResourceId = computeResourceId
self.hostName = hostName
self.hostAliases = hostAliases
@@ -1369,6 +1375,9 @@ class ComputeResourceDescription:
self.jobSubmissionInterfaces = jobSubmissionInterfaces
self.dataMovementInterfaces = dataMovementInterfaces
self.maxMemoryPerNode = maxMemoryPerNode
+ self.xsedeGatewayUsageReporting = xsedeGatewayUsageReporting
+ self.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand
+ self.gatewayUsageExecutable = gatewayUsageExecutable
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:
@@ -1468,6 +1477,21 @@ class ComputeResourceDescription:
self.maxMemoryPerNode = iprot.readI32()
else:
iprot.skip(ftype)
+ elif fid == 12:
+ if ftype == TType.BOOL:
+ self.xsedeGatewayUsageReporting = iprot.readBool()
+ else:
+ iprot.skip(ftype)
+ elif fid == 13:
+ if ftype == TType.STRING:
+ self.gatewayUsageModuleLoadCommand = iprot.readString()
+ else:
+ iprot.skip(ftype)
+ elif fid == 14:
+ if ftype == TType.STRING:
+ self.gatewayUsageExecutable = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -1541,6 +1565,18 @@ class ComputeResourceDescription:
oprot.writeFieldBegin('maxMemoryPerNode', TType.I32, 11)
oprot.writeI32(self.maxMemoryPerNode)
oprot.writeFieldEnd()
+ if self.xsedeGatewayUsageReporting is not None:
+ oprot.writeFieldBegin('xsedeGatewayUsageReporting', TType.BOOL, 12)
+ oprot.writeBool(self.xsedeGatewayUsageReporting)
+ oprot.writeFieldEnd()
+ if self.gatewayUsageModuleLoadCommand is not None:
+ oprot.writeFieldBegin('gatewayUsageModuleLoadCommand', TType.STRING, 13)
+ oprot.writeString(self.gatewayUsageModuleLoadCommand)
+ oprot.writeFieldEnd()
+ if self.gatewayUsageExecutable is not None:
+ oprot.writeFieldBegin('gatewayUsageExecutable', TType.STRING, 14)
+ oprot.writeString(self.gatewayUsageExecutable)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -1565,6 +1601,9 @@ class ComputeResourceDescription:
value = (value * 31) ^ hash(self.jobSubmissionInterfaces)
value = (value * 31) ^ hash(self.dataMovementInterfaces)
value = (value * 31) ^ hash(self.maxMemoryPerNode)
+ value = (value * 31) ^ hash(self.xsedeGatewayUsageReporting)
+ value = (value * 31) ^ hash(self.gatewayUsageModuleLoadCommand)
+ value = (value * 31) ^ hash(self.gatewayUsageExecutable)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index 4467a30..a5f9620 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -351,6 +351,7 @@ class GatewayResourceProfile:
- credentialStoreToken
- computeResourcePreferences
- storagePreferences
+ - xsedeUsageReportingGatewayId
"""
thrift_spec = (
@@ -359,13 +360,15 @@ class GatewayResourceProfile:
(2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
(3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
(4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
+ (5, TType.STRING, 'xsedeUsageReportingGatewayId', None, None, ), # 5
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None,):
+ def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None, xsedeUsageReportingGatewayId=None,):
self.gatewayID = gatewayID
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
self.storagePreferences = storagePreferences
+ self.xsedeUsageReportingGatewayId = xsedeUsageReportingGatewayId
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:
@@ -408,6 +411,11 @@ class GatewayResourceProfile:
iprot.readListEnd()
else:
iprot.skip(ftype)
+ elif fid == 5:
+ if ftype == TType.STRING:
+ self.xsedeUsageReportingGatewayId = iprot.readString()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -440,6 +448,10 @@ class GatewayResourceProfile:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
+ if self.xsedeUsageReportingGatewayId is not None:
+ oprot.writeFieldBegin('xsedeUsageReportingGatewayId', TType.STRING, 5)
+ oprot.writeString(self.xsedeUsageReportingGatewayId)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -455,6 +467,7 @@ class GatewayResourceProfile:
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
value = (value * 31) ^ hash(self.storagePreferences)
+ value = (value * 31) ^ hash(self.xsedeUsageReportingGatewayId)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
index 8c1f084..9ce3882 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/ComponentStatus.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class ComponentStatus implements org.apache.thrift.TBase<ComponentStatus, ComponentStatus._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
index 9506f86..fbdba25 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/EdgeModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class EdgeModel implements org.apache.thrift.TBase<EdgeModel, EdgeModel._Fields>, java.io.Serializable, Cloneable, Comparable<EdgeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EdgeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
index ca81ec7..d1d2efc 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/NodeModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class NodeModel implements org.apache.thrift.TBase<NodeModel, NodeModel._Fields>, java.io.Serializable, Cloneable, Comparable<NodeModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NodeModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
index 9c573e4..778f245 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/PortModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class PortModel implements org.apache.thrift.TBase<PortModel, PortModel._Fields>, java.io.Serializable, Cloneable, Comparable<PortModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PortModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
index e348241..053bbd4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowModel.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class WorkflowModel implements org.apache.thrift.TBase<WorkflowModel, WorkflowModel._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
index d792b40..9ba3d45 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/WorkflowStatus.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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class WorkflowStatus implements org.apache.thrift.TBase<WorkflowStatus, WorkflowStatus._Fields>, java.io.Serializable, Cloneable, Comparable<WorkflowStatus> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WorkflowStatus");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 6094749..8176d8c 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 2fbe521..bf8e8b3 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
index 257aaa3..f04f144 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/CommandObject.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
* commandOrder:
* Order of the command in the multiple command situation
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
public class CommandObject implements org.apache.thrift.TBase<CommandObject, CommandObject._Fields>, java.io.Serializable, Cloneable, Comparable<CommandObject> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommandObject");
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 5397e49..91d5fd8 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
@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
* envPathOrder:
* The order of the setting of the env variables when there are multiple env variables
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 8fb822f..e567ff0 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 2a6c697..7559a07 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 8654ae5..6148630 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 0393349..c77ed54 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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");
@@ -95,6 +95,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaces", org.apache.thrift.protocol.TType.LIST, (short)9);
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final org.apache.thrift.protocol.TField MAX_MEMORY_PER_NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("maxMemoryPerNode", org.apache.thrift.protocol.TType.I32, (short)11);
+ private static final org.apache.thrift.protocol.TField XSEDE_GATEWAY_USAGE_REPORTING_FIELD_DESC = new org.apache.thrift.protocol.TField("xsedeGatewayUsageReporting", org.apache.thrift.protocol.TType.BOOL, (short)12);
+ private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_MODULE_LOAD_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageModuleLoadCommand", org.apache.thrift.protocol.TType.STRING, (short)13);
+ private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_EXECUTABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageExecutable", org.apache.thrift.protocol.TType.STRING, (short)14);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -113,6 +116,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private List<JobSubmissionInterface> jobSubmissionInterfaces; // optional
private List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces; // optional
private int maxMemoryPerNode; // optional
+ private boolean xsedeGatewayUsageReporting; // optional
+ private String gatewayUsageModuleLoadCommand; // optional
+ private String gatewayUsageExecutable; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -126,7 +132,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
FILE_SYSTEMS((short)8, "fileSystems"),
JOB_SUBMISSION_INTERFACES((short)9, "jobSubmissionInterfaces"),
DATA_MOVEMENT_INTERFACES((short)10, "dataMovementInterfaces"),
- MAX_MEMORY_PER_NODE((short)11, "maxMemoryPerNode");
+ MAX_MEMORY_PER_NODE((short)11, "maxMemoryPerNode"),
+ XSEDE_GATEWAY_USAGE_REPORTING((short)12, "xsedeGatewayUsageReporting"),
+ GATEWAY_USAGE_MODULE_LOAD_COMMAND((short)13, "gatewayUsageModuleLoadCommand"),
+ GATEWAY_USAGE_EXECUTABLE((short)14, "gatewayUsageExecutable");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -163,6 +172,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return DATA_MOVEMENT_INTERFACES;
case 11: // MAX_MEMORY_PER_NODE
return MAX_MEMORY_PER_NODE;
+ case 12: // XSEDE_GATEWAY_USAGE_REPORTING
+ return XSEDE_GATEWAY_USAGE_REPORTING;
+ case 13: // GATEWAY_USAGE_MODULE_LOAD_COMMAND
+ return GATEWAY_USAGE_MODULE_LOAD_COMMAND;
+ case 14: // GATEWAY_USAGE_EXECUTABLE
+ return GATEWAY_USAGE_EXECUTABLE;
default:
return null;
}
@@ -205,8 +220,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
// isset id assignments
private static final int __ENABLED_ISSET_ID = 0;
private static final int __MAXMEMORYPERNODE_ISSET_ID = 1;
+ private static final int __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE};
+ private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.XSEDE_GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE};
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);
@@ -239,6 +255,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.movement.DataMovementInterface.class))));
tmpMap.put(_Fields.MAX_MEMORY_PER_NODE, new org.apache.thrift.meta_data.FieldMetaData("maxMemoryPerNode", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+ tmpMap.put(_Fields.XSEDE_GATEWAY_USAGE_REPORTING, new org.apache.thrift.meta_data.FieldMetaData("xsedeGatewayUsageReporting", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND, new org.apache.thrift.meta_data.FieldMetaData("gatewayUsageModuleLoadCommand", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.GATEWAY_USAGE_EXECUTABLE, new org.apache.thrift.meta_data.FieldMetaData("gatewayUsageExecutable", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputeResourceDescription.class, metaDataMap);
}
@@ -317,6 +339,13 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
this.dataMovementInterfaces = __this__dataMovementInterfaces;
}
this.maxMemoryPerNode = other.maxMemoryPerNode;
+ this.xsedeGatewayUsageReporting = other.xsedeGatewayUsageReporting;
+ if (other.isSetGatewayUsageModuleLoadCommand()) {
+ this.gatewayUsageModuleLoadCommand = other.gatewayUsageModuleLoadCommand;
+ }
+ if (other.isSetGatewayUsageExecutable()) {
+ this.gatewayUsageExecutable = other.gatewayUsageExecutable;
+ }
}
public ComputeResourceDescription deepCopy() {
@@ -339,6 +368,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
this.dataMovementInterfaces = null;
setMaxMemoryPerNodeIsSet(false);
this.maxMemoryPerNode = 0;
+ setXsedeGatewayUsageReportingIsSet(false);
+ this.xsedeGatewayUsageReporting = false;
+ this.gatewayUsageModuleLoadCommand = null;
+ this.gatewayUsageExecutable = null;
}
public String getComputeResourceId() {
@@ -678,6 +711,74 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXMEMORYPERNODE_ISSET_ID, value);
}
+ public boolean isXsedeGatewayUsageReporting() {
+ return this.xsedeGatewayUsageReporting;
+ }
+
+ public void setXsedeGatewayUsageReporting(boolean xsedeGatewayUsageReporting) {
+ this.xsedeGatewayUsageReporting = xsedeGatewayUsageReporting;
+ setXsedeGatewayUsageReportingIsSet(true);
+ }
+
+ public void unsetXsedeGatewayUsageReporting() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID);
+ }
+
+ /** Returns true if field xsedeGatewayUsageReporting is set (has been assigned a value) and false otherwise */
+ public boolean isSetXsedeGatewayUsageReporting() {
+ return EncodingUtils.testBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID);
+ }
+
+ public void setXsedeGatewayUsageReportingIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID, value);
+ }
+
+ public String getGatewayUsageModuleLoadCommand() {
+ return this.gatewayUsageModuleLoadCommand;
+ }
+
+ public void setGatewayUsageModuleLoadCommand(String gatewayUsageModuleLoadCommand) {
+ this.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand;
+ }
+
+ public void unsetGatewayUsageModuleLoadCommand() {
+ this.gatewayUsageModuleLoadCommand = null;
+ }
+
+ /** Returns true if field gatewayUsageModuleLoadCommand is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayUsageModuleLoadCommand() {
+ return this.gatewayUsageModuleLoadCommand != null;
+ }
+
+ public void setGatewayUsageModuleLoadCommandIsSet(boolean value) {
+ if (!value) {
+ this.gatewayUsageModuleLoadCommand = null;
+ }
+ }
+
+ public String getGatewayUsageExecutable() {
+ return this.gatewayUsageExecutable;
+ }
+
+ public void setGatewayUsageExecutable(String gatewayUsageExecutable) {
+ this.gatewayUsageExecutable = gatewayUsageExecutable;
+ }
+
+ public void unsetGatewayUsageExecutable() {
+ this.gatewayUsageExecutable = null;
+ }
+
+ /** Returns true if field gatewayUsageExecutable is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayUsageExecutable() {
+ return this.gatewayUsageExecutable != null;
+ }
+
+ public void setGatewayUsageExecutableIsSet(boolean value) {
+ if (!value) {
+ this.gatewayUsageExecutable = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case COMPUTE_RESOURCE_ID:
@@ -768,6 +869,30 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
break;
+ case XSEDE_GATEWAY_USAGE_REPORTING:
+ if (value == null) {
+ unsetXsedeGatewayUsageReporting();
+ } else {
+ setXsedeGatewayUsageReporting((Boolean)value);
+ }
+ break;
+
+ case GATEWAY_USAGE_MODULE_LOAD_COMMAND:
+ if (value == null) {
+ unsetGatewayUsageModuleLoadCommand();
+ } else {
+ setGatewayUsageModuleLoadCommand((String)value);
+ }
+ break;
+
+ case GATEWAY_USAGE_EXECUTABLE:
+ if (value == null) {
+ unsetGatewayUsageExecutable();
+ } else {
+ setGatewayUsageExecutable((String)value);
+ }
+ break;
+
}
}
@@ -806,6 +931,15 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case MAX_MEMORY_PER_NODE:
return getMaxMemoryPerNode();
+ case XSEDE_GATEWAY_USAGE_REPORTING:
+ return isXsedeGatewayUsageReporting();
+
+ case GATEWAY_USAGE_MODULE_LOAD_COMMAND:
+ return getGatewayUsageModuleLoadCommand();
+
+ case GATEWAY_USAGE_EXECUTABLE:
+ return getGatewayUsageExecutable();
+
}
throw new IllegalStateException();
}
@@ -839,6 +973,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return isSetDataMovementInterfaces();
case MAX_MEMORY_PER_NODE:
return isSetMaxMemoryPerNode();
+ case XSEDE_GATEWAY_USAGE_REPORTING:
+ return isSetXsedeGatewayUsageReporting();
+ case GATEWAY_USAGE_MODULE_LOAD_COMMAND:
+ return isSetGatewayUsageModuleLoadCommand();
+ case GATEWAY_USAGE_EXECUTABLE:
+ return isSetGatewayUsageExecutable();
}
throw new IllegalStateException();
}
@@ -955,6 +1095,33 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return false;
}
+ boolean this_present_xsedeGatewayUsageReporting = true && this.isSetXsedeGatewayUsageReporting();
+ boolean that_present_xsedeGatewayUsageReporting = true && that.isSetXsedeGatewayUsageReporting();
+ if (this_present_xsedeGatewayUsageReporting || that_present_xsedeGatewayUsageReporting) {
+ if (!(this_present_xsedeGatewayUsageReporting && that_present_xsedeGatewayUsageReporting))
+ return false;
+ if (this.xsedeGatewayUsageReporting != that.xsedeGatewayUsageReporting)
+ return false;
+ }
+
+ boolean this_present_gatewayUsageModuleLoadCommand = true && this.isSetGatewayUsageModuleLoadCommand();
+ boolean that_present_gatewayUsageModuleLoadCommand = true && that.isSetGatewayUsageModuleLoadCommand();
+ if (this_present_gatewayUsageModuleLoadCommand || that_present_gatewayUsageModuleLoadCommand) {
+ if (!(this_present_gatewayUsageModuleLoadCommand && that_present_gatewayUsageModuleLoadCommand))
+ return false;
+ if (!this.gatewayUsageModuleLoadCommand.equals(that.gatewayUsageModuleLoadCommand))
+ return false;
+ }
+
+ boolean this_present_gatewayUsageExecutable = true && this.isSetGatewayUsageExecutable();
+ boolean that_present_gatewayUsageExecutable = true && that.isSetGatewayUsageExecutable();
+ if (this_present_gatewayUsageExecutable || that_present_gatewayUsageExecutable) {
+ if (!(this_present_gatewayUsageExecutable && that_present_gatewayUsageExecutable))
+ return false;
+ if (!this.gatewayUsageExecutable.equals(that.gatewayUsageExecutable))
+ return false;
+ }
+
return true;
}
@@ -1017,6 +1184,21 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (present_maxMemoryPerNode)
list.add(maxMemoryPerNode);
+ boolean present_xsedeGatewayUsageReporting = true && (isSetXsedeGatewayUsageReporting());
+ list.add(present_xsedeGatewayUsageReporting);
+ if (present_xsedeGatewayUsageReporting)
+ list.add(xsedeGatewayUsageReporting);
+
+ boolean present_gatewayUsageModuleLoadCommand = true && (isSetGatewayUsageModuleLoadCommand());
+ list.add(present_gatewayUsageModuleLoadCommand);
+ if (present_gatewayUsageModuleLoadCommand)
+ list.add(gatewayUsageModuleLoadCommand);
+
+ boolean present_gatewayUsageExecutable = true && (isSetGatewayUsageExecutable());
+ list.add(present_gatewayUsageExecutable);
+ if (present_gatewayUsageExecutable)
+ list.add(gatewayUsageExecutable);
+
return list.hashCode();
}
@@ -1138,6 +1320,36 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetXsedeGatewayUsageReporting()).compareTo(other.isSetXsedeGatewayUsageReporting());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetXsedeGatewayUsageReporting()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.xsedeGatewayUsageReporting, other.xsedeGatewayUsageReporting);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayUsageModuleLoadCommand()).compareTo(other.isSetGatewayUsageModuleLoadCommand());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayUsageModuleLoadCommand()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayUsageModuleLoadCommand, other.gatewayUsageModuleLoadCommand);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetGatewayUsageExecutable()).compareTo(other.isSetGatewayUsageExecutable());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetGatewayUsageExecutable()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayUsageExecutable, other.gatewayUsageExecutable);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1255,6 +1467,32 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
sb.append(this.maxMemoryPerNode);
first = false;
}
+ if (isSetXsedeGatewayUsageReporting()) {
+ if (!first) sb.append(", ");
+ sb.append("xsedeGatewayUsageReporting:");
+ sb.append(this.xsedeGatewayUsageReporting);
+ first = false;
+ }
+ if (isSetGatewayUsageModuleLoadCommand()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayUsageModuleLoadCommand:");
+ if (this.gatewayUsageModuleLoadCommand == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayUsageModuleLoadCommand);
+ }
+ first = false;
+ }
+ if (isSetGatewayUsageExecutable()) {
+ if (!first) sb.append(", ");
+ sb.append("gatewayUsageExecutable:");
+ if (this.gatewayUsageExecutable == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.gatewayUsageExecutable);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1461,6 +1699,30 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 12: // XSEDE_GATEWAY_USAGE_REPORTING
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.xsedeGatewayUsageReporting = iprot.readBool();
+ struct.setXsedeGatewayUsageReportingIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 13: // GATEWAY_USAGE_MODULE_LOAD_COMMAND
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayUsageModuleLoadCommand = iprot.readString();
+ struct.setGatewayUsageModuleLoadCommandIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 14: // GATEWAY_USAGE_EXECUTABLE
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.gatewayUsageExecutable = iprot.readString();
+ struct.setGatewayUsageExecutableIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1586,6 +1848,25 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeI32(struct.maxMemoryPerNode);
oprot.writeFieldEnd();
}
+ if (struct.isSetXsedeGatewayUsageReporting()) {
+ oprot.writeFieldBegin(XSEDE_GATEWAY_USAGE_REPORTING_FIELD_DESC);
+ oprot.writeBool(struct.xsedeGatewayUsageReporting);
+ oprot.writeFieldEnd();
+ }
+ if (struct.gatewayUsageModuleLoadCommand != null) {
+ if (struct.isSetGatewayUsageModuleLoadCommand()) {
+ oprot.writeFieldBegin(GATEWAY_USAGE_MODULE_LOAD_COMMAND_FIELD_DESC);
+ oprot.writeString(struct.gatewayUsageModuleLoadCommand);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.gatewayUsageExecutable != null) {
+ if (struct.isSetGatewayUsageExecutable()) {
+ oprot.writeFieldBegin(GATEWAY_USAGE_EXECUTABLE_FIELD_DESC);
+ oprot.writeString(struct.gatewayUsageExecutable);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1633,7 +1914,16 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetMaxMemoryPerNode()) {
optionals.set(8);
}
- oprot.writeBitSet(optionals, 9);
+ if (struct.isSetXsedeGatewayUsageReporting()) {
+ optionals.set(9);
+ }
+ if (struct.isSetGatewayUsageModuleLoadCommand()) {
+ optionals.set(10);
+ }
+ if (struct.isSetGatewayUsageExecutable()) {
+ optionals.set(11);
+ }
+ oprot.writeBitSet(optionals, 12);
if (struct.isSetHostAliases()) {
{
oprot.writeI32(struct.hostAliases.size());
@@ -1698,6 +1988,15 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetMaxMemoryPerNode()) {
oprot.writeI32(struct.maxMemoryPerNode);
}
+ if (struct.isSetXsedeGatewayUsageReporting()) {
+ oprot.writeBool(struct.xsedeGatewayUsageReporting);
+ }
+ if (struct.isSetGatewayUsageModuleLoadCommand()) {
+ oprot.writeString(struct.gatewayUsageModuleLoadCommand);
+ }
+ if (struct.isSetGatewayUsageExecutable()) {
+ oprot.writeString(struct.gatewayUsageExecutable);
+ }
}
@Override
@@ -1707,7 +2006,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
struct.setComputeResourceIdIsSet(true);
struct.hostName = iprot.readString();
struct.setHostNameIsSet(true);
- BitSet incoming = iprot.readBitSet(9);
+ BitSet incoming = iprot.readBitSet(12);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -1803,6 +2102,18 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
struct.maxMemoryPerNode = iprot.readI32();
struct.setMaxMemoryPerNodeIsSet(true);
}
+ if (incoming.get(9)) {
+ struct.xsedeGatewayUsageReporting = iprot.readBool();
+ struct.setXsedeGatewayUsageReportingIsSet(true);
+ }
+ if (incoming.get(10)) {
+ struct.gatewayUsageModuleLoadCommand = iprot.readString();
+ struct.setGatewayUsageModuleLoadCommandIsSet(true);
+ }
+ if (incoming.get(11)) {
+ struct.gatewayUsageExecutable = iprot.readString();
+ struct.setGatewayUsageExecutableIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/dad110bc/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 aae48e2..024f506 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 7b6448c..a277ca3 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 74875cc..357f791 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 a60b76e..d695b54 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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/dad110bc/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 8e2cc40..cc74357 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.3)", date = "2016-02-12")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
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");
[06/16] airavata git commit: removing xsede from usage reporting
Posted by ch...@apache.org.
removing xsede from usage reporting
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/03cd77a4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/03cd77a4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/03cd77a4
Branch: refs/heads/master
Commit: 03cd77a484d72497626bfc759b2328109d0f16e3
Parents: dad110b
Author: smarru <sm...@apache.org>
Authored: Tue Feb 23 15:28:45 2016 -0500
Committer: smarru <sm...@apache.org>
Committed: Tue Feb 23 15:28:45 2016 -0500
----------------------------------------------------------------------
.../airavata/compute_resource_model_types.cpp | 24 ++--
.../lib/airavata/compute_resource_model_types.h | 14 +--
.../gateway_resource_profile_model_types.cpp | 24 ++--
.../gateway_resource_profile_model_types.h | 14 +--
.../Model/AppCatalog/ComputeResource/Types.php | 16 +--
.../Model/AppCatalog/GatewayProfile/Types.php | 16 +--
.../model/appcatalog/computeresource/ttypes.py | 18 +--
.../model/appcatalog/gatewayprofile/ttypes.py | 18 +--
.../ComputeResourceDescription.java | 112 +++++++++----------
.../gatewayprofile/GatewayResourceProfile.java | 112 +++++++++----------
.../compute_resource_model.thrift | 2 +-
.../gateway_resource_profile_model.thrift | 2 +-
12 files changed, 186 insertions(+), 186 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
index 13bdf38..506bfa0 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp
@@ -1633,9 +1633,9 @@ void ComputeResourceDescription::__set_maxMemoryPerNode(const int32_t val) {
__isset.maxMemoryPerNode = true;
}
-void ComputeResourceDescription::__set_xsedeGatewayUsageReporting(const bool val) {
- this->xsedeGatewayUsageReporting = val;
-__isset.xsedeGatewayUsageReporting = true;
+void ComputeResourceDescription::__set_gatewayUsageReporting(const bool val) {
+ this->gatewayUsageReporting = val;
+__isset.gatewayUsageReporting = true;
}
void ComputeResourceDescription::__set_gatewayUsageModuleLoadCommand(const std::string& val) {
@@ -1838,8 +1838,8 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol*
break;
case 12:
if (ftype == ::apache::thrift::protocol::T_BOOL) {
- xfer += iprot->readBool(this->xsedeGatewayUsageReporting);
- this->__isset.xsedeGatewayUsageReporting = true;
+ xfer += iprot->readBool(this->gatewayUsageReporting);
+ this->__isset.gatewayUsageReporting = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -1983,9 +1983,9 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol
xfer += oprot->writeI32(this->maxMemoryPerNode);
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.xsedeGatewayUsageReporting) {
- xfer += oprot->writeFieldBegin("xsedeGatewayUsageReporting", ::apache::thrift::protocol::T_BOOL, 12);
- xfer += oprot->writeBool(this->xsedeGatewayUsageReporting);
+ if (this->__isset.gatewayUsageReporting) {
+ xfer += oprot->writeFieldBegin("gatewayUsageReporting", ::apache::thrift::protocol::T_BOOL, 12);
+ xfer += oprot->writeBool(this->gatewayUsageReporting);
xfer += oprot->writeFieldEnd();
}
if (this->__isset.gatewayUsageModuleLoadCommand) {
@@ -2016,7 +2016,7 @@ void swap(ComputeResourceDescription &a, ComputeResourceDescription &b) {
swap(a.jobSubmissionInterfaces, b.jobSubmissionInterfaces);
swap(a.dataMovementInterfaces, b.dataMovementInterfaces);
swap(a.maxMemoryPerNode, b.maxMemoryPerNode);
- swap(a.xsedeGatewayUsageReporting, b.xsedeGatewayUsageReporting);
+ swap(a.gatewayUsageReporting, b.gatewayUsageReporting);
swap(a.gatewayUsageModuleLoadCommand, b.gatewayUsageModuleLoadCommand);
swap(a.gatewayUsageExecutable, b.gatewayUsageExecutable);
swap(a.__isset, b.__isset);
@@ -2034,7 +2034,7 @@ ComputeResourceDescription::ComputeResourceDescription(const ComputeResourceDesc
jobSubmissionInterfaces = other85.jobSubmissionInterfaces;
dataMovementInterfaces = other85.dataMovementInterfaces;
maxMemoryPerNode = other85.maxMemoryPerNode;
- xsedeGatewayUsageReporting = other85.xsedeGatewayUsageReporting;
+ gatewayUsageReporting = other85.gatewayUsageReporting;
gatewayUsageModuleLoadCommand = other85.gatewayUsageModuleLoadCommand;
gatewayUsageExecutable = other85.gatewayUsageExecutable;
__isset = other85.__isset;
@@ -2051,7 +2051,7 @@ ComputeResourceDescription& ComputeResourceDescription::operator=(const ComputeR
jobSubmissionInterfaces = other86.jobSubmissionInterfaces;
dataMovementInterfaces = other86.dataMovementInterfaces;
maxMemoryPerNode = other86.maxMemoryPerNode;
- xsedeGatewayUsageReporting = other86.xsedeGatewayUsageReporting;
+ gatewayUsageReporting = other86.gatewayUsageReporting;
gatewayUsageModuleLoadCommand = other86.gatewayUsageModuleLoadCommand;
gatewayUsageExecutable = other86.gatewayUsageExecutable;
__isset = other86.__isset;
@@ -2071,7 +2071,7 @@ void ComputeResourceDescription::printTo(std::ostream& out) const {
out << ", " << "jobSubmissionInterfaces="; (__isset.jobSubmissionInterfaces ? (out << to_string(jobSubmissionInterfaces)) : (out << "<null>"));
out << ", " << "dataMovementInterfaces="; (__isset.dataMovementInterfaces ? (out << to_string(dataMovementInterfaces)) : (out << "<null>"));
out << ", " << "maxMemoryPerNode="; (__isset.maxMemoryPerNode ? (out << to_string(maxMemoryPerNode)) : (out << "<null>"));
- out << ", " << "xsedeGatewayUsageReporting="; (__isset.xsedeGatewayUsageReporting ? (out << to_string(xsedeGatewayUsageReporting)) : (out << "<null>"));
+ out << ", " << "gatewayUsageReporting="; (__isset.gatewayUsageReporting ? (out << to_string(gatewayUsageReporting)) : (out << "<null>"));
out << ", " << "gatewayUsageModuleLoadCommand="; (__isset.gatewayUsageModuleLoadCommand ? (out << to_string(gatewayUsageModuleLoadCommand)) : (out << "<null>"));
out << ", " << "gatewayUsageExecutable="; (__isset.gatewayUsageExecutable ? (out << to_string(gatewayUsageExecutable)) : (out << "<null>"));
out << ")";
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
index 82ffc70..2d64916 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h
@@ -666,7 +666,7 @@ inline std::ostream& operator<<(std::ostream& out, const JobSubmissionInterface&
}
typedef struct _ComputeResourceDescription__isset {
- _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), xsedeGatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false) {}
+ _ComputeResourceDescription__isset() : hostAliases(false), ipAddresses(false), resourceDescription(false), enabled(false), batchQueues(false), fileSystems(false), jobSubmissionInterfaces(false), dataMovementInterfaces(false), maxMemoryPerNode(false), gatewayUsageReporting(false), gatewayUsageModuleLoadCommand(false), gatewayUsageExecutable(false) {}
bool hostAliases :1;
bool ipAddresses :1;
bool resourceDescription :1;
@@ -676,7 +676,7 @@ typedef struct _ComputeResourceDescription__isset {
bool jobSubmissionInterfaces :1;
bool dataMovementInterfaces :1;
bool maxMemoryPerNode :1;
- bool xsedeGatewayUsageReporting :1;
+ bool gatewayUsageReporting :1;
bool gatewayUsageModuleLoadCommand :1;
bool gatewayUsageExecutable :1;
} _ComputeResourceDescription__isset;
@@ -686,7 +686,7 @@ class ComputeResourceDescription {
ComputeResourceDescription(const ComputeResourceDescription&);
ComputeResourceDescription& operator=(const ComputeResourceDescription&);
- ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), xsedeGatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable() {
+ ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription(), enabled(0), maxMemoryPerNode(0), gatewayUsageReporting(0), gatewayUsageModuleLoadCommand(), gatewayUsageExecutable() {
}
virtual ~ComputeResourceDescription() throw();
@@ -701,7 +701,7 @@ class ComputeResourceDescription {
std::vector<JobSubmissionInterface> jobSubmissionInterfaces;
std::vector< ::apache::airavata::model::data::movement::DataMovementInterface> dataMovementInterfaces;
int32_t maxMemoryPerNode;
- bool xsedeGatewayUsageReporting;
+ bool gatewayUsageReporting;
std::string gatewayUsageModuleLoadCommand;
std::string gatewayUsageExecutable;
@@ -729,7 +729,7 @@ class ComputeResourceDescription {
void __set_maxMemoryPerNode(const int32_t val);
- void __set_xsedeGatewayUsageReporting(const bool val);
+ void __set_gatewayUsageReporting(const bool val);
void __set_gatewayUsageModuleLoadCommand(const std::string& val);
@@ -777,9 +777,9 @@ class ComputeResourceDescription {
return false;
else if (__isset.maxMemoryPerNode && !(maxMemoryPerNode == rhs.maxMemoryPerNode))
return false;
- if (__isset.xsedeGatewayUsageReporting != rhs.__isset.xsedeGatewayUsageReporting)
+ if (__isset.gatewayUsageReporting != rhs.__isset.gatewayUsageReporting)
return false;
- else if (__isset.xsedeGatewayUsageReporting && !(xsedeGatewayUsageReporting == rhs.xsedeGatewayUsageReporting))
+ else if (__isset.gatewayUsageReporting && !(gatewayUsageReporting == rhs.gatewayUsageReporting))
return false;
if (__isset.gatewayUsageModuleLoadCommand != rhs.__isset.gatewayUsageModuleLoadCommand)
return false;
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
index 761c232..70d5ff6 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
@@ -479,9 +479,9 @@ void GatewayResourceProfile::__set_storagePreferences(const std::vector<StorageP
__isset.storagePreferences = true;
}
-void GatewayResourceProfile::__set_xsedeUsageReportingGatewayId(const std::string& val) {
- this->xsedeUsageReportingGatewayId = val;
-__isset.xsedeUsageReportingGatewayId = true;
+void GatewayResourceProfile::__set_usageReportingGatewayId(const std::string& val) {
+ this->usageReportingGatewayId = val;
+__isset.usageReportingGatewayId = true;
}
uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* iprot) {
@@ -564,8 +564,8 @@ uint32_t GatewayResourceProfile::read(::apache::thrift::protocol::TProtocol* ipr
break;
case 5:
if (ftype == ::apache::thrift::protocol::T_STRING) {
- xfer += iprot->readString(this->xsedeUsageReportingGatewayId);
- this->__isset.xsedeUsageReportingGatewayId = true;
+ xfer += iprot->readString(this->usageReportingGatewayId);
+ this->__isset.usageReportingGatewayId = true;
} else {
xfer += iprot->skip(ftype);
}
@@ -624,9 +624,9 @@ uint32_t GatewayResourceProfile::write(::apache::thrift::protocol::TProtocol* op
}
xfer += oprot->writeFieldEnd();
}
- if (this->__isset.xsedeUsageReportingGatewayId) {
- xfer += oprot->writeFieldBegin("xsedeUsageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 5);
- xfer += oprot->writeString(this->xsedeUsageReportingGatewayId);
+ if (this->__isset.usageReportingGatewayId) {
+ xfer += oprot->writeFieldBegin("usageReportingGatewayId", ::apache::thrift::protocol::T_STRING, 5);
+ xfer += oprot->writeString(this->usageReportingGatewayId);
xfer += oprot->writeFieldEnd();
}
xfer += oprot->writeFieldStop();
@@ -640,7 +640,7 @@ void swap(GatewayResourceProfile &a, GatewayResourceProfile &b) {
swap(a.credentialStoreToken, b.credentialStoreToken);
swap(a.computeResourcePreferences, b.computeResourcePreferences);
swap(a.storagePreferences, b.storagePreferences);
- swap(a.xsedeUsageReportingGatewayId, b.xsedeUsageReportingGatewayId);
+ swap(a.usageReportingGatewayId, b.usageReportingGatewayId);
swap(a.__isset, b.__isset);
}
@@ -649,7 +649,7 @@ GatewayResourceProfile::GatewayResourceProfile(const GatewayResourceProfile& oth
credentialStoreToken = other18.credentialStoreToken;
computeResourcePreferences = other18.computeResourcePreferences;
storagePreferences = other18.storagePreferences;
- xsedeUsageReportingGatewayId = other18.xsedeUsageReportingGatewayId;
+ usageReportingGatewayId = other18.usageReportingGatewayId;
__isset = other18.__isset;
}
GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceProfile& other19) {
@@ -657,7 +657,7 @@ GatewayResourceProfile& GatewayResourceProfile::operator=(const GatewayResourceP
credentialStoreToken = other19.credentialStoreToken;
computeResourcePreferences = other19.computeResourcePreferences;
storagePreferences = other19.storagePreferences;
- xsedeUsageReportingGatewayId = other19.xsedeUsageReportingGatewayId;
+ usageReportingGatewayId = other19.usageReportingGatewayId;
__isset = other19.__isset;
return *this;
}
@@ -668,7 +668,7 @@ void GatewayResourceProfile::printTo(std::ostream& out) const {
out << ", " << "credentialStoreToken="; (__isset.credentialStoreToken ? (out << to_string(credentialStoreToken)) : (out << "<null>"));
out << ", " << "computeResourcePreferences="; (__isset.computeResourcePreferences ? (out << to_string(computeResourcePreferences)) : (out << "<null>"));
out << ", " << "storagePreferences="; (__isset.storagePreferences ? (out << to_string(storagePreferences)) : (out << "<null>"));
- out << ", " << "xsedeUsageReportingGatewayId="; (__isset.xsedeUsageReportingGatewayId ? (out << to_string(xsedeUsageReportingGatewayId)) : (out << "<null>"));
+ out << ", " << "usageReportingGatewayId="; (__isset.usageReportingGatewayId ? (out << to_string(usageReportingGatewayId)) : (out << "<null>"));
out << ")";
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
index c858a90..d24a778 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
@@ -220,11 +220,11 @@ inline std::ostream& operator<<(std::ostream& out, const StoragePreference& obj)
}
typedef struct _GatewayResourceProfile__isset {
- _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false), xsedeUsageReportingGatewayId(false) {}
+ _GatewayResourceProfile__isset() : credentialStoreToken(false), computeResourcePreferences(false), storagePreferences(false), usageReportingGatewayId(false) {}
bool credentialStoreToken :1;
bool computeResourcePreferences :1;
bool storagePreferences :1;
- bool xsedeUsageReportingGatewayId :1;
+ bool usageReportingGatewayId :1;
} _GatewayResourceProfile__isset;
class GatewayResourceProfile {
@@ -232,7 +232,7 @@ class GatewayResourceProfile {
GatewayResourceProfile(const GatewayResourceProfile&);
GatewayResourceProfile& operator=(const GatewayResourceProfile&);
- GatewayResourceProfile() : gatewayID(), credentialStoreToken(), xsedeUsageReportingGatewayId() {
+ GatewayResourceProfile() : gatewayID(), credentialStoreToken(), usageReportingGatewayId() {
}
virtual ~GatewayResourceProfile() throw();
@@ -240,7 +240,7 @@ class GatewayResourceProfile {
std::string credentialStoreToken;
std::vector<ComputeResourcePreference> computeResourcePreferences;
std::vector<StoragePreference> storagePreferences;
- std::string xsedeUsageReportingGatewayId;
+ std::string usageReportingGatewayId;
_GatewayResourceProfile__isset __isset;
@@ -252,7 +252,7 @@ class GatewayResourceProfile {
void __set_storagePreferences(const std::vector<StoragePreference> & val);
- void __set_xsedeUsageReportingGatewayId(const std::string& val);
+ void __set_usageReportingGatewayId(const std::string& val);
bool operator == (const GatewayResourceProfile & rhs) const
{
@@ -270,9 +270,9 @@ class GatewayResourceProfile {
return false;
else if (__isset.storagePreferences && !(storagePreferences == rhs.storagePreferences))
return false;
- if (__isset.xsedeUsageReportingGatewayId != rhs.__isset.xsedeUsageReportingGatewayId)
+ if (__isset.usageReportingGatewayId != rhs.__isset.usageReportingGatewayId)
return false;
- else if (__isset.xsedeUsageReportingGatewayId && !(xsedeUsageReportingGatewayId == rhs.xsedeUsageReportingGatewayId))
+ else if (__isset.usageReportingGatewayId && !(usageReportingGatewayId == rhs.usageReportingGatewayId))
return false;
return true;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
index 85d77e7..5b79870 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php
@@ -1719,7 +1719,7 @@ class ComputeResourceDescription {
/**
* @var bool
*/
- public $xsedeGatewayUsageReporting = null;
+ public $gatewayUsageReporting = null;
/**
* @var string
*/
@@ -1808,7 +1808,7 @@ class ComputeResourceDescription {
'type' => TType::I32,
),
12 => array(
- 'var' => 'xsedeGatewayUsageReporting',
+ 'var' => 'gatewayUsageReporting',
'type' => TType::BOOL,
),
13 => array(
@@ -1855,8 +1855,8 @@ class ComputeResourceDescription {
if (isset($vals['maxMemoryPerNode'])) {
$this->maxMemoryPerNode = $vals['maxMemoryPerNode'];
}
- if (isset($vals['xsedeGatewayUsageReporting'])) {
- $this->xsedeGatewayUsageReporting = $vals['xsedeGatewayUsageReporting'];
+ if (isset($vals['gatewayUsageReporting'])) {
+ $this->gatewayUsageReporting = $vals['gatewayUsageReporting'];
}
if (isset($vals['gatewayUsageModuleLoadCommand'])) {
$this->gatewayUsageModuleLoadCommand = $vals['gatewayUsageModuleLoadCommand'];
@@ -2031,7 +2031,7 @@ class ComputeResourceDescription {
break;
case 12:
if ($ftype == TType::BOOL) {
- $xfer += $input->readBool($this->xsedeGatewayUsageReporting);
+ $xfer += $input->readBool($this->gatewayUsageReporting);
} else {
$xfer += $input->skip($ftype);
}
@@ -2191,9 +2191,9 @@ class ComputeResourceDescription {
$xfer += $output->writeI32($this->maxMemoryPerNode);
$xfer += $output->writeFieldEnd();
}
- if ($this->xsedeGatewayUsageReporting !== null) {
- $xfer += $output->writeFieldBegin('xsedeGatewayUsageReporting', TType::BOOL, 12);
- $xfer += $output->writeBool($this->xsedeGatewayUsageReporting);
+ if ($this->gatewayUsageReporting !== null) {
+ $xfer += $output->writeFieldBegin('gatewayUsageReporting', TType::BOOL, 12);
+ $xfer += $output->writeBool($this->gatewayUsageReporting);
$xfer += $output->writeFieldEnd();
}
if ($this->gatewayUsageModuleLoadCommand !== null) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
index 3374c24..37e7837 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
@@ -489,7 +489,7 @@ class GatewayResourceProfile {
/**
* @var string
*/
- public $xsedeUsageReportingGatewayId = null;
+ public $usageReportingGatewayId = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -521,7 +521,7 @@ class GatewayResourceProfile {
),
),
5 => array(
- 'var' => 'xsedeUsageReportingGatewayId',
+ 'var' => 'usageReportingGatewayId',
'type' => TType::STRING,
),
);
@@ -539,8 +539,8 @@ class GatewayResourceProfile {
if (isset($vals['storagePreferences'])) {
$this->storagePreferences = $vals['storagePreferences'];
}
- if (isset($vals['xsedeUsageReportingGatewayId'])) {
- $this->xsedeUsageReportingGatewayId = $vals['xsedeUsageReportingGatewayId'];
+ if (isset($vals['usageReportingGatewayId'])) {
+ $this->usageReportingGatewayId = $vals['usageReportingGatewayId'];
}
}
}
@@ -616,7 +616,7 @@ class GatewayResourceProfile {
break;
case 5:
if ($ftype == TType::STRING) {
- $xfer += $input->readString($this->xsedeUsageReportingGatewayId);
+ $xfer += $input->readString($this->usageReportingGatewayId);
} else {
$xfer += $input->skip($ftype);
}
@@ -678,9 +678,9 @@ class GatewayResourceProfile {
}
$xfer += $output->writeFieldEnd();
}
- if ($this->xsedeUsageReportingGatewayId !== null) {
- $xfer += $output->writeFieldBegin('xsedeUsageReportingGatewayId', TType::STRING, 5);
- $xfer += $output->writeString($this->xsedeUsageReportingGatewayId);
+ if ($this->usageReportingGatewayId !== null) {
+ $xfer += $output->writeFieldBegin('usageReportingGatewayId', TType::STRING, 5);
+ $xfer += $output->writeString($this->usageReportingGatewayId);
$xfer += $output->writeFieldEnd();
}
$xfer += $output->writeFieldStop();
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
index 36e403d..7b319f6 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py
@@ -1340,7 +1340,7 @@ class ComputeResourceDescription:
- jobSubmissionInterfaces
- dataMovementInterfaces
- maxMemoryPerNode
- - xsedeGatewayUsageReporting
+ - gatewayUsageReporting
- gatewayUsageModuleLoadCommand
- gatewayUsageExecutable
"""
@@ -1358,12 +1358,12 @@ class ComputeResourceDescription:
(9, TType.LIST, 'jobSubmissionInterfaces', (TType.STRUCT,(JobSubmissionInterface, JobSubmissionInterface.thrift_spec)), None, ), # 9
(10, TType.LIST, 'dataMovementInterfaces', (TType.STRUCT,(apache.airavata.model.data.movement.ttypes.DataMovementInterface, apache.airavata.model.data.movement.ttypes.DataMovementInterface.thrift_spec)), None, ), # 10
(11, TType.I32, 'maxMemoryPerNode', None, None, ), # 11
- (12, TType.BOOL, 'xsedeGatewayUsageReporting', None, None, ), # 12
+ (12, TType.BOOL, 'gatewayUsageReporting', None, None, ), # 12
(13, TType.STRING, 'gatewayUsageModuleLoadCommand', None, None, ), # 13
(14, TType.STRING, 'gatewayUsageExecutable', None, None, ), # 14
)
- def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, xsedeGatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None,):
+ def __init__(self, computeResourceId=thrift_spec[1][4], hostName=None, hostAliases=None, ipAddresses=None, resourceDescription=None, enabled=None, batchQueues=None, fileSystems=None, jobSubmissionInterfaces=None, dataMovementInterfaces=None, maxMemoryPerNode=None, gatewayUsageReporting=None, gatewayUsageModuleLoadCommand=None, gatewayUsageExecutable=None,):
self.computeResourceId = computeResourceId
self.hostName = hostName
self.hostAliases = hostAliases
@@ -1375,7 +1375,7 @@ class ComputeResourceDescription:
self.jobSubmissionInterfaces = jobSubmissionInterfaces
self.dataMovementInterfaces = dataMovementInterfaces
self.maxMemoryPerNode = maxMemoryPerNode
- self.xsedeGatewayUsageReporting = xsedeGatewayUsageReporting
+ self.gatewayUsageReporting = gatewayUsageReporting
self.gatewayUsageModuleLoadCommand = gatewayUsageModuleLoadCommand
self.gatewayUsageExecutable = gatewayUsageExecutable
@@ -1479,7 +1479,7 @@ class ComputeResourceDescription:
iprot.skip(ftype)
elif fid == 12:
if ftype == TType.BOOL:
- self.xsedeGatewayUsageReporting = iprot.readBool()
+ self.gatewayUsageReporting = iprot.readBool()
else:
iprot.skip(ftype)
elif fid == 13:
@@ -1565,9 +1565,9 @@ class ComputeResourceDescription:
oprot.writeFieldBegin('maxMemoryPerNode', TType.I32, 11)
oprot.writeI32(self.maxMemoryPerNode)
oprot.writeFieldEnd()
- if self.xsedeGatewayUsageReporting is not None:
- oprot.writeFieldBegin('xsedeGatewayUsageReporting', TType.BOOL, 12)
- oprot.writeBool(self.xsedeGatewayUsageReporting)
+ if self.gatewayUsageReporting is not None:
+ oprot.writeFieldBegin('gatewayUsageReporting', TType.BOOL, 12)
+ oprot.writeBool(self.gatewayUsageReporting)
oprot.writeFieldEnd()
if self.gatewayUsageModuleLoadCommand is not None:
oprot.writeFieldBegin('gatewayUsageModuleLoadCommand', TType.STRING, 13)
@@ -1601,7 +1601,7 @@ class ComputeResourceDescription:
value = (value * 31) ^ hash(self.jobSubmissionInterfaces)
value = (value * 31) ^ hash(self.dataMovementInterfaces)
value = (value * 31) ^ hash(self.maxMemoryPerNode)
- value = (value * 31) ^ hash(self.xsedeGatewayUsageReporting)
+ value = (value * 31) ^ hash(self.gatewayUsageReporting)
value = (value * 31) ^ hash(self.gatewayUsageModuleLoadCommand)
value = (value * 31) ^ hash(self.gatewayUsageExecutable)
return value
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
index a5f9620..ddd0723 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
@@ -351,7 +351,7 @@ class GatewayResourceProfile:
- credentialStoreToken
- computeResourcePreferences
- storagePreferences
- - xsedeUsageReportingGatewayId
+ - usageReportingGatewayId
"""
thrift_spec = (
@@ -360,15 +360,15 @@ class GatewayResourceProfile:
(2, TType.STRING, 'credentialStoreToken', None, None, ), # 2
(3, TType.LIST, 'computeResourcePreferences', (TType.STRUCT,(ComputeResourcePreference, ComputeResourcePreference.thrift_spec)), None, ), # 3
(4, TType.LIST, 'storagePreferences', (TType.STRUCT,(StoragePreference, StoragePreference.thrift_spec)), None, ), # 4
- (5, TType.STRING, 'xsedeUsageReportingGatewayId', None, None, ), # 5
+ (5, TType.STRING, 'usageReportingGatewayId', None, None, ), # 5
)
- def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None, xsedeUsageReportingGatewayId=None,):
+ def __init__(self, gatewayID=None, credentialStoreToken=None, computeResourcePreferences=None, storagePreferences=None, usageReportingGatewayId=None,):
self.gatewayID = gatewayID
self.credentialStoreToken = credentialStoreToken
self.computeResourcePreferences = computeResourcePreferences
self.storagePreferences = storagePreferences
- self.xsedeUsageReportingGatewayId = xsedeUsageReportingGatewayId
+ self.usageReportingGatewayId = usageReportingGatewayId
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:
@@ -413,7 +413,7 @@ class GatewayResourceProfile:
iprot.skip(ftype)
elif fid == 5:
if ftype == TType.STRING:
- self.xsedeUsageReportingGatewayId = iprot.readString()
+ self.usageReportingGatewayId = iprot.readString()
else:
iprot.skip(ftype)
else:
@@ -448,9 +448,9 @@ class GatewayResourceProfile:
iter13.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.xsedeUsageReportingGatewayId is not None:
- oprot.writeFieldBegin('xsedeUsageReportingGatewayId', TType.STRING, 5)
- oprot.writeString(self.xsedeUsageReportingGatewayId)
+ if self.usageReportingGatewayId is not None:
+ oprot.writeFieldBegin('usageReportingGatewayId', TType.STRING, 5)
+ oprot.writeString(self.usageReportingGatewayId)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -467,7 +467,7 @@ class GatewayResourceProfile:
value = (value * 31) ^ hash(self.credentialStoreToken)
value = (value * 31) ^ hash(self.computeResourcePreferences)
value = (value * 31) ^ hash(self.storagePreferences)
- value = (value * 31) ^ hash(self.xsedeUsageReportingGatewayId)
+ value = (value * 31) ^ hash(self.usageReportingGatewayId)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/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 c77ed54..5c4511c 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
@@ -95,7 +95,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private static final org.apache.thrift.protocol.TField JOB_SUBMISSION_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("jobSubmissionInterfaces", org.apache.thrift.protocol.TType.LIST, (short)9);
private static final org.apache.thrift.protocol.TField DATA_MOVEMENT_INTERFACES_FIELD_DESC = new org.apache.thrift.protocol.TField("dataMovementInterfaces", org.apache.thrift.protocol.TType.LIST, (short)10);
private static final org.apache.thrift.protocol.TField MAX_MEMORY_PER_NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("maxMemoryPerNode", org.apache.thrift.protocol.TType.I32, (short)11);
- private static final org.apache.thrift.protocol.TField XSEDE_GATEWAY_USAGE_REPORTING_FIELD_DESC = new org.apache.thrift.protocol.TField("xsedeGatewayUsageReporting", org.apache.thrift.protocol.TType.BOOL, (short)12);
+ private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_REPORTING_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageReporting", org.apache.thrift.protocol.TType.BOOL, (short)12);
private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_MODULE_LOAD_COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageModuleLoadCommand", org.apache.thrift.protocol.TType.STRING, (short)13);
private static final org.apache.thrift.protocol.TField GATEWAY_USAGE_EXECUTABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayUsageExecutable", org.apache.thrift.protocol.TType.STRING, (short)14);
@@ -116,7 +116,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
private List<JobSubmissionInterface> jobSubmissionInterfaces; // optional
private List<org.apache.airavata.model.data.movement.DataMovementInterface> dataMovementInterfaces; // optional
private int maxMemoryPerNode; // optional
- private boolean xsedeGatewayUsageReporting; // optional
+ private boolean gatewayUsageReporting; // optional
private String gatewayUsageModuleLoadCommand; // optional
private String gatewayUsageExecutable; // optional
@@ -133,7 +133,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
JOB_SUBMISSION_INTERFACES((short)9, "jobSubmissionInterfaces"),
DATA_MOVEMENT_INTERFACES((short)10, "dataMovementInterfaces"),
MAX_MEMORY_PER_NODE((short)11, "maxMemoryPerNode"),
- XSEDE_GATEWAY_USAGE_REPORTING((short)12, "xsedeGatewayUsageReporting"),
+ GATEWAY_USAGE_REPORTING((short)12, "gatewayUsageReporting"),
GATEWAY_USAGE_MODULE_LOAD_COMMAND((short)13, "gatewayUsageModuleLoadCommand"),
GATEWAY_USAGE_EXECUTABLE((short)14, "gatewayUsageExecutable");
@@ -172,8 +172,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return DATA_MOVEMENT_INTERFACES;
case 11: // MAX_MEMORY_PER_NODE
return MAX_MEMORY_PER_NODE;
- case 12: // XSEDE_GATEWAY_USAGE_REPORTING
- return XSEDE_GATEWAY_USAGE_REPORTING;
+ case 12: // GATEWAY_USAGE_REPORTING
+ return GATEWAY_USAGE_REPORTING;
case 13: // GATEWAY_USAGE_MODULE_LOAD_COMMAND
return GATEWAY_USAGE_MODULE_LOAD_COMMAND;
case 14: // GATEWAY_USAGE_EXECUTABLE
@@ -220,9 +220,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
// isset id assignments
private static final int __ENABLED_ISSET_ID = 0;
private static final int __MAXMEMORYPERNODE_ISSET_ID = 1;
- private static final int __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID = 2;
+ private static final int __GATEWAYUSAGEREPORTING_ISSET_ID = 2;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.XSEDE_GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE};
+ private static final _Fields optionals[] = {_Fields.HOST_ALIASES,_Fields.IP_ADDRESSES,_Fields.RESOURCE_DESCRIPTION,_Fields.ENABLED,_Fields.BATCH_QUEUES,_Fields.FILE_SYSTEMS,_Fields.JOB_SUBMISSION_INTERFACES,_Fields.DATA_MOVEMENT_INTERFACES,_Fields.MAX_MEMORY_PER_NODE,_Fields.GATEWAY_USAGE_REPORTING,_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND,_Fields.GATEWAY_USAGE_EXECUTABLE};
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);
@@ -255,7 +255,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.data.movement.DataMovementInterface.class))));
tmpMap.put(_Fields.MAX_MEMORY_PER_NODE, new org.apache.thrift.meta_data.FieldMetaData("maxMemoryPerNode", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
- tmpMap.put(_Fields.XSEDE_GATEWAY_USAGE_REPORTING, new org.apache.thrift.meta_data.FieldMetaData("xsedeGatewayUsageReporting", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.GATEWAY_USAGE_REPORTING, new org.apache.thrift.meta_data.FieldMetaData("gatewayUsageReporting", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.GATEWAY_USAGE_MODULE_LOAD_COMMAND, new org.apache.thrift.meta_data.FieldMetaData("gatewayUsageModuleLoadCommand", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
@@ -339,7 +339,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
this.dataMovementInterfaces = __this__dataMovementInterfaces;
}
this.maxMemoryPerNode = other.maxMemoryPerNode;
- this.xsedeGatewayUsageReporting = other.xsedeGatewayUsageReporting;
+ this.gatewayUsageReporting = other.gatewayUsageReporting;
if (other.isSetGatewayUsageModuleLoadCommand()) {
this.gatewayUsageModuleLoadCommand = other.gatewayUsageModuleLoadCommand;
}
@@ -368,8 +368,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
this.dataMovementInterfaces = null;
setMaxMemoryPerNodeIsSet(false);
this.maxMemoryPerNode = 0;
- setXsedeGatewayUsageReportingIsSet(false);
- this.xsedeGatewayUsageReporting = false;
+ setGatewayUsageReportingIsSet(false);
+ this.gatewayUsageReporting = false;
this.gatewayUsageModuleLoadCommand = null;
this.gatewayUsageExecutable = null;
}
@@ -711,26 +711,26 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXMEMORYPERNODE_ISSET_ID, value);
}
- public boolean isXsedeGatewayUsageReporting() {
- return this.xsedeGatewayUsageReporting;
+ public boolean isGatewayUsageReporting() {
+ return this.gatewayUsageReporting;
}
- public void setXsedeGatewayUsageReporting(boolean xsedeGatewayUsageReporting) {
- this.xsedeGatewayUsageReporting = xsedeGatewayUsageReporting;
- setXsedeGatewayUsageReportingIsSet(true);
+ public void setGatewayUsageReporting(boolean gatewayUsageReporting) {
+ this.gatewayUsageReporting = gatewayUsageReporting;
+ setGatewayUsageReportingIsSet(true);
}
- public void unsetXsedeGatewayUsageReporting() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID);
+ public void unsetGatewayUsageReporting() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __GATEWAYUSAGEREPORTING_ISSET_ID);
}
- /** Returns true if field xsedeGatewayUsageReporting is set (has been assigned a value) and false otherwise */
- public boolean isSetXsedeGatewayUsageReporting() {
- return EncodingUtils.testBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID);
+ /** Returns true if field gatewayUsageReporting is set (has been assigned a value) and false otherwise */
+ public boolean isSetGatewayUsageReporting() {
+ return EncodingUtils.testBit(__isset_bitfield, __GATEWAYUSAGEREPORTING_ISSET_ID);
}
- public void setXsedeGatewayUsageReportingIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __XSEDEGATEWAYUSAGEREPORTING_ISSET_ID, value);
+ public void setGatewayUsageReportingIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __GATEWAYUSAGEREPORTING_ISSET_ID, value);
}
public String getGatewayUsageModuleLoadCommand() {
@@ -869,11 +869,11 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
}
break;
- case XSEDE_GATEWAY_USAGE_REPORTING:
+ case GATEWAY_USAGE_REPORTING:
if (value == null) {
- unsetXsedeGatewayUsageReporting();
+ unsetGatewayUsageReporting();
} else {
- setXsedeGatewayUsageReporting((Boolean)value);
+ setGatewayUsageReporting((Boolean)value);
}
break;
@@ -931,8 +931,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
case MAX_MEMORY_PER_NODE:
return getMaxMemoryPerNode();
- case XSEDE_GATEWAY_USAGE_REPORTING:
- return isXsedeGatewayUsageReporting();
+ case GATEWAY_USAGE_REPORTING:
+ return isGatewayUsageReporting();
case GATEWAY_USAGE_MODULE_LOAD_COMMAND:
return getGatewayUsageModuleLoadCommand();
@@ -973,8 +973,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return isSetDataMovementInterfaces();
case MAX_MEMORY_PER_NODE:
return isSetMaxMemoryPerNode();
- case XSEDE_GATEWAY_USAGE_REPORTING:
- return isSetXsedeGatewayUsageReporting();
+ case GATEWAY_USAGE_REPORTING:
+ return isSetGatewayUsageReporting();
case GATEWAY_USAGE_MODULE_LOAD_COMMAND:
return isSetGatewayUsageModuleLoadCommand();
case GATEWAY_USAGE_EXECUTABLE:
@@ -1095,12 +1095,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return false;
}
- boolean this_present_xsedeGatewayUsageReporting = true && this.isSetXsedeGatewayUsageReporting();
- boolean that_present_xsedeGatewayUsageReporting = true && that.isSetXsedeGatewayUsageReporting();
- if (this_present_xsedeGatewayUsageReporting || that_present_xsedeGatewayUsageReporting) {
- if (!(this_present_xsedeGatewayUsageReporting && that_present_xsedeGatewayUsageReporting))
+ boolean this_present_gatewayUsageReporting = true && this.isSetGatewayUsageReporting();
+ boolean that_present_gatewayUsageReporting = true && that.isSetGatewayUsageReporting();
+ if (this_present_gatewayUsageReporting || that_present_gatewayUsageReporting) {
+ if (!(this_present_gatewayUsageReporting && that_present_gatewayUsageReporting))
return false;
- if (this.xsedeGatewayUsageReporting != that.xsedeGatewayUsageReporting)
+ if (this.gatewayUsageReporting != that.gatewayUsageReporting)
return false;
}
@@ -1184,10 +1184,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (present_maxMemoryPerNode)
list.add(maxMemoryPerNode);
- boolean present_xsedeGatewayUsageReporting = true && (isSetXsedeGatewayUsageReporting());
- list.add(present_xsedeGatewayUsageReporting);
- if (present_xsedeGatewayUsageReporting)
- list.add(xsedeGatewayUsageReporting);
+ boolean present_gatewayUsageReporting = true && (isSetGatewayUsageReporting());
+ list.add(present_gatewayUsageReporting);
+ if (present_gatewayUsageReporting)
+ list.add(gatewayUsageReporting);
boolean present_gatewayUsageModuleLoadCommand = true && (isSetGatewayUsageModuleLoadCommand());
list.add(present_gatewayUsageModuleLoadCommand);
@@ -1320,12 +1320,12 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetXsedeGatewayUsageReporting()).compareTo(other.isSetXsedeGatewayUsageReporting());
+ lastComparison = Boolean.valueOf(isSetGatewayUsageReporting()).compareTo(other.isSetGatewayUsageReporting());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetXsedeGatewayUsageReporting()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.xsedeGatewayUsageReporting, other.xsedeGatewayUsageReporting);
+ if (isSetGatewayUsageReporting()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayUsageReporting, other.gatewayUsageReporting);
if (lastComparison != 0) {
return lastComparison;
}
@@ -1467,10 +1467,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
sb.append(this.maxMemoryPerNode);
first = false;
}
- if (isSetXsedeGatewayUsageReporting()) {
+ if (isSetGatewayUsageReporting()) {
if (!first) sb.append(", ");
- sb.append("xsedeGatewayUsageReporting:");
- sb.append(this.xsedeGatewayUsageReporting);
+ sb.append("gatewayUsageReporting:");
+ sb.append(this.gatewayUsageReporting);
first = false;
}
if (isSetGatewayUsageModuleLoadCommand()) {
@@ -1699,10 +1699,10 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // XSEDE_GATEWAY_USAGE_REPORTING
+ case 12: // GATEWAY_USAGE_REPORTING
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
- struct.xsedeGatewayUsageReporting = iprot.readBool();
- struct.setXsedeGatewayUsageReportingIsSet(true);
+ struct.gatewayUsageReporting = iprot.readBool();
+ struct.setGatewayUsageReportingIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1848,9 +1848,9 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
oprot.writeI32(struct.maxMemoryPerNode);
oprot.writeFieldEnd();
}
- if (struct.isSetXsedeGatewayUsageReporting()) {
- oprot.writeFieldBegin(XSEDE_GATEWAY_USAGE_REPORTING_FIELD_DESC);
- oprot.writeBool(struct.xsedeGatewayUsageReporting);
+ if (struct.isSetGatewayUsageReporting()) {
+ oprot.writeFieldBegin(GATEWAY_USAGE_REPORTING_FIELD_DESC);
+ oprot.writeBool(struct.gatewayUsageReporting);
oprot.writeFieldEnd();
}
if (struct.gatewayUsageModuleLoadCommand != null) {
@@ -1914,7 +1914,7 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetMaxMemoryPerNode()) {
optionals.set(8);
}
- if (struct.isSetXsedeGatewayUsageReporting()) {
+ if (struct.isSetGatewayUsageReporting()) {
optionals.set(9);
}
if (struct.isSetGatewayUsageModuleLoadCommand()) {
@@ -1988,8 +1988,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
if (struct.isSetMaxMemoryPerNode()) {
oprot.writeI32(struct.maxMemoryPerNode);
}
- if (struct.isSetXsedeGatewayUsageReporting()) {
- oprot.writeBool(struct.xsedeGatewayUsageReporting);
+ if (struct.isSetGatewayUsageReporting()) {
+ oprot.writeBool(struct.gatewayUsageReporting);
}
if (struct.isSetGatewayUsageModuleLoadCommand()) {
oprot.writeString(struct.gatewayUsageModuleLoadCommand);
@@ -2103,8 +2103,8 @@ public class ComputeResourceDescription implements org.apache.thrift.TBase<Compu
struct.setMaxMemoryPerNodeIsSet(true);
}
if (incoming.get(9)) {
- struct.xsedeGatewayUsageReporting = iprot.readBool();
- struct.setXsedeGatewayUsageReportingIsSet(true);
+ struct.gatewayUsageReporting = iprot.readBool();
+ struct.setGatewayUsageReportingIsSet(true);
}
if (incoming.get(10)) {
struct.gatewayUsageModuleLoadCommand = iprot.readString();
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/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 79a9d0f..ea29157 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
@@ -72,7 +72,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private static final org.apache.thrift.protocol.TField CREDENTIAL_STORE_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("credentialStoreToken", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourcePreferences", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField STORAGE_PREFERENCES_FIELD_DESC = new org.apache.thrift.protocol.TField("storagePreferences", org.apache.thrift.protocol.TType.LIST, (short)4);
- private static final org.apache.thrift.protocol.TField XSEDE_USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("xsedeUsageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField USAGE_REPORTING_GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("usageReportingGatewayId", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -84,7 +84,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
private String credentialStoreToken; // optional
private List<ComputeResourcePreference> computeResourcePreferences; // optional
private List<StoragePreference> storagePreferences; // optional
- private String xsedeUsageReportingGatewayId; // optional
+ private String usageReportingGatewayId; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -92,7 +92,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
CREDENTIAL_STORE_TOKEN((short)2, "credentialStoreToken"),
COMPUTE_RESOURCE_PREFERENCES((short)3, "computeResourcePreferences"),
STORAGE_PREFERENCES((short)4, "storagePreferences"),
- XSEDE_USAGE_REPORTING_GATEWAY_ID((short)5, "xsedeUsageReportingGatewayId");
+ USAGE_REPORTING_GATEWAY_ID((short)5, "usageReportingGatewayId");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -115,8 +115,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return COMPUTE_RESOURCE_PREFERENCES;
case 4: // STORAGE_PREFERENCES
return STORAGE_PREFERENCES;
- case 5: // XSEDE_USAGE_REPORTING_GATEWAY_ID
- return XSEDE_USAGE_REPORTING_GATEWAY_ID;
+ case 5: // USAGE_REPORTING_GATEWAY_ID
+ return USAGE_REPORTING_GATEWAY_ID;
default:
return null;
}
@@ -157,7 +157,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.XSEDE_USAGE_REPORTING_GATEWAY_ID};
+ private static final _Fields optionals[] = {_Fields.CREDENTIAL_STORE_TOKEN,_Fields.COMPUTE_RESOURCE_PREFERENCES,_Fields.STORAGE_PREFERENCES,_Fields.USAGE_REPORTING_GATEWAY_ID};
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);
@@ -171,7 +171,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
tmpMap.put(_Fields.STORAGE_PREFERENCES, new org.apache.thrift.meta_data.FieldMetaData("storagePreferences", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StoragePreference.class))));
- tmpMap.put(_Fields.XSEDE_USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("xsedeUsageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ tmpMap.put(_Fields.USAGE_REPORTING_GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("usageReportingGatewayId", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GatewayResourceProfile.class, metaDataMap);
@@ -211,8 +211,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
this.storagePreferences = __this__storagePreferences;
}
- if (other.isSetXsedeUsageReportingGatewayId()) {
- this.xsedeUsageReportingGatewayId = other.xsedeUsageReportingGatewayId;
+ if (other.isSetUsageReportingGatewayId()) {
+ this.usageReportingGatewayId = other.usageReportingGatewayId;
}
}
@@ -226,7 +226,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
this.credentialStoreToken = null;
this.computeResourcePreferences = null;
this.storagePreferences = null;
- this.xsedeUsageReportingGatewayId = null;
+ this.usageReportingGatewayId = null;
}
public String getGatewayID() {
@@ -351,26 +351,26 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
- public String getXsedeUsageReportingGatewayId() {
- return this.xsedeUsageReportingGatewayId;
+ public String getUsageReportingGatewayId() {
+ return this.usageReportingGatewayId;
}
- public void setXsedeUsageReportingGatewayId(String xsedeUsageReportingGatewayId) {
- this.xsedeUsageReportingGatewayId = xsedeUsageReportingGatewayId;
+ public void setUsageReportingGatewayId(String usageReportingGatewayId) {
+ this.usageReportingGatewayId = usageReportingGatewayId;
}
- public void unsetXsedeUsageReportingGatewayId() {
- this.xsedeUsageReportingGatewayId = null;
+ public void unsetUsageReportingGatewayId() {
+ this.usageReportingGatewayId = null;
}
- /** Returns true if field xsedeUsageReportingGatewayId is set (has been assigned a value) and false otherwise */
- public boolean isSetXsedeUsageReportingGatewayId() {
- return this.xsedeUsageReportingGatewayId != null;
+ /** Returns true if field usageReportingGatewayId is set (has been assigned a value) and false otherwise */
+ public boolean isSetUsageReportingGatewayId() {
+ return this.usageReportingGatewayId != null;
}
- public void setXsedeUsageReportingGatewayIdIsSet(boolean value) {
+ public void setUsageReportingGatewayIdIsSet(boolean value) {
if (!value) {
- this.xsedeUsageReportingGatewayId = null;
+ this.usageReportingGatewayId = null;
}
}
@@ -408,11 +408,11 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
break;
- case XSEDE_USAGE_REPORTING_GATEWAY_ID:
+ case USAGE_REPORTING_GATEWAY_ID:
if (value == null) {
- unsetXsedeUsageReportingGatewayId();
+ unsetUsageReportingGatewayId();
} else {
- setXsedeUsageReportingGatewayId((String)value);
+ setUsageReportingGatewayId((String)value);
}
break;
@@ -433,8 +433,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
case STORAGE_PREFERENCES:
return getStoragePreferences();
- case XSEDE_USAGE_REPORTING_GATEWAY_ID:
- return getXsedeUsageReportingGatewayId();
+ case USAGE_REPORTING_GATEWAY_ID:
+ return getUsageReportingGatewayId();
}
throw new IllegalStateException();
@@ -455,8 +455,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return isSetComputeResourcePreferences();
case STORAGE_PREFERENCES:
return isSetStoragePreferences();
- case XSEDE_USAGE_REPORTING_GATEWAY_ID:
- return isSetXsedeUsageReportingGatewayId();
+ case USAGE_REPORTING_GATEWAY_ID:
+ return isSetUsageReportingGatewayId();
}
throw new IllegalStateException();
}
@@ -510,12 +510,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return false;
}
- boolean this_present_xsedeUsageReportingGatewayId = true && this.isSetXsedeUsageReportingGatewayId();
- boolean that_present_xsedeUsageReportingGatewayId = true && that.isSetXsedeUsageReportingGatewayId();
- if (this_present_xsedeUsageReportingGatewayId || that_present_xsedeUsageReportingGatewayId) {
- if (!(this_present_xsedeUsageReportingGatewayId && that_present_xsedeUsageReportingGatewayId))
+ boolean this_present_usageReportingGatewayId = true && this.isSetUsageReportingGatewayId();
+ boolean that_present_usageReportingGatewayId = true && that.isSetUsageReportingGatewayId();
+ if (this_present_usageReportingGatewayId || that_present_usageReportingGatewayId) {
+ if (!(this_present_usageReportingGatewayId && that_present_usageReportingGatewayId))
return false;
- if (!this.xsedeUsageReportingGatewayId.equals(that.xsedeUsageReportingGatewayId))
+ if (!this.usageReportingGatewayId.equals(that.usageReportingGatewayId))
return false;
}
@@ -546,10 +546,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (present_storagePreferences)
list.add(storagePreferences);
- boolean present_xsedeUsageReportingGatewayId = true && (isSetXsedeUsageReportingGatewayId());
- list.add(present_xsedeUsageReportingGatewayId);
- if (present_xsedeUsageReportingGatewayId)
- list.add(xsedeUsageReportingGatewayId);
+ boolean present_usageReportingGatewayId = true && (isSetUsageReportingGatewayId());
+ list.add(present_usageReportingGatewayId);
+ if (present_usageReportingGatewayId)
+ list.add(usageReportingGatewayId);
return list.hashCode();
}
@@ -602,12 +602,12 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetXsedeUsageReportingGatewayId()).compareTo(other.isSetXsedeUsageReportingGatewayId());
+ lastComparison = Boolean.valueOf(isSetUsageReportingGatewayId()).compareTo(other.isSetUsageReportingGatewayId());
if (lastComparison != 0) {
return lastComparison;
}
- if (isSetXsedeUsageReportingGatewayId()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.xsedeUsageReportingGatewayId, other.xsedeUsageReportingGatewayId);
+ if (isSetUsageReportingGatewayId()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usageReportingGatewayId, other.usageReportingGatewayId);
if (lastComparison != 0) {
return lastComparison;
}
@@ -669,13 +669,13 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
first = false;
}
- if (isSetXsedeUsageReportingGatewayId()) {
+ if (isSetUsageReportingGatewayId()) {
if (!first) sb.append(", ");
- sb.append("xsedeUsageReportingGatewayId:");
- if (this.xsedeUsageReportingGatewayId == null) {
+ sb.append("usageReportingGatewayId:");
+ if (this.usageReportingGatewayId == null) {
sb.append("null");
} else {
- sb.append(this.xsedeUsageReportingGatewayId);
+ sb.append(this.usageReportingGatewayId);
}
first = false;
}
@@ -780,10 +780,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // XSEDE_USAGE_REPORTING_GATEWAY_ID
+ case 5: // USAGE_REPORTING_GATEWAY_ID
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.xsedeUsageReportingGatewayId = iprot.readString();
- struct.setXsedeUsageReportingGatewayIdIsSet(true);
+ struct.usageReportingGatewayId = iprot.readString();
+ struct.setUsageReportingGatewayIdIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -841,10 +841,10 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
oprot.writeFieldEnd();
}
}
- if (struct.xsedeUsageReportingGatewayId != null) {
- if (struct.isSetXsedeUsageReportingGatewayId()) {
- oprot.writeFieldBegin(XSEDE_USAGE_REPORTING_GATEWAY_ID_FIELD_DESC);
- oprot.writeString(struct.xsedeUsageReportingGatewayId);
+ if (struct.usageReportingGatewayId != null) {
+ if (struct.isSetUsageReportingGatewayId()) {
+ oprot.writeFieldBegin(USAGE_REPORTING_GATEWAY_ID_FIELD_DESC);
+ oprot.writeString(struct.usageReportingGatewayId);
oprot.writeFieldEnd();
}
}
@@ -876,7 +876,7 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
if (struct.isSetStoragePreferences()) {
optionals.set(2);
}
- if (struct.isSetXsedeUsageReportingGatewayId()) {
+ if (struct.isSetUsageReportingGatewayId()) {
optionals.set(3);
}
oprot.writeBitSet(optionals, 4);
@@ -901,8 +901,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
}
}
}
- if (struct.isSetXsedeUsageReportingGatewayId()) {
- oprot.writeString(struct.xsedeUsageReportingGatewayId);
+ if (struct.isSetUsageReportingGatewayId()) {
+ oprot.writeString(struct.usageReportingGatewayId);
}
}
@@ -945,8 +945,8 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe
struct.setStoragePreferencesIsSet(true);
}
if (incoming.get(3)) {
- struct.xsedeUsageReportingGatewayId = iprot.readString();
- struct.setXsedeUsageReportingGatewayIdIsSet(true);
+ struct.usageReportingGatewayId = iprot.readString();
+ struct.setUsageReportingGatewayIdIsSet(true);
}
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
index 44ff7ab..66b6528 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift
@@ -345,7 +345,7 @@ struct ComputeResourceDescription {
9: optional list<JobSubmissionInterface> jobSubmissionInterfaces,
10: optional list<data_movement_models.DataMovementInterface> dataMovementInterfaces,
11: optional i32 maxMemoryPerNode,
- 12: optional bool xsedeGatewayUsageReporting,
+ 12: optional bool gatewayUsageReporting,
13: optional string gatewayUsageModuleLoadCommand,
14: optional string gatewayUsageExecutable
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/03cd77a4/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
index 6bd3001..9447e97 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/gateway_resource_profile_model.thrift
@@ -97,5 +97,5 @@ struct GatewayResourceProfile {
2: optional string credentialStoreToken,
3: optional list<ComputeResourcePreference> computeResourcePreferences,
4: optional list<StoragePreference> storagePreferences,
- 5: optional string xsedeUsageReportingGatewayId
+ 5: optional string usageReportingGatewayId
}
[07/16] airavata git commit: adding gateway reporting to app catalog
Posted by ch...@apache.org.
adding gateway reporting to app catalog
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3ac76fef
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3ac76fef
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3ac76fef
Branch: refs/heads/master
Commit: 3ac76fefce6d1fa54f9e647f072263992a0c2580
Parents: 03cd77a
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 10:22:13 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 10:22:13 2016 -0500
----------------------------------------------------------------------
.../catalog/impl/GwyResourceProfileImpl.java | 2 ++
.../core/app/catalog/model/ComputeResource.java | 33 ++++++++++++++++++++
.../core/app/catalog/model/GatewayProfile.java | 11 +++++++
.../resources/ComputeResourceResource.java | 30 ++++++++++++++++++
.../resources/GatewayProfileResource.java | 11 +++++++
.../app/catalog/util/AppCatalogJPAUtils.java | 4 +++
.../util/AppCatalogThriftConversion.java | 7 +++++
.../src/main/resources/appcatalog-derby.sql | 4 +++
.../src/main/resources/appcatalog-mysql.sql | 4 +++
9 files changed, 106 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
index 1f857ef..d6a708d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
@@ -49,6 +49,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
if (gatewayProfile.getCredentialStoreToken()!= null){
profileResource.setCredentialStoreToken(gatewayProfile.getCredentialStoreToken());
}
+ profileResource.setUsageReportingGWId(gatewayProfile.getUsageReportingGatewayId());
// profileResource.setGatewayID(gatewayProfile.getGatewayID());
profileResource.save();
List<ComputeResourcePreference> computeResourcePreferences = gatewayProfile.getComputeResourcePreferences();
@@ -103,6 +104,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
GatewayProfileResource profileResource = new GatewayProfileResource();
GatewayProfileResource existingGP = (GatewayProfileResource)profileResource.get(gatewayId);
existingGP.setCredentialStoreToken(updatedProfile.getCredentialStoreToken());
+ existingGP.setUsageReportingGWId(updatedProfile.getUsageReportingGatewayId());
existingGP.save();
List<ComputeResourcePreference> computeResourcePreferences = updatedProfile.getComputeResourcePreferences();
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
index 4396f68..7ad7df7 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResource.java
@@ -54,6 +54,15 @@ public class ComputeResource implements Serializable {
@Column(name = "ENABLED")
private boolean enabled;
+ @Column(name = "GATEWAY_USAGE_REPORTING")
+ private boolean gatewayUsageReporting;
+
+ @Column(name = "GATEWAY_USAGE_MODULE_LOAD_CMD")
+ private String gatewayUsageModLoadCMD;
+
+ @Column(name = "GATEWAY_USAGE_EXECUTABLE")
+ private String gatewayUsageExec;
+
public Timestamp getCreationTime() {
return creationTime;
}
@@ -109,4 +118,28 @@ public class ComputeResource implements Serializable {
public void setMaxMemoryPerNode(int maxMemoryPerNode) {
this.maxMemoryPerNode = maxMemoryPerNode;
}
+
+ public boolean isGatewayUsageReporting() {
+ return gatewayUsageReporting;
+ }
+
+ public void setGatewayUsageReporting(boolean gatewayUsageReporting) {
+ this.gatewayUsageReporting = gatewayUsageReporting;
+ }
+
+ public String getGatewayUsageModLoadCMD() {
+ return gatewayUsageModLoadCMD;
+ }
+
+ public void setGatewayUsageModLoadCMD(String gatewayUsageModLoadCMD) {
+ this.gatewayUsageModLoadCMD = gatewayUsageModLoadCMD;
+ }
+
+ public String getGatewayUsageExec() {
+ return gatewayUsageExec;
+ }
+
+ public void setGatewayUsageExec(String gatewayUsageExec) {
+ this.gatewayUsageExec = gatewayUsageExec;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
index 70d508e..2d4b455 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
@@ -43,6 +43,9 @@ public class GatewayProfile implements Serializable {
@Column(name = "CS_TOKEN")
private String credentialStoreToken;
+ @Column(name = "USAGE_REPORTING_GATEWAY_ID")
+ private String usageReportingGWId;
+
public Timestamp getCreationTime() {
return creationTime;
}
@@ -75,4 +78,12 @@ public class GatewayProfile implements Serializable {
public void setCredentialStoreToken(String credentialStoreToken) {
this.credentialStoreToken = credentialStoreToken;
}
+
+ public String getUsageReportingGWId() {
+ return usageReportingGWId;
+ }
+
+ public void setUsageReportingGWId(String usageReportingGWId) {
+ this.usageReportingGWId = usageReportingGWId;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
index 09fcdec..bf76ec0 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeResourceResource.java
@@ -46,6 +46,9 @@ public class ComputeResourceResource extends AppCatAbstractResource {
private Timestamp updatedTime;
private int maxMemoryPerNode;
private boolean enabled;
+ private boolean gatewayUsageReporting;
+ private String gatewayUsageModLoadCMD;
+ private String gatewayUsageExec;
public int getMaxMemoryPerNode() {
return maxMemoryPerNode;
@@ -338,6 +341,9 @@ public class ComputeResourceResource extends AppCatAbstractResource {
computeResource.setHostName(getHostName());
computeResource.setEnabled(isEnabled());
computeResource.setMaxMemoryPerNode(getMaxMemoryPerNode());
+ computeResource.setGatewayUsageReporting(gatewayUsageReporting);
+ computeResource.setGatewayUsageModLoadCMD(gatewayUsageModLoadCMD);
+ computeResource.setGatewayUsageExec(gatewayUsageExec);
if (existingComputeResource == null) {
em.persist(computeResource);
} else {
@@ -412,4 +418,28 @@ public class ComputeResourceResource extends AppCatAbstractResource {
public void setHostName(String hostName) {
this.hostName=hostName;
}
+
+ public boolean isGatewayUsageReporting() {
+ return gatewayUsageReporting;
+ }
+
+ public void setGatewayUsageReporting(boolean gatewayUsageReporting) {
+ this.gatewayUsageReporting = gatewayUsageReporting;
+ }
+
+ public String getGatewayUsageModLoadCMD() {
+ return gatewayUsageModLoadCMD;
+ }
+
+ public void setGatewayUsageModLoadCMD(String gatewayUsageModLoadCMD) {
+ this.gatewayUsageModLoadCMD = gatewayUsageModLoadCMD;
+ }
+
+ public String getGatewayUsageExec() {
+ return gatewayUsageExec;
+ }
+
+ public void setGatewayUsageExec(String gatewayUsageExec) {
+ this.gatewayUsageExec = gatewayUsageExec;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
index 6a2ac8b..21f66d5 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/GatewayProfileResource.java
@@ -42,6 +42,7 @@ public class GatewayProfileResource extends AppCatAbstractResource {
private Timestamp createdTime;
private Timestamp updatedTime;
private String credentialStoreToken;
+ private String usageReportingGWId;
public Timestamp getCreatedTime() {
return createdTime;
@@ -63,6 +64,14 @@ public class GatewayProfileResource extends AppCatAbstractResource {
return credentialStoreToken;
}
+ public String getUsageReportingGWId() {
+ return usageReportingGWId;
+ }
+
+ public void setUsageReportingGWId(String usageReportingGWId) {
+ this.usageReportingGWId = usageReportingGWId;
+ }
+
public void setCredentialStoreToken(String credentialStoreToken) {
this.credentialStoreToken = credentialStoreToken;
}
@@ -315,6 +324,7 @@ public class GatewayProfileResource extends AppCatAbstractResource {
em.getTransaction().begin();
if (existingGatewayProfile != null) {
existingGatewayProfile.setUpdateTime(AiravataUtils.getCurrentTimestamp());
+ existingGatewayProfile.setUsageReportingGWId(getUsageReportingGWId());
if (credentialStoreToken != null){
existingGatewayProfile.setCredentialStoreToken(credentialStoreToken);
}
@@ -322,6 +332,7 @@ public class GatewayProfileResource extends AppCatAbstractResource {
} else {
GatewayProfile gatewayProfile = new GatewayProfile();
gatewayProfile.setGatewayID(gatewayID);
+ gatewayProfile.setUsageReportingGWId(usageReportingGWId);
gatewayProfile.setCreationTime(AiravataUtils.getCurrentTimestamp());
if (credentialStoreToken != null){
gatewayProfile.setCredentialStoreToken(credentialStoreToken);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
index 5cfca50..a754114 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
@@ -499,6 +499,9 @@ public class AppCatalogJPAUtils {
computeResourceResource.setCreatedTime(o.getCreationTime());
computeResourceResource.setEnabled(o.getEnabled());
computeResourceResource.setMaxMemoryPerNode(o.getMaxMemoryPerNode());
+ computeResourceResource.setGatewayUsageExec(o.getGatewayUsageExec());
+ computeResourceResource.setGatewayUsageModLoadCMD(o.getGatewayUsageModLoadCMD());
+ computeResourceResource.setGatewayUsageReporting(o.isGatewayUsageReporting());
if (o.getUpdateTime() != null) {
computeResourceResource.setUpdatedTime(o.getUpdateTime());
}
@@ -842,6 +845,7 @@ public class AppCatalogJPAUtils {
resource.setGatewayID(o.getGatewayID());
resource.setCreatedTime(o.getCreationTime());
resource.setCredentialStoreToken(o.getCredentialStoreToken());
+ resource.setUsageReportingGWId(o.getUsageReportingGWId());
if (o.getUpdateTime() != null) {
resource.setUpdatedTime(o.getUpdateTime());
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
index 056181f..770e29c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
@@ -51,6 +51,9 @@ public class AppCatalogThriftConversion {
resource.setResourceId(description.getComputeResourceId());
resource.setMaxMemoryPerNode(description.getMaxMemoryPerNode());
resource.setEnabled(description.isEnabled());
+ resource.setGatewayUsageReporting(description.isGatewayUsageReporting());
+ resource.setGatewayUsageExec(description.getGatewayUsageExecutable());
+ resource.setGatewayUsageModLoadCMD(description.getGatewayUsageModuleLoadCommand());
return resource;
}
@@ -70,6 +73,9 @@ public class AppCatalogThriftConversion {
description.setResourceDescription(resource.getResourceDescription());
description.setMaxMemoryPerNode(resource.getMaxMemoryPerNode());
description.setEnabled(resource.isEnabled());
+ description.setGatewayUsageReporting(resource.isGatewayUsageReporting());
+ description.setGatewayUsageExecutable(resource.getGatewayUsageExec());
+ description.setGatewayUsageModuleLoadCommand(resource.getGatewayUsageModLoadCMD());
HostAliasAppResource aliasResource = new HostAliasAppResource();
List<AppCatalogResource> resources = aliasResource.get(AppCatAbstractResource.HostAliasConstants.RESOURCE_ID, resource.getResourceId());
if (resources != null && !resources.isEmpty()){
@@ -851,6 +857,7 @@ public class AppCatalogThriftConversion {
gatewayProfile.setCredentialStoreToken(gw.getCredentialStoreToken());
gatewayProfile.setComputeResourcePreferences(preferences);
gatewayProfile.setStoragePreferences(storagePreferences);
+ gatewayProfile.setUsageReportingGatewayId(gw.getUsageReportingGWId());
return gatewayProfile;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index f1b5c7f..f08ed83 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -28,6 +28,9 @@ CREATE TABLE COMPUTE_RESOURCE
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
MAX_MEMORY_NODE INTEGER,
ENABLED SMALLINT,
+ GATEWAY_USAGE_REPORTING SMALLINT,
+ GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
+ GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
PRIMARY KEY (RESOURCE_ID)
);
@@ -320,6 +323,7 @@ CREATE TABLE GATEWAY_PROFILE
CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
CS_TOKEN VARCHAR (255),
+ USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID)
);
http://git-wip-us.apache.org/repos/asf/airavata/blob/3ac76fef/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 6695a81..a201897 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -27,6 +27,9 @@ CREATE TABLE COMPUTE_RESOURCE
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
MAX_MEMORY_NODE INTEGER,
ENABLED SMALLINT,
+ GATEWAY_USAGE_REPORTING SMALLINT,
+ GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
+ GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
PRIMARY KEY (RESOURCE_ID)
);
@@ -318,6 +321,7 @@ CREATE TABLE GATEWAY_PROFILE
CREATION_TIME TIMESTAMP DEFAULT NOW(),
UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
CS_TOKEN VARCHAR (255),
+ USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
PRIMARY KEY(GATEWAY_ID)
);
[15/16] airavata git commit: adding alamo parallelism command
Posted by ch...@apache.org.
adding alamo parallelism command
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/55f190ca
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/55f190ca
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/55f190ca
Branch: refs/heads/master
Commit: 55f190ca10cedef2f01ba94cc7476b8293e74917
Parents: 8e23fad
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 14:56:57 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 14:56:57 2016 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/55f190ca/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 3a59fc5..54f3715 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -617,6 +617,8 @@ public class GFacUtils {
jobDescriptor.setJobSubmitter("mpiexec");
}else if (appDepDescription.getComputeHostId().contains("gordon")){
jobDescriptor.setJobSubmitter(" mpirun_rsh -hostfile $PBS_NODEFILE -np");
+ }else if (appDepDescription.getComputeHostId().contains("alamo")){
+ jobDescriptor.setJobSubmitter("mpirun -np");
}else {
jobDescriptor.setJobSubmitter("ibrun");
}
[02/16] airavata git commit: Fixed issues with workflow runtime model
build
Posted by ch...@apache.org.
Fixed issues with workflow runtime model build
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c72a90ed
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c72a90ed
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c72a90ed
Branch: refs/heads/master
Commit: c72a90ed41ce6c8a0f1a02cd43e8afc341f92ad2
Parents: 3a9a18a
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Feb 22 11:24:23 2016 -0500
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Feb 22 11:24:23 2016 -0500
----------------------------------------------------------------------
.../airavata/workflow/core/WorkflowInfo.java | 38 ++++++++++++--------
.../workflow/core/dag/edge/DirectedEdge.java | 12 +++----
.../workflow/core/dag/nodes/InputNodeImpl.java | 6 ++--
.../workflow/core/dag/nodes/OutputNodeImpl.java | 12 ++++---
.../core/parser/JsonWorkflowParser.java | 31 +++++++++++++---
.../src/test/resources/TestWorkflow.json | 16 ++++-----
6 files changed, 74 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInfo.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInfo.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInfo.java
index a0dd859..082d455 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInfo.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/WorkflowInfo.java
@@ -20,14 +20,22 @@
*/
package org.apache.airavata.workflow.core;
+import org.apache.airavata.workflow.core.dag.nodes.ApplicationNode;
+import org.apache.airavata.workflow.core.dag.nodes.InputNode;
+import org.apache.airavata.workflow.core.dag.nodes.OutputNode;
+import org.apache.airavata.workflow.core.dag.nodes.WorkflowNode;
+
+import java.util.List;
+
public class WorkflowInfo {
private String name;
private String id;
private String description;
private String version;
- private int applicationCount;
- private int inputCount;
- private int outputCount;
+ private List<InputNode> inputs;
+ private List<OutputNode> outputs;
+ private List<ApplicationNode> applications;
+
public String getName() {
return name;
@@ -61,27 +69,27 @@ public class WorkflowInfo {
this.version = version;
}
- public int getApplicationCount() {
- return applicationCount;
+ public List<InputNode> getInputs() {
+ return inputs;
}
- public void setApplicationCount(int applicationCount) {
- this.applicationCount = applicationCount;
+ public void setInputs(List<InputNode> inputs) {
+ this.inputs = inputs;
}
- public int getInputCount() {
- return inputCount;
+ public List<OutputNode> getOutputs() {
+ return outputs;
}
- public void setInputCount(int inputCount) {
- this.inputCount = inputCount;
+ public void setOutputs(List<OutputNode> outputs) {
+ this.outputs = outputs;
}
- public int getOutputCount() {
- return outputCount;
+ public List<ApplicationNode> getApplications() {
+ return applications;
}
- public void setOutputCount(int outputCount) {
- this.outputCount = outputCount;
+ public void setApplications(List<ApplicationNode> applications) {
+ this.applications = applications;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/edge/DirectedEdge.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/edge/DirectedEdge.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/edge/DirectedEdge.java
index e8b7f07..e022eff 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/edge/DirectedEdge.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/edge/DirectedEdge.java
@@ -28,8 +28,8 @@ import org.apache.airavata.workflow.core.dag.port.OutPort;
public class DirectedEdge implements Edge {
- private InPort inPort;
- private OutPort outPort;
+ private InPort toPort;
+ private OutPort fromPort;
private EdgeModel edgeModel;
public DirectedEdge(EdgeModel edgeModel) {
@@ -53,21 +53,21 @@ public class DirectedEdge implements Edge {
@Override
public InPort getToPort() {
- return inPort;
+ return toPort;
}
@Override
public void setToPort(InPort inPort) {
- this.inPort = inPort;
+ this.toPort = inPort;
}
@Override
public OutPort getFromPort() {
- return outPort;
+ return fromPort;
}
@Override
public void setFromPort(OutPort outPort) {
- this.outPort = outPort;
+ this.fromPort = outPort;
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
index e8e46e5..1019787 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/InputNodeImpl.java
@@ -119,9 +119,9 @@ public class InputNodeImpl implements InputNode {
inputDataObjectType = new InputDataObjectType(getName());
inputDataObjectType.setValue(getValue());
inputDataObjectType.setType(getDataType());
- inputDataObjectType.setIsRequired(true);
- inputDataObjectType.setDataStaged(true);
- inputDataObjectType.setInputOrder(0);
+// inputDataObjectType.setIsRequired(true);
+// inputDataObjectType.setDataStaged(true);
+// inputDataObjectType.setInputOrder(0);
}
return inputDataObjectType;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
index d4c8780..5b56b50 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/dag/nodes/OutputNodeImpl.java
@@ -153,10 +153,14 @@ public class OutputNodeImpl implements OutputNode {
}
private OutputDataObjectType convert(InputDataObjectType inputObject) {
- OutputDataObjectType output = new OutputDataObjectType(getName());
- output.setValue(inputObject.getValue());
- output.setType(inputObject.getType());
- return output;
+ if (inputObject != null) {
+ OutputDataObjectType output = new OutputDataObjectType(getName());
+ output.setValue(inputObject.getValue());
+ output.setType(inputObject.getType());
+ return output;
+
+ }
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
index 37e82c0..1f1e000 100644
--- a/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
+++ b/modules/workflow/workflow-core/src/main/java/org/apache/airavata/workflow/core/parser/JsonWorkflowParser.java
@@ -24,6 +24,8 @@ package org.apache.airavata.workflow.core.parser;
import com.google.gson.JsonObject;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
+import org.apache.airavata.model.ComponentState;
+import org.apache.airavata.model.ComponentStatus;
import org.apache.airavata.model.EdgeModel;
import org.apache.airavata.model.NodeModel;
import org.apache.airavata.model.PortModel;
@@ -116,6 +118,9 @@ public class JsonWorkflowParser implements WorkflowParser {
jsonReader.endObject();
buildWorkflowGraph();
+ workflowInfo.setInputs(inputs);
+ workflowInfo.setApplications(applications);
+ workflowInfo.setOutputs(outputs);
return workflowInfo;
}
@@ -143,7 +148,7 @@ public class JsonWorkflowParser implements WorkflowParser {
for (Map.Entry<String, Edge> entry : edgeMap.entrySet()) {
InPort inPort = nodeInportMap.get(entry.getKey());
if (inPort != null) {
- inPort.addEdge(entry.getValue());
+// inPort.addEdge(entry.getValue());
entry.getValue().setToPort(inPort);
queue.add(inPort.getNode());
@@ -159,7 +164,7 @@ public class JsonWorkflowParser implements WorkflowParser {
for (Map.Entry<String, Edge> entry : edgeMap.entrySet()) {
InPort inPort = nodeInportMap.get(entry.getKey());
if (inPort != null) {
- inPort.addEdge(entry.getValue());
+// inPort.addEdge(entry.getValue());
entry.getValue().setToPort(inPort);
queue.add(inPort.getNode());
@@ -216,7 +221,7 @@ public class JsonWorkflowParser implements WorkflowParser {
for (Link link : links) {
EdgeModel edgeModel = new EdgeModel(link.getId());
Edge edge = new DirectedEdge(edgeModel);
- edge.setFromPort(outPort);
+// edge.setFromPort(outPort);
outPort.addEdge(edge);
inPortMap.put(link.getTo().getNodeId() + "," + link.getTo().getPortId(), edge);
}
@@ -284,6 +289,7 @@ public class JsonWorkflowParser implements WorkflowParser {
JsonToken peek = jsonReader.peek();
InputNode inputNode;
NodeModel nodeModel;
+ ComponentStatus status;
String name;
if (peek == JsonToken.NULL) {
throw new ParserException("Error! workflow inputs can't be null");
@@ -292,6 +298,10 @@ public class JsonWorkflowParser implements WorkflowParser {
while (jsonReader.hasNext()) {
jsonReader.beginObject();
nodeModel = new NodeModel();
+ status = new ComponentStatus();
+ status.setState(ComponentState.CREATED);
+ status.setReason("Created");
+ nodeModel.setStatus(status);
inputNode = new InputNodeImpl(nodeModel);
while (jsonReader.hasNext()) {
name = jsonReader.nextName();
@@ -306,7 +316,8 @@ public class JsonWorkflowParser implements WorkflowParser {
} else if (name.equals(POSITION)) {
readPosition(jsonReader);
} else if (name.equals(NODE_ID)) {
- nodeModel.setNodeId(jsonReader.nextString());
+ jsonReader.skipValue();
+// nodeModel.setNodeId(jsonReader.nextString());
} else if (name.equals(DEFAULT_VALUE)) {
inputNode.setValue(jsonReader.nextString());
} else {
@@ -327,6 +338,7 @@ public class JsonWorkflowParser implements WorkflowParser {
JsonToken peek = jsonReader.peek();
OutputNode outputNode;
NodeModel nodeModel;
+ ComponentStatus status;
String name;
if (peek == JsonToken.NULL) {
throw new ParserException("Error! workflow outputs can't be null");
@@ -335,6 +347,10 @@ public class JsonWorkflowParser implements WorkflowParser {
while (jsonReader.hasNext()) {
jsonReader.beginObject();
nodeModel = new NodeModel();
+ status = new ComponentStatus();
+ status.setState(ComponentState.CREATED);
+ status.setReason("Created");
+ nodeModel.setStatus(status);
outputNode = new OutputNodeImpl(nodeModel);
while (jsonReader.hasNext()) {
name = jsonReader.nextName();
@@ -349,7 +365,8 @@ public class JsonWorkflowParser implements WorkflowParser {
} else if (name.equals(POSITION)) {
readPosition(jsonReader);
} else if (name.equals(NODE_ID)) {
- nodeModel.setNodeId(jsonReader.nextString());
+ jsonReader.skipValue();
+// nodeModel.setNodeId(jsonReader.nextString());
} else if (name.equals(DEFAULT_VALUE)) {
jsonReader.skipValue();
} else {
@@ -427,6 +444,10 @@ public class JsonWorkflowParser implements WorkflowParser {
private ApplicationNode readApplication(JsonReader jsonReader) throws IOException, ParserException {
jsonReader.beginObject();
NodeModel nodeModel = new NodeModel();
+ ComponentStatus status = new ComponentStatus();
+ status.setState(ComponentState.CREATED);
+ status.setReason("Created");
+ nodeModel.setStatus(status);
ApplicationNode applicationNode = new ApplicationNodeImpl(nodeModel);
String name;
while (jsonReader.hasNext()) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/c72a90ed/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
----------------------------------------------------------------------
diff --git a/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json b/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
index d9c3a0c..c82a405 100644
--- a/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
+++ b/modules/workflow/workflow-core/src/test/resources/TestWorkflow.json
@@ -70,20 +70,20 @@
"links" : [
{ "id" : "link_1",
"description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "inputId" : "" }},
+ "from" : { "nodeId" : "inputNode_Id_1" , "outputId" : "inputNode_Id_1" },
+ "to" : { "nodeId" : "applicationNodeId" , "inputId" : "appInputNode_Id_1" }},
{ "id" : "link_2",
"description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "inputId" : "" }},
+ "from" : { "nodeId" : "inputNode_Id_2" , "outputId" : "inputNode_Id_2" },
+ "to" : { "nodeId" : "applicationNodeId" , "inputId" : "appInputNode_Id_2" }},
{ "id" : "link_3",
"description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "inputId" : "" }},
+ "from" : { "nodeId" : "applicationNodeId" , "outputId" : "appOutputNode_Id_1" },
+ "to" : { "nodeId" : "outputNode_Id_1" , "inputId" : "outputNode_Id_1" }},
{ "id" : "link_4",
"description" : "link desc",
- "from" : { "nodeId" : "" , "outputId" : "" },
- "to" : { "nodeId" : "" , "inputId" : "" }}
+ "from" : { "nodeId" : "applicationNodeId" , "outputId" : "appOutputNode_Id_2" },
+ "to" : { "nodeId" : "outputNode_Id_2" , "inputId" : "outputNode_Id_2" }}
]
}
}
[09/16] airavata git commit: creating credential store database as a
seperate when server start up
Posted by ch...@apache.org.
creating credential store database as a seperate when server start up
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f22acb82
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f22acb82
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f22acb82
Branch: refs/heads/master
Commit: f22acb82622d81f30118b0ba3adb922f88149f03
Parents: e303bb5
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 11:36:49 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 11:36:49 2016 -0500
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 10 +-
.../server/util/CredentialStoreInitUtil.java | 156 +++++++++++++++++++
.../scripts/credential-store-h2.sql | 42 -----
.../scripts/credential-store-mysql.sql | 38 -----
.../src/main/resources/credstore-derby.sql | 39 +++++
.../src/main/resources/credstore-mysql.sql | 39 +++++
.../src/main/resources/expcatalog-derby.sql | 21 +--
.../src/main/resources/expcatalog-mysql.sql | 21 +--
8 files changed, 242 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
index d2e50ef..b530bff 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/AiravataAPIServer.java
@@ -30,10 +30,7 @@ import org.apache.airavata.api.server.handler.AiravataServerHandler;
import org.apache.airavata.api.server.security.AiravataSecurityManager;
import org.apache.airavata.api.server.security.SecurityManagerFactory;
import org.apache.airavata.api.server.security.interceptor.SecurityModule;
-import org.apache.airavata.api.server.util.AppCatalogInitUtil;
-import org.apache.airavata.api.server.util.Constants;
-import org.apache.airavata.api.server.util.ExperimentCatalogInitUtil;
-import org.apache.airavata.api.server.util.WorkflowCatalogInitUtil;
+import org.apache.airavata.api.server.util.*;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
@@ -67,9 +64,14 @@ public class AiravataAPIServer implements IServer{
public void startAiravataServer(Airavata.Processor<Airavata.Iface> airavataAPIServer) throws AiravataSystemException {
try {
+ // creating experiment catalog db
ExperimentCatalogInitUtil.initializeDB();
+ // creating app catalog db
AppCatalogInitUtil.initializeDB();
+ // creating workflow catalog db
WorkflowCatalogInitUtil.initializeDB();
+ // creating credential store db
+ CredentialStoreInitUtil.initializeDB();
final String serverHost = ServerSettings.getSetting(Constants.API_SERVER_HOST, null);
if (!ServerSettings.isTLSEnabled()) {
final int serverPort = Integer.parseInt(ServerSettings.getSetting(Constants.API_SERVER_PORT, "8930"));
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/CredentialStoreInitUtil.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/CredentialStoreInitUtil.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/CredentialStoreInitUtil.java
new file mode 100644
index 0000000..20dd1aa
--- /dev/null
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/util/CredentialStoreInitUtil.java
@@ -0,0 +1,156 @@
+/*
+*
+* 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.api.server.util;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.derby.drda.NetworkServerControl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URI;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+public class CredentialStoreInitUtil {
+ private static final Logger logger = LoggerFactory.getLogger(CredentialStoreInitUtil.class);
+ public static final String CREDENTIALS = "CREDENTIALS";
+ public static final String START_DERBY_ENABLE = "start.derby.server.mode";
+ public static final String DERBY_SERVER_MODE_SYS_PROPERTY = "derby.drda.startNetworkServer";
+ private static NetworkServerControl server;
+ private static JdbcStorage db;
+ private static String jdbcURl;
+ private static String jdbcDriver;
+ private static String jdbcUser;
+ private static String jdbcPassword;
+
+
+ public static void initializeDB() {
+// System.setProperty("appcatalog.initialize.state", "0");
+ try{
+ jdbcDriver = ServerSettings.getCredentialStoreDBDriver();
+ jdbcURl = ServerSettings.getCredentialStoreDBURL();
+ jdbcUser = ServerSettings.getCredentialStoreDBUser();
+ jdbcPassword = ServerSettings.getCredentialStoreDBPassword();
+ jdbcURl = jdbcURl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
+ } catch (ApplicationSettingsException e) {
+ logger.error("Unable to read airavata server properties", e.getMessage());
+ }
+
+ if (getDBType(jdbcURl).equals("derby") && isDerbyStartEnabled()) {
+ startDerbyInServerMode();
+ }
+ db = new JdbcStorage(10, 50, jdbcURl, jdbcDriver, true);
+
+ Connection conn = null;
+ try {
+ conn = db.connect();
+ if (!DatabaseCreator.isDatabaseStructureCreated(CREDENTIALS, conn)) {
+ DatabaseCreator.createRegistryDatabase("database_scripts/credstore", conn);
+ logger.info("New Database created for Credential Store !!! ");
+ } else {
+ logger.info("Database already created for Credential Store !!!");
+ }
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ throw new RuntimeException("Database failure", e);
+ } finally {
+ db.closeConnection(conn);
+ try {
+ if(conn != null){
+ if (!conn.getAutoCommit()) {
+ conn.commit();
+ }
+ conn.close();
+ }
+ } catch (SQLException e) {
+ logger.error("Error while closing database connection...", e.getMessage(), e);
+ }
+ }
+// System.setProperty("appcatalog.initialize.state", "1");
+ }
+
+ public static String getDBType(String jdbcUrl){
+ try{
+ String cleanURI = jdbcUrl.substring(5);
+ URI uri = URI.create(cleanURI);
+ return uri.getScheme();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static boolean isDerbyStartEnabled(){
+ try {
+ String s = ServerSettings.getSetting(START_DERBY_ENABLE);
+ if("true".equals(s)){
+ return true;
+ }
+ } catch (ApplicationSettingsException e) {
+ logger.error("Unable to read airavata server properties", e.getMessage(), e);
+ return false;
+ }
+ return false;
+ }
+
+ public static void startDerbyInServerMode() {
+ try {
+ System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "true");
+ server = new NetworkServerControl(InetAddress.getByName("0.0.0.0"),
+ getPort(jdbcURl),
+ jdbcUser, jdbcPassword);
+ java.io.PrintWriter consoleWriter = new java.io.PrintWriter(System.out, true);
+ server.start(consoleWriter);
+ } catch (IOException e) {
+ logger.error("Unable to start Apache derby in the server mode! Check whether " +
+ "specified port is available");
+ } catch (Exception e) {
+ logger.error("Unable to start Apache derby in the server mode! Check whether " +
+ "specified port is available");
+ }
+ }
+
+ public static void stopDerbyInServerMode() {
+ System.setProperty(DERBY_SERVER_MODE_SYS_PROPERTY, "false");
+ if (server!=null){
+ try {
+ server.shutdown();
+ } catch (Exception e) {
+ logger.error("Error when stopping the derby server : "+e.getLocalizedMessage());
+ }
+ }
+ }
+
+ public static int getPort(String jdbcURL){
+ try{
+ String cleanURI = jdbcURL.substring(5);
+ URI uri = URI.create(cleanURI);
+ return uri.getPort();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return -1;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/credential-store/credential-store-service/scripts/credential-store-h2.sql
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/scripts/credential-store-h2.sql b/modules/credential-store/credential-store-service/scripts/credential-store-h2.sql
deleted file mode 100644
index 91915b6..0000000
--- a/modules/credential-store/credential-store-service/scripts/credential-store-h2.sql
+++ /dev/null
@@ -1,42 +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.
- *
- */
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
-
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_NAME VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- CREDENTIAL CLOB NOT NULL,
- PRIVATE_KEY CLOB NOT NULL,
- NOT_BEFORE VARCHAR(256) NOT NULL,
- NOT_AFTER VARCHAR(256) NOT NULL,
- LIFETIME MEDIUMINT NOT NULL,
- REQUESTING_PORTAL_USER_NAME VARCHAR(256) NOT NULL,
- REQUESTED_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)
-);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql b/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
deleted file mode 100644
index b0e4fb9..0000000
--- a/modules/credential-store/credential-store-service/scripts/credential-store-mysql.sql
+++ /dev/null
@@ -1,38 +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.
- *
- */
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-);
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PORTAL_USER_ID VARCHAR(256) NOT NULL,
- TIME_PERSISTED TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
- PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/registry/registry-core/src/main/resources/credstore-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/credstore-derby.sql b/modules/registry/registry-core/src/main/resources/credstore-derby.sql
new file mode 100644
index 0000000..9403cfd
--- /dev/null
+++ b/modules/registry/registry-core/src/main/resources/credstore-derby.sql
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+ CREATE TABLE COMMUNITY_USER
+(
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
+ PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
+);
+
+CREATE TABLE CREDENTIALS
+(
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ CREDENTIAL BLOB NOT NULL,
+ PORTAL_USER_ID VARCHAR(256) NOT NULL,
+ TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
+);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/registry/registry-core/src/main/resources/credstore-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/credstore-mysql.sql b/modules/registry/registry-core/src/main/resources/credstore-mysql.sql
new file mode 100644
index 0000000..df9e2bc
--- /dev/null
+++ b/modules/registry/registry-core/src/main/resources/credstore-mysql.sql
@@ -0,0 +1,39 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+ CREATE TABLE COMMUNITY_USER
+(
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
+ PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
+);
+
+CREATE TABLE CREDENTIALS
+(
+ GATEWAY_ID VARCHAR(256) NOT NULL,
+ TOKEN_ID VARCHAR(256) NOT NULL,
+ CREDENTIAL BLOB NOT NULL,
+ PORTAL_USER_ID VARCHAR(256) NOT NULL,
+ TIME_PERSISTED TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
+ PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
+);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index c395b94..3d47071 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -341,23 +341,4 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', CURRENT_TIMESTAMP ,'SYSTEM');
-
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-);
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PORTAL_USER_ID VARCHAR(256) NOT NULL,
- TIME_PERSISTED TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', CURRENT_TIMESTAMP ,'SYSTEM');
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/f22acb82/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index b3dcf43..ce409ae 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -345,23 +345,4 @@ CREATE TABLE CONFIGURATION
PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
);
-INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', NOW() ,'SYSTEM');
-
-CREATE TABLE COMMUNITY_USER
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_NAME VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- COMMUNITY_USER_EMAIL VARCHAR(256) NOT NULL,
- PRIMARY KEY (GATEWAY_ID, COMMUNITY_USER_NAME, TOKEN_ID)
-);
-
-CREATE TABLE CREDENTIALS
-(
- GATEWAY_ID VARCHAR(256) NOT NULL,
- TOKEN_ID VARCHAR(256) NOT NULL,
- CREDENTIAL BLOB NOT NULL,
- PORTAL_USER_ID VARCHAR(256) NOT NULL,
- TIME_PERSISTED TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
- PRIMARY KEY (GATEWAY_ID, TOKEN_ID)
-);
\ No newline at end of file
+INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version', '0.16', NOW() ,'SYSTEM');
\ No newline at end of file
[11/16] airavata git commit: Moving usage reporting gateway id into
resource preference
Posted by ch...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
index 431dc39..e80a19b 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/storageresource/StorageResourceDescription.java
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
*
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class StorageResourceDescription implements org.apache.thrift.TBase<StorageResourceDescription, StorageResourceDescription._Fields>, java.io.Serializable, Cloneable, Comparable<StorageResourceDescription> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("StorageResourceDescription");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 4b965d6..6c9b643 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 f547b0a..fe6e020 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 b92399f..e2f0ee4 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 64bdcd9..a9f7080 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 4f3de96..e5134a4 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
index 2f89d85..02e9050 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/DataMovementInterface.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
index 751ac75..48f473f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/GridFTPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
index becbfc9..f53a2cd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/LOCALDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
index c4e9f1a..b5b5659 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/SCPDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
index dced6df..7804763 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/UnicoreDataMovement.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/movement/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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
index 6537665..8248043 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataReplicaLocationModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class DataReplicaLocationModel implements org.apache.thrift.TBase<DataReplicaLocationModel, DataReplicaLocationModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataReplicaLocationModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataReplicaLocationModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
index 7cfec4f..1668a4e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/data/resource/DataResourceModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class DataResourceModel implements org.apache.thrift.TBase<DataResourceModel, DataResourceModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataResourceModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataResourceModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 69320ac..1592f83 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 1b70a15..ad5affd 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 6f79463..7406863 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 2ac4d87..6cbc61e 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 639b1b0..83df334 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 f9c97a0..dc728d3 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 b64ad84..40760fc 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 3827da5..ac118dc 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 03aa3da..014b4d0 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 7c5da0a..c0012a1 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 a14c54f..87cd3c5 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 471ed71..b2fb925 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 793740d..9036e17 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 9b8f4ec..3574ac9 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 d3e5f1c..9e8d61f 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 9183b48..3274b03 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 59ceddb..dfbd50c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 931e6a1..fa17462 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 4861d70..06b892c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 31c8a6c..0e53da0 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 5ae31da..abfdea1 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 dab4a5c..00187b7 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 bb3a527..2001d26 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 99c91ec..6609d4d 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 2c190b7..565f4bd 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 c018a29..9552ed7 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 56b3d30..72cbadb 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 5d4539f..9c164f3 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 bba5119..48a699c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 df5e3b4..09cfed5 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 271461e..068f96a 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 7fc93db..a5d5af2 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 8da297a..25d960c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 34cf318..7170bdf 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 0d7aa71..d3d73b5 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 fb789d5..62d452b 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 7bbda7e..6af906c 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 5f4aa7c..8ac8b94 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
@@ -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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
index ebffadd..12f1f9f 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/EnvironmentSetupTaskModel.java
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
* EnvironmentSetupTaskModel: A structure holding the environment creation task details
*
*/
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class EnvironmentSetupTaskModel implements org.apache.thrift.TBase<EnvironmentSetupTaskModel, EnvironmentSetupTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentSetupTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentSetupTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
index cd2ae96..fd00815 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/JobSubmissionTaskModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class JobSubmissionTaskModel implements org.apache.thrift.TBase<JobSubmissionTaskModel, JobSubmissionTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<JobSubmissionTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobSubmissionTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
index bce6884..1142363 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/MonitorTaskModel.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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
public class MonitorTaskModel implements org.apache.thrift.TBase<MonitorTaskModel, MonitorTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<MonitorTaskModel> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MonitorTaskModel");
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/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 8591446..c84f70d 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 037893a..011bef2 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 ae64373..be56ed5 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 2b7573f..2e3efe2 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/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 7ac3467..8a2d800 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.3)", date = "2016-02-23")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-02-24")
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/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
index d6a708d..eba1cae 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/GwyResourceProfileImpl.java
@@ -49,8 +49,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
if (gatewayProfile.getCredentialStoreToken()!= null){
profileResource.setCredentialStoreToken(gatewayProfile.getCredentialStoreToken());
}
- profileResource.setUsageReportingGWId(gatewayProfile.getUsageReportingGatewayId());
-// profileResource.setGatewayID(gatewayProfile.getGatewayID());
+ profileResource.setGatewayID(gatewayProfile.getGatewayID());
profileResource.save();
List<ComputeResourcePreference> computeResourcePreferences = gatewayProfile.getComputeResourcePreferences();
if (computeResourcePreferences != null && !computeResourcePreferences.isEmpty()){
@@ -64,6 +63,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
resource.setOverrideByAiravata(preference.isOverridebyAiravata());
resource.setLoginUserName(preference.getLoginUserName());
resource.setResourceCSToken(preference.getResourceSpecificCredentialStoreToken());
+ resource.setUsageReportingGatewayId(preference.getUsageReportingGatewayId());
if (preference.getPreferredJobSubmissionProtocol() != null){
resource.setPreferredJobProtocol(preference.getPreferredJobSubmissionProtocol().toString());
}
@@ -104,7 +104,6 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
GatewayProfileResource profileResource = new GatewayProfileResource();
GatewayProfileResource existingGP = (GatewayProfileResource)profileResource.get(gatewayId);
existingGP.setCredentialStoreToken(updatedProfile.getCredentialStoreToken());
- existingGP.setUsageReportingGWId(updatedProfile.getUsageReportingGatewayId());
existingGP.save();
List<ComputeResourcePreference> computeResourcePreferences = updatedProfile.getComputeResourcePreferences();
@@ -129,6 +128,7 @@ public class GwyResourceProfileImpl implements GwyResourceProfile {
resource.setProjectNumber(preference.getAllocationProjectNumber());
resource.setScratchLocation(preference.getScratchLocation());
resource.setResourceCSToken(preference.getResourceSpecificCredentialStoreToken());
+ resource.setUsageReportingGatewayId(preference.getUsageReportingGatewayId());
resource.save();
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourcePreference.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourcePreference.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourcePreference.java
index 635c361..cdbce4e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourcePreference.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/ComputeResourcePreference.java
@@ -57,6 +57,8 @@ public class ComputeResourcePreference {
private String loginUserName;
@Column(name = "RESOURCE_CS_TOKEN")
private String computeResourceCSToken;
+ @Column(name = "USAGE_REPORTING_GATEWAY_ID")
+ private String usageReportingGWId;
@ManyToOne(cascade= CascadeType.MERGE)
@JoinColumn(name = "RESOURCE_ID")
@@ -161,4 +163,12 @@ public class ComputeResourcePreference {
public void setComputeResourceCSToken(String computeResourceCSToken) {
this.computeResourceCSToken = computeResourceCSToken;
}
+
+ public String getUsageReportingGWId() {
+ return usageReportingGWId;
+ }
+
+ public void setUsageReportingGWId(String usageReportingGWId) {
+ this.usageReportingGWId = usageReportingGWId;
+ }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
index 2d4b455..70d508e 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/model/GatewayProfile.java
@@ -43,9 +43,6 @@ public class GatewayProfile implements Serializable {
@Column(name = "CS_TOKEN")
private String credentialStoreToken;
- @Column(name = "USAGE_REPORTING_GATEWAY_ID")
- private String usageReportingGWId;
-
public Timestamp getCreationTime() {
return creationTime;
}
@@ -78,12 +75,4 @@ public class GatewayProfile implements Serializable {
public void setCredentialStoreToken(String credentialStoreToken) {
this.credentialStoreToken = credentialStoreToken;
}
-
- public String getUsageReportingGWId() {
- return usageReportingGWId;
- }
-
- public void setUsageReportingGWId(String usageReportingGWId) {
- this.usageReportingGWId = usageReportingGWId;
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/48e2593e/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeHostPreferenceResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeHostPreferenceResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeHostPreferenceResource.java
index 6fb9555..6a95f61 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeHostPreferenceResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/resources/ComputeHostPreferenceResource.java
@@ -52,6 +52,7 @@ public class ComputeHostPreferenceResource extends AppCatAbstractResource {
private String projectNumber;
private String loginUserName;
private String resourceCSToken;
+ private String usageReportingGatewayId;
private GatewayProfileResource gatewayProfile;
private ComputeResourceResource computeHostResource;
@@ -152,6 +153,14 @@ public class ComputeHostPreferenceResource extends AppCatAbstractResource {
this.resourceCSToken = resourceCSToken;
}
+ public String getUsageReportingGatewayId() {
+ return usageReportingGatewayId;
+ }
+
+ public void setUsageReportingGatewayId(String usageReportingGatewayId) {
+ this.usageReportingGatewayId = usageReportingGatewayId;
+ }
+
@Override
public void remove(Object identifier) throws AppCatalogException {
HashMap<String, String> ids;
@@ -384,6 +393,7 @@ public class ComputeHostPreferenceResource extends AppCatAbstractResource {
existingPreference.setBatchQueue(batchQueue);
existingPreference.setLoginUserName(loginUserName);
existingPreference.setComputeResourceCSToken(resourceCSToken);
+ existingPreference.setUsageReportingGWId(usageReportingGatewayId);
em.merge(existingPreference);
} else {
ComputeResourcePreference resourcePreference = new ComputeResourcePreference();
@@ -399,6 +409,7 @@ public class ComputeHostPreferenceResource extends AppCatAbstractResource {
resourcePreference.setBatchQueue(batchQueue);
resourcePreference.setLoginUserName(loginUserName);
resourcePreference.setComputeResourceCSToken(resourceCSToken);
+ resourcePreference.setUsageReportingGWId(usageReportingGatewayId);
em.persist(resourcePreference);
}
em.getTransaction().commit();
[14/16] airavata git commit: credential store start up logs and
adding xsede job reporting to JobSubmissionTask
Posted by ch...@apache.org.
credential store start up logs and adding xsede job reporting to JobSubmissionTask
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e23fadc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e23fadc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e23fadc
Branch: refs/heads/master
Commit: 8e23fadcf0c8235b337b1d060a9cf319b6b47c40
Parents: b09ce0c
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 14:39:38 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 14:39:38 2016 -0500
----------------------------------------------------------------------
.../store/server/CredentialStoreServer.java | 3 +-
.../impl/task/DefaultJobSubmissionTask.java | 31 ++++++++++++++++----
.../org/apache/airavata/server/ServerMain.java | 4 +--
3 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e23fadc/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
index 2e3db05..5ccec02 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServer.java
@@ -101,7 +101,6 @@ public class CredentialStoreServer implements IServer {
}.start();
} catch (TTransportException e) {
setStatus(ServerStatus.FAILED);
-// logger.error("Error while starting the credential store service", e);
throw new Exception("Error while starting the credential store service", e);
}
}
@@ -135,7 +134,7 @@ public class CredentialStoreServer implements IServer {
@Override
public ServerStatus getStatus() throws Exception {
- return null;
+ return status;
}
private void setStatus(IServer.ServerStatus stat){
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e23fadc/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
index 81b5f91..fd2af7f 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
@@ -24,19 +24,25 @@ package org.apache.airavata.gfac.impl.task;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.gfac.core.*;
+import org.apache.airavata.gfac.core.cluster.CommandInfo;
import org.apache.airavata.gfac.core.cluster.JobSubmissionOutput;
+import org.apache.airavata.gfac.core.cluster.RawCommandInfo;
import org.apache.airavata.gfac.core.cluster.RemoteCluster;
import org.apache.airavata.gfac.core.context.ProcessContext;
import org.apache.airavata.gfac.core.context.TaskContext;
import org.apache.airavata.gfac.core.task.JobSubmissionTask;
import org.apache.airavata.gfac.core.task.TaskException;
import org.apache.airavata.gfac.impl.Factory;
+import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager;
import org.apache.airavata.model.commons.ErrorModel;
+import org.apache.airavata.model.experiment.ExperimentModel;
import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.status.*;
import org.apache.airavata.model.task.TaskTypes;
import org.apache.airavata.registry.cpi.AppCatalogException;
+import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
+import org.apache.airavata.registry.cpi.RegistryException;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,13 +88,14 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
jobModel.setStdErr(jobSubmissionOutput.getStdErr());
jobModel.setStdOut(jobSubmissionOutput.getStdOut());
String jobId = jobSubmissionOutput.getJobId();
- if (exitCode != 0 || jobSubmissionOutput.isJobSubmissionFailed()) {
+ String experimentId = taskContext.getExperimentId();
+ if (exitCode != 0 || jobSubmissionOutput.isJobSubmissionFailed()) {
jobModel.setJobId(DEFAULT_JOB_ID);
if (jobSubmissionOutput.isJobSubmissionFailed()) {
jobModel.setJobStatus(new JobStatus(JobState.FAILED));
jobModel.getJobStatus().setReason(jobSubmissionOutput.getFailureReason());
log.error("expId: {}, processid: {}, taskId: {} :- Job submission failed for job name {}",
- taskContext.getExperimentId(), taskContext.getProcessId(), taskContext.getTaskId(), jobModel.getJobName());
+ experimentId, taskContext.getProcessId(), taskContext.getTaskId(), jobModel.getJobName());
ErrorModel errorModel = new ErrorModel();
errorModel.setUserFriendlyMessage(jobSubmissionOutput.getFailureReason());
errorModel.setActualErrorMessage(jobSubmissionOutput.getFailureReason());
@@ -135,8 +142,9 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
jobModel.setJobId(jobId);
GFacUtils.saveJobModel(processContext, jobModel);
jobStatus.setJobState(JobState.SUBMITTED);
- jobStatus.setReason("Successfully Submitted to " + taskContext.getParentProcessContext()
- .getComputeResourceDescription().getHostName());
+ ComputeResourceDescription computeResourceDescription = taskContext.getParentProcessContext()
+ .getComputeResourceDescription();
+ jobStatus.setReason("Successfully Submitted to " + computeResourceDescription.getHostName());
jobStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
jobModel.setJobStatus(jobStatus);
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
@@ -147,6 +155,15 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
jobModel.setJobStatus(jobStatus);
GFacUtils.saveJobStatus(taskContext.getParentProcessContext(), jobModel);
}
+ // doing gateway reporting
+ if (computeResourceDescription.isGatewayUsageReporting()){
+ String loadCommand = computeResourceDescription.getGatewayUsageModuleLoadCommand();
+ String usageExecutable = computeResourceDescription.getGatewayUsageExecutable();
+ ExperimentModel experiment = (ExperimentModel)taskContext.getParentProcessContext().getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
+ RawCommandInfo rawCommandInfo = new RawCommandInfo(loadCommand + " && " + usageExecutable + " -gateway_user " + experiment.getUserName() +
+ " -submit_time \"`date '+%F %T %:z'`\" -jobid " + jobId );
+ remoteCluster.execute(rawCommandInfo);
+ }
taskStatus = new TaskStatus(TaskState.COMPLETED);
taskStatus.setReason("Submitted job to compute resource");
taskStatus.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime());
@@ -252,9 +269,11 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
errorModel.setActualErrorMessage(e.getMessage());
errorModel.setUserFriendlyMessage(msg);
taskContext.getTaskModel().setTaskError(errorModel);
- }
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
- taskContext.setTaskStatus(taskStatus);
+ taskContext.setTaskStatus(taskStatus);
try {
GFacUtils.saveAndPublishTaskStatus(taskContext);
} catch (GFacException e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/8e23fadc/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 0117f7a..8055dda 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -296,7 +296,7 @@ public class ServerMain {
}
}
}
- private static final int SERVER_STATUS_CHANGE_WAIT_INTERVAL=100;
+ private static final int SERVER_STATUS_CHANGE_WAIT_INTERVAL=500;
private static void waitForServerToStart(IServer server,Integer maxWait) throws Exception {
int count=0;
@@ -307,7 +307,7 @@ public class ServerMain {
Thread.sleep(SERVER_STATUS_CHANGE_WAIT_INTERVAL);
count+=SERVER_STATUS_CHANGE_WAIT_INTERVAL;
}
- if (server.getStatus()!=ServerStatus.STARTED){
+ if (server.getStatus()!= ServerStatus.STARTED){
logger.error("The "+server.getName()+" did not start!!!");
}
}
[16/16] airavata git commit: merging master with branch
Posted by ch...@apache.org.
merging master with branch
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e6d68271
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e6d68271
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e6d68271
Branch: refs/heads/master
Commit: e6d6827114ce2497df512e26d99346e3f013ff49
Parents: 6718650 55f190c
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Wed Feb 24 15:10:48 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Wed Feb 24 15:10:48 2016 -0500
----------------------------------------------------------------------
.../airavata/api/server/AiravataAPIServer.java | 10 +-
.../server/util/CredentialStoreInitUtil.java | 156 +++++++++++++++++++
.../java/org/apache/airavata/api/Airavata.java | 2 +-
.../gateway_resource_profile_model_types.cpp | 22 +++
.../gateway_resource_profile_model_types.h | 12 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 23 +++
.../model/appcatalog/gatewayprofile/ttypes.py | 15 +-
.../apache/airavata/model/ComponentStatus.java | 2 +-
.../org/apache/airavata/model/EdgeModel.java | 2 +-
.../org/apache/airavata/model/NodeModel.java | 2 +-
.../org/apache/airavata/model/PortModel.java | 2 +-
.../apache/airavata/model/WorkflowModel.java | 2 +-
.../apache/airavata/model/WorkflowStatus.java | 2 +-
.../ApplicationDeploymentDescription.java | 2 +-
.../appdeployment/ApplicationModule.java | 2 +-
.../appcatalog/appdeployment/CommandObject.java | 2 +-
.../appcatalog/appdeployment/SetEnvPaths.java | 2 +-
.../ApplicationInterfaceDescription.java | 2 +-
.../appcatalog/computeresource/BatchQueue.java | 2 +-
.../computeresource/CloudJobSubmission.java | 2 +-
.../ComputeResourceDescription.java | 2 +-
.../computeresource/GlobusJobSubmission.java | 2 +-
.../computeresource/JobSubmissionInterface.java | 2 +-
.../computeresource/LOCALSubmission.java | 2 +-
.../computeresource/ResourceJobManager.java | 2 +-
.../computeresource/SSHJobSubmission.java | 2 +-
.../computeresource/UnicoreJobSubmission.java | 2 +-
.../ComputeResourcePreference.java | 116 +++++++++++++-
.../gatewayprofile/GatewayResourceProfile.java | 116 +-------------
.../gatewayprofile/StoragePreference.java | 2 +-
.../StorageResourceDescription.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 +-
.../data/movement/DataMovementInterface.java | 2 +-
.../data/movement/GridFTPDataMovement.java | 2 +-
.../model/data/movement/LOCALDataMovement.java | 2 +-
.../model/data/movement/SCPDataMovement.java | 2 +-
.../data/movement/UnicoreDataMovement.java | 2 +-
.../data/resource/DataReplicaLocationModel.java | 2 +-
.../model/data/resource/DataResourceModel.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 +-
.../model/task/EnvironmentSetupTaskModel.java | 2 +-
.../model/task/JobSubmissionTaskModel.java | 2 +-
.../airavata/model/task/MonitorTaskModel.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 +-
.../common/utils/ApplicationSettings.java | 16 --
.../airavata/common/utils/ServerSettings.java | 3 +-
.../main/resources/airavata-server.properties | 16 +-
.../scripts/credential-store-h2.sql | 42 -----
.../scripts/credential-store-mysql.sql | 38 -----
.../store/server/CredentialStoreServer.java | 87 +++++------
.../apache/airavata/gfac/core/GFacUtils.java | 2 +
.../impl/task/DefaultJobSubmissionTask.java | 31 +++-
.../catalog/impl/GwyResourceProfileImpl.java | 4 +-
.../core/app/catalog/model/ComputeResource.java | 33 ++++
.../model/ComputeResourcePreference.java | 10 ++
.../ComputeHostPreferenceResource.java | 11 ++
.../resources/ComputeResourceResource.java | 30 ++++
.../app/catalog/util/AppCatalogJPAUtils.java | 4 +
.../util/AppCatalogThriftConversion.java | 7 +
.../src/main/resources/appcatalog-derby.sql | 4 +
.../src/main/resources/appcatalog-mysql.sql | 4 +
.../src/main/resources/credstore-derby.sql | 39 +++++
.../src/main/resources/credstore-mysql.sql | 39 +++++
.../src/main/resources/expcatalog-derby.sql | 21 +--
.../src/main/resources/expcatalog-mysql.sql | 21 +--
.../org/apache/airavata/server/ServerMain.java | 4 +-
.../airavata/workflow/core/WorkflowInfo.java | 38 +++--
.../workflow/core/dag/edge/DirectedEdge.java | 12 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 6 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 12 +-
.../core/parser/JsonWorkflowParser.java | 31 +++-
.../src/test/resources/TestWorkflow.json | 16 +-
.../gateway_resource_profile_model.thrift | 6 +-
118 files changed, 765 insertions(+), 454 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/gateway_resource_profile_model_types.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/GatewayProfile/Types.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e6d68271/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/gatewayprofile/ttypes.py
----------------------------------------------------------------------