http://git-wip-us.apache.org/repos/asf/airavata/blob/2a901394/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 b1c092b..0d52abb 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 @@ -103,6 +103,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput private static final org.apache.thrift.protocol.TField RESERVATION_FIELD_DESC = new org.apache.thrift.protocol.TField("reservation", org.apache.thrift.protocol.TType.STRING, (short)12); private static final org.apache.thrift.protocol.TField RESERVATION_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationStartTime", org.apache.thrift.protocol.TType.I64, (short)13); private static final org.apache.thrift.protocol.TField RESERVATION_END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("reservationEndTime", org.apache.thrift.protocol.TType.I64, (short)14); + private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisioner", org.apache.thrift.protocol.TType.STRING, (short)15); + private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_CONFIG_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisionerConfig", org.apache.thrift.protocol.TType.MAP, (short)16); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -124,6 +126,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput private String reservation; // optional private long reservationStartTime; // optional private long reservationEndTime; // optional + private String sshAccountProvisioner; // optional + private Map<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String> sshAccountProvisionerConfig; // 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 { @@ -148,7 +152,9 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput QUALITY_OF_SERVICE((short)11, "qualityOfService"), RESERVATION((short)12, "reservation"), RESERVATION_START_TIME((short)13, "reservationStartTime"), - RESERVATION_END_TIME((short)14, "reservationEndTime"); + RESERVATION_END_TIME((short)14, "reservationEndTime"), + SSH_ACCOUNT_PROVISIONER((short)15, "sshAccountProvisioner"), + SSH_ACCOUNT_PROVISIONER_CONFIG((short)16, "sshAccountProvisionerConfig"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -191,6 +197,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return RESERVATION_START_TIME; case 14: // RESERVATION_END_TIME return RESERVATION_END_TIME; + case 15: // SSH_ACCOUNT_PROVISIONER + return SSH_ACCOUNT_PROVISIONER; + case 16: // SSH_ACCOUNT_PROVISIONER_CONFIG + return SSH_ACCOUNT_PROVISIONER_CONFIG; default: return null; } @@ -235,7 +245,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput private static final int __RESERVATIONSTARTTIME_ISSET_ID = 1; private static final int __RESERVATIONENDTIME_ISSET_ID = 2; 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,_Fields.USAGE_REPORTING_GATEWAY_ID,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME}; + 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,_Fields.QUALITY_OF_SERVICE,_Fields.RESERVATION,_Fields.RESERVATION_START_TIME,_Fields.RESERVATION_END_TIME,_Fields.SSH_ACCOUNT_PROVISIONER,_Fields.SSH_ACCOUNT_PROVISIONER_CONFIG}; 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); @@ -267,6 +277,12 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.RESERVATION_END_TIME, new org.apache.thrift.meta_data.FieldMetaData("reservationEndTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.SSH_ACCOUNT_PROVISIONER, new org.apache.thrift.meta_data.FieldMetaData("sshAccountProvisioner", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.SSH_ACCOUNT_PROVISIONER_CONFIG, new org.apache.thrift.meta_data.FieldMetaData("sshAccountProvisionerConfig", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, + new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam.class), + 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); } @@ -327,6 +343,24 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput } this.reservationStartTime = other.reservationStartTime; this.reservationEndTime = other.reservationEndTime; + if (other.isSetSshAccountProvisioner()) { + this.sshAccountProvisioner = other.sshAccountProvisioner; + } + if (other.isSetSshAccountProvisionerConfig()) { + Map<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String> __this__sshAccountProvisionerConfig = new HashMap<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String>(other.sshAccountProvisionerConfig.size()); + for (Map.Entry<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam, String> other_element : other.sshAccountProvisionerConfig.entrySet()) { + + org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam other_element_key = other_element.getKey(); + String other_element_value = other_element.getValue(); + + org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam __this__sshAccountProvisionerConfig_copy_key = new org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam(other_element_key); + + String __this__sshAccountProvisionerConfig_copy_value = other_element_value; + + __this__sshAccountProvisionerConfig.put(__this__sshAccountProvisionerConfig_copy_key, __this__sshAccountProvisionerConfig_copy_value); + } + this.sshAccountProvisionerConfig = __this__sshAccountProvisionerConfig; + } } public ComputeResourcePreference deepCopy() { @@ -352,6 +386,8 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput this.reservationStartTime = 0; setReservationEndTimeIsSet(false); this.reservationEndTime = 0; + this.sshAccountProvisioner = null; + this.sshAccountProvisionerConfig = null; } public String getComputeResourceId() { @@ -689,6 +725,63 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value); } + public String getSshAccountProvisioner() { + return this.sshAccountProvisioner; + } + + public void setSshAccountProvisioner(String sshAccountProvisioner) { + this.sshAccountProvisioner = sshAccountProvisioner; + } + + public void unsetSshAccountProvisioner() { + this.sshAccountProvisioner = null; + } + + /** Returns true if field sshAccountProvisioner is set (has been assigned a value) and false otherwise */ + public boolean isSetSshAccountProvisioner() { + return this.sshAccountProvisioner != null; + } + + public void setSshAccountProvisionerIsSet(boolean value) { + if (!value) { + this.sshAccountProvisioner = null; + } + } + + public int getSshAccountProvisionerConfigSize() { + return (this.sshAccountProvisionerConfig == null) ? 0 : this.sshAccountProvisionerConfig.size(); + } + + public void putToSshAccountProvisionerConfig(org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam key, String val) { + if (this.sshAccountProvisionerConfig == null) { + this.sshAccountProvisionerConfig = new HashMap<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String>(); + } + this.sshAccountProvisionerConfig.put(key, val); + } + + public Map<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String> getSshAccountProvisionerConfig() { + return this.sshAccountProvisionerConfig; + } + + public void setSshAccountProvisionerConfig(Map<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String> sshAccountProvisionerConfig) { + this.sshAccountProvisionerConfig = sshAccountProvisionerConfig; + } + + public void unsetSshAccountProvisionerConfig() { + this.sshAccountProvisionerConfig = null; + } + + /** Returns true if field sshAccountProvisionerConfig is set (has been assigned a value) and false otherwise */ + public boolean isSetSshAccountProvisionerConfig() { + return this.sshAccountProvisionerConfig != null; + } + + public void setSshAccountProvisionerConfigIsSet(boolean value) { + if (!value) { + this.sshAccountProvisionerConfig = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case COMPUTE_RESOURCE_ID: @@ -803,6 +896,22 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput } break; + case SSH_ACCOUNT_PROVISIONER: + if (value == null) { + unsetSshAccountProvisioner(); + } else { + setSshAccountProvisioner((String)value); + } + break; + + case SSH_ACCOUNT_PROVISIONER_CONFIG: + if (value == null) { + unsetSshAccountProvisionerConfig(); + } else { + setSshAccountProvisionerConfig((Map<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String>)value); + } + break; + } } @@ -850,6 +959,12 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput case RESERVATION_END_TIME: return getReservationEndTime(); + case SSH_ACCOUNT_PROVISIONER: + return getSshAccountProvisioner(); + + case SSH_ACCOUNT_PROVISIONER_CONFIG: + return getSshAccountProvisionerConfig(); + } throw new IllegalStateException(); } @@ -889,6 +1004,10 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return isSetReservationStartTime(); case RESERVATION_END_TIME: return isSetReservationEndTime(); + case SSH_ACCOUNT_PROVISIONER: + return isSetSshAccountProvisioner(); + case SSH_ACCOUNT_PROVISIONER_CONFIG: + return isSetSshAccountProvisionerConfig(); } throw new IllegalStateException(); } @@ -1032,6 +1151,24 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return false; } + boolean this_present_sshAccountProvisioner = true && this.isSetSshAccountProvisioner(); + boolean that_present_sshAccountProvisioner = true && that.isSetSshAccountProvisioner(); + if (this_present_sshAccountProvisioner || that_present_sshAccountProvisioner) { + if (!(this_present_sshAccountProvisioner && that_present_sshAccountProvisioner)) + return false; + if (!this.sshAccountProvisioner.equals(that.sshAccountProvisioner)) + return false; + } + + boolean this_present_sshAccountProvisionerConfig = true && this.isSetSshAccountProvisionerConfig(); + boolean that_present_sshAccountProvisionerConfig = true && that.isSetSshAccountProvisionerConfig(); + if (this_present_sshAccountProvisionerConfig || that_present_sshAccountProvisionerConfig) { + if (!(this_present_sshAccountProvisionerConfig && that_present_sshAccountProvisionerConfig)) + return false; + if (!this.sshAccountProvisionerConfig.equals(that.sshAccountProvisionerConfig)) + return false; + } + return true; } @@ -1109,6 +1246,16 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (present_reservationEndTime) list.add(reservationEndTime); + boolean present_sshAccountProvisioner = true && (isSetSshAccountProvisioner()); + list.add(present_sshAccountProvisioner); + if (present_sshAccountProvisioner) + list.add(sshAccountProvisioner); + + boolean present_sshAccountProvisionerConfig = true && (isSetSshAccountProvisionerConfig()); + list.add(present_sshAccountProvisionerConfig); + if (present_sshAccountProvisionerConfig) + list.add(sshAccountProvisionerConfig); + return list.hashCode(); } @@ -1260,6 +1407,26 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput return lastComparison; } } + lastComparison = Boolean.valueOf(isSetSshAccountProvisioner()).compareTo(other.isSetSshAccountProvisioner()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSshAccountProvisioner()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshAccountProvisioner, other.sshAccountProvisioner); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetSshAccountProvisionerConfig()).compareTo(other.isSetSshAccountProvisionerConfig()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetSshAccountProvisionerConfig()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sshAccountProvisionerConfig, other.sshAccountProvisionerConfig); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1403,6 +1570,26 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput sb.append(this.reservationEndTime); first = false; } + if (isSetSshAccountProvisioner()) { + if (!first) sb.append(", "); + sb.append("sshAccountProvisioner:"); + if (this.sshAccountProvisioner == null) { + sb.append("null"); + } else { + sb.append(this.sshAccountProvisioner); + } + first = false; + } + if (isSetSshAccountProvisionerConfig()) { + if (!first) sb.append(", "); + sb.append("sshAccountProvisionerConfig:"); + if (this.sshAccountProvisionerConfig == null) { + sb.append("null"); + } else { + sb.append(this.sshAccountProvisionerConfig); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -1568,6 +1755,35 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 15: // SSH_ACCOUNT_PROVISIONER + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.sshAccountProvisioner = iprot.readString(); + struct.setSshAccountProvisionerIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 16: // SSH_ACCOUNT_PROVISIONER_CONFIG + if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { + { + org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin(); + struct.sshAccountProvisionerConfig = new HashMap<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String>(2*_map0.size); + org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam _key1; + String _val2; + for (int _i3 = 0; _i3 < _map0.size; ++_i3) + { + _key1 = new org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam(); + _key1.read(iprot); + _val2 = iprot.readString(); + struct.sshAccountProvisionerConfig.put(_key1, _val2); + } + iprot.readMapEnd(); + } + struct.setSshAccountProvisionerConfigIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1669,6 +1885,28 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput oprot.writeI64(struct.reservationEndTime); oprot.writeFieldEnd(); } + if (struct.sshAccountProvisioner != null) { + if (struct.isSetSshAccountProvisioner()) { + oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_FIELD_DESC); + oprot.writeString(struct.sshAccountProvisioner); + oprot.writeFieldEnd(); + } + } + if (struct.sshAccountProvisionerConfig != null) { + if (struct.isSetSshAccountProvisionerConfig()) { + oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_CONFIG_FIELD_DESC); + { + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRING, struct.sshAccountProvisionerConfig.size())); + for (Map.Entry<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam, String> _iter4 : struct.sshAccountProvisionerConfig.entrySet()) + { + _iter4.getKey().write(oprot); + oprot.writeString(_iter4.getValue()); + } + oprot.writeMapEnd(); + } + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1725,7 +1963,13 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (struct.isSetReservationEndTime()) { optionals.set(11); } - oprot.writeBitSet(optionals, 12); + if (struct.isSetSshAccountProvisioner()) { + optionals.set(12); + } + if (struct.isSetSshAccountProvisionerConfig()) { + optionals.set(13); + } + oprot.writeBitSet(optionals, 14); if (struct.isSetLoginUserName()) { oprot.writeString(struct.loginUserName); } @@ -1762,6 +2006,19 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput if (struct.isSetReservationEndTime()) { oprot.writeI64(struct.reservationEndTime); } + if (struct.isSetSshAccountProvisioner()) { + oprot.writeString(struct.sshAccountProvisioner); + } + if (struct.isSetSshAccountProvisionerConfig()) { + { + oprot.writeI32(struct.sshAccountProvisionerConfig.size()); + for (Map.Entry<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam, String> _iter5 : struct.sshAccountProvisionerConfig.entrySet()) + { + _iter5.getKey().write(oprot); + oprot.writeString(_iter5.getValue()); + } + } + } } @Override @@ -1771,7 +2028,7 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput struct.setComputeResourceIdIsSet(true); struct.overridebyAiravata = iprot.readBool(); struct.setOverridebyAiravataIsSet(true); - BitSet incoming = iprot.readBitSet(12); + BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.loginUserName = iprot.readString(); struct.setLoginUserNameIsSet(true); @@ -1820,6 +2077,26 @@ public class ComputeResourcePreference implements org.apache.thrift.TBase<Comput struct.reservationEndTime = iprot.readI64(); struct.setReservationEndTimeIsSet(true); } + if (incoming.get(12)) { + struct.sshAccountProvisioner = iprot.readString(); + struct.setSshAccountProvisionerIsSet(true); + } + if (incoming.get(13)) { + { + org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.sshAccountProvisionerConfig = new HashMap<org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam,String>(2*_map6.size); + org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam _key7; + String _val8; + for (int _i9 = 0; _i9 < _map6.size; ++_i9) + { + _key7 = new org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParam(); + _key7.read(iprot); + _val8 = iprot.readString(); + struct.sshAccountProvisionerConfig.put(_key7, _val8); + } + } + struct.setSshAccountProvisionerConfigIsSet(true); + } } }
http://git-wip-us.apache.org/repos/asf/airavata/blob/2a901394/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 31f33f6..725bf43 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 @@ -830,14 +830,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe case 3: // COMPUTE_RESOURCE_PREFERENCES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list0.size); - ComputeResourcePreference _elem1; - for (int _i2 = 0; _i2 < _list0.size; ++_i2) + org.apache.thrift.protocol.TList _list10 = iprot.readListBegin(); + struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list10.size); + ComputeResourcePreference _elem11; + for (int _i12 = 0; _i12 < _list10.size; ++_i12) { - _elem1 = new ComputeResourcePreference(); - _elem1.read(iprot); - struct.computeResourcePreferences.add(_elem1); + _elem11 = new ComputeResourcePreference(); + _elem11.read(iprot); + struct.computeResourcePreferences.add(_elem11); } iprot.readListEnd(); } @@ -849,14 +849,14 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe case 4: // STORAGE_PREFERENCES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); - struct.storagePreferences = new ArrayList<StoragePreference>(_list3.size); - StoragePreference _elem4; - for (int _i5 = 0; _i5 < _list3.size; ++_i5) + org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(); + struct.storagePreferences = new ArrayList<StoragePreference>(_list13.size); + StoragePreference _elem14; + for (int _i15 = 0; _i15 < _list13.size; ++_i15) { - _elem4 = new StoragePreference(); - _elem4.read(iprot); - struct.storagePreferences.add(_elem4); + _elem14 = new StoragePreference(); + _elem14.read(iprot); + struct.storagePreferences.add(_elem14); } iprot.readListEnd(); } @@ -911,9 +911,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe oprot.writeFieldBegin(COMPUTE_RESOURCE_PREFERENCES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.computeResourcePreferences.size())); - for (ComputeResourcePreference _iter6 : struct.computeResourcePreferences) + for (ComputeResourcePreference _iter16 : struct.computeResourcePreferences) { - _iter6.write(oprot); + _iter16.write(oprot); } oprot.writeListEnd(); } @@ -925,9 +925,9 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe oprot.writeFieldBegin(STORAGE_PREFERENCES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.storagePreferences.size())); - for (StoragePreference _iter7 : struct.storagePreferences) + for (StoragePreference _iter17 : struct.storagePreferences) { - _iter7.write(oprot); + _iter17.write(oprot); } oprot.writeListEnd(); } @@ -989,18 +989,18 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe if (struct.isSetComputeResourcePreferences()) { { oprot.writeI32(struct.computeResourcePreferences.size()); - for (ComputeResourcePreference _iter8 : struct.computeResourcePreferences) + for (ComputeResourcePreference _iter18 : struct.computeResourcePreferences) { - _iter8.write(oprot); + _iter18.write(oprot); } } } if (struct.isSetStoragePreferences()) { { oprot.writeI32(struct.storagePreferences.size()); - for (StoragePreference _iter9 : struct.storagePreferences) + for (StoragePreference _iter19 : struct.storagePreferences) { - _iter9.write(oprot); + _iter19.write(oprot); } } } @@ -1024,28 +1024,28 @@ public class GatewayResourceProfile implements org.apache.thrift.TBase<GatewayRe } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list10.size); - ComputeResourcePreference _elem11; - for (int _i12 = 0; _i12 < _list10.size; ++_i12) + org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.computeResourcePreferences = new ArrayList<ComputeResourcePreference>(_list20.size); + ComputeResourcePreference _elem21; + for (int _i22 = 0; _i22 < _list20.size; ++_i22) { - _elem11 = new ComputeResourcePreference(); - _elem11.read(iprot); - struct.computeResourcePreferences.add(_elem11); + _elem21 = new ComputeResourcePreference(); + _elem21.read(iprot); + struct.computeResourcePreferences.add(_elem21); } } struct.setComputeResourcePreferencesIsSet(true); } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.storagePreferences = new ArrayList<StoragePreference>(_list13.size); - StoragePreference _elem14; - for (int _i15 = 0; _i15 < _list13.size; ++_i15) + org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.storagePreferences = new ArrayList<StoragePreference>(_list23.size); + StoragePreference _elem24; + for (int _i25 = 0; _i25 < _list23.size; ++_i25) { - _elem14 = new StoragePreference(); - _elem14.read(iprot); - struct.storagePreferences.add(_elem14); + _elem24 = new StoragePreference(); + _elem24.read(iprot); + struct.storagePreferences.add(_elem24); } } struct.setStoragePreferencesIsSet(true); http://git-wip-us.apache.org/repos/asf/airavata/blob/2a901394/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift index 627116e..a6c6ab9 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/account_provisioning_model.thrift @@ -35,6 +35,6 @@ struct SSHAccountProvisioner { struct SSHAccountProvisionerConfigParam { 1: required string name; 2: required SSHAccountProvisionerConfigParamType type = SSHAccountProvisionerConfigParamType.STRING; - 3: required bool optional = false; + 3: required bool isOptional = false; 4: optional string description; } http://git-wip-us.apache.org/repos/asf/airavata/blob/2a901394/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 6244c28..060442b 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 @@ -77,7 +77,7 @@ struct ComputeResourcePreference { 13: optional i64 reservationStartTime, 14: optional i64 reservationEndTime, 15: optional string sshAccountProvisioner, - 16: optional map<account_provisioning_model.SSHAccountProvisionerConfigParam, String> sshAccountProvisionerConfig + 16: optional map<account_provisioning_model.SSHAccountProvisionerConfigParam, string> sshAccountProvisionerConfig } struct StoragePreference {