Repository: airavata Updated Branches: refs/heads/master f9f63a025 -> 33b403fc7
http://git-wip-us.apache.org/repos/asf/airavata/blob/33b403fc/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 bdb70e4..e0e6227 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 @@ -22,6 +22,7 @@ class ComputeResourcePreference { public $computeResourceId = null; public $overridebyAiravata = true; + public $loginUserName = null; public $preferredJobSubmissionProtocol = null; public $preferredDataMovementProtocol = null; public $preferredBatchQueue = null; @@ -40,22 +41,26 @@ class ComputeResourcePreference { 'type' => TType::BOOL, ), 3 => array( + 'var' => 'loginUserName', + 'type' => TType::STRING, + ), + 4 => array( 'var' => 'preferredJobSubmissionProtocol', 'type' => TType::I32, ), - 4 => array( + 5 => array( 'var' => 'preferredDataMovementProtocol', 'type' => TType::I32, ), - 5 => array( + 6 => array( 'var' => 'preferredBatchQueue', 'type' => TType::STRING, ), - 6 => array( + 7 => array( 'var' => 'scratchLocation', 'type' => TType::STRING, ), - 7 => array( + 8 => array( 'var' => 'allocationProjectNumber', 'type' => TType::STRING, ), @@ -68,6 +73,9 @@ class ComputeResourcePreference { if (isset($vals['overridebyAiravata'])) { $this->overridebyAiravata = $vals['overridebyAiravata']; } + if (isset($vals['loginUserName'])) { + $this->loginUserName = $vals['loginUserName']; + } if (isset($vals['preferredJobSubmissionProtocol'])) { $this->preferredJobSubmissionProtocol = $vals['preferredJobSubmissionProtocol']; } @@ -120,34 +128,41 @@ class ComputeResourcePreference { } break; case 3: + if ($ftype == TType::STRING) { + $xfer += $input->readString($this->loginUserName); + } else { + $xfer += $input->skip($ftype); + } + break; + case 4: if ($ftype == TType::I32) { $xfer += $input->readI32($this->preferredJobSubmissionProtocol); } else { $xfer += $input->skip($ftype); } break; - case 4: + case 5: if ($ftype == TType::I32) { $xfer += $input->readI32($this->preferredDataMovementProtocol); } else { $xfer += $input->skip($ftype); } break; - case 5: + case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->preferredBatchQueue); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->scratchLocation); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 8: if ($ftype == TType::STRING) { $xfer += $input->readString($this->allocationProjectNumber); } else { @@ -177,28 +192,33 @@ class ComputeResourcePreference { $xfer += $output->writeBool($this->overridebyAiravata); $xfer += $output->writeFieldEnd(); } + if ($this->loginUserName !== null) { + $xfer += $output->writeFieldBegin('loginUserName', TType::STRING, 3); + $xfer += $output->writeString($this->loginUserName); + $xfer += $output->writeFieldEnd(); + } if ($this->preferredJobSubmissionProtocol !== null) { - $xfer += $output->writeFieldBegin('preferredJobSubmissionProtocol', TType::I32, 3); + $xfer += $output->writeFieldBegin('preferredJobSubmissionProtocol', TType::I32, 4); $xfer += $output->writeI32($this->preferredJobSubmissionProtocol); $xfer += $output->writeFieldEnd(); } if ($this->preferredDataMovementProtocol !== null) { - $xfer += $output->writeFieldBegin('preferredDataMovementProtocol', TType::I32, 4); + $xfer += $output->writeFieldBegin('preferredDataMovementProtocol', TType::I32, 5); $xfer += $output->writeI32($this->preferredDataMovementProtocol); $xfer += $output->writeFieldEnd(); } if ($this->preferredBatchQueue !== null) { - $xfer += $output->writeFieldBegin('preferredBatchQueue', TType::STRING, 5); + $xfer += $output->writeFieldBegin('preferredBatchQueue', TType::STRING, 6); $xfer += $output->writeString($this->preferredBatchQueue); $xfer += $output->writeFieldEnd(); } if ($this->scratchLocation !== null) { - $xfer += $output->writeFieldBegin('scratchLocation', TType::STRING, 6); + $xfer += $output->writeFieldBegin('scratchLocation', TType::STRING, 7); $xfer += $output->writeString($this->scratchLocation); $xfer += $output->writeFieldEnd(); } if ($this->allocationProjectNumber !== null) { - $xfer += $output->writeFieldBegin('allocationProjectNumber', TType::STRING, 7); + $xfer += $output->writeFieldBegin('allocationProjectNumber', TType::STRING, 8); $xfer += $output->writeString($this->allocationProjectNumber); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/33b403fc/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 26bd817..1661d3a 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 @@ -58,6 +58,9 @@ import org.slf4j.LoggerFactory; * overridebyAiravata: * If turned true, Airavata will override the preferences of better alternatives exist. * + * loginUserName: + * If turned true, Airavata will override the preferences of better alternatives exist. + * * preferredJobSubmissionProtocol: * For resources with multiple job submission protocols, the gateway can pick a preferred option. * @@ -81,11 +84,12 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField OVERRIDEBY_AIRAVATA_FIELD_DESC = new org.apache.thrift.protocol.TField("overridebyAiravata", org.apache.thrift.protocol.TType.BOOL, (short)2); - private static final org.apache.thrift.protocol.TField PREFERRED_JOB_SUBMISSION_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredJobSubmissionProtocol", org.apache.thrift.protocol.TType.I32, (short)3); - private static final org.apache.thrift.protocol.TField PREFERRED_DATA_MOVEMENT_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredDataMovementProtocol", org.apache.thrift.protocol.TType.I32, (short)4); - private static final org.apache.thrift.protocol.TField PREFERRED_BATCH_QUEUE_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredBatchQueue", org.apache.thrift.protocol.TType.STRING, (short)5); - 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)6); - 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)7); + private static final org.apache.thrift.protocol.TField LOGIN_USER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("loginUserName", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField PREFERRED_JOB_SUBMISSION_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredJobSubmissionProtocol", org.apache.thrift.protocol.TType.I32, (short)4); + private static final org.apache.thrift.protocol.TField PREFERRED_DATA_MOVEMENT_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredDataMovementProtocol", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField PREFERRED_BATCH_QUEUE_FIELD_DESC = new org.apache.thrift.protocol.TField("preferredBatchQueue", org.apache.thrift.protocol.TType.STRING, (short)6); + 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -95,6 +99,7 @@ import org.slf4j.LoggerFactory; private String computeResourceId; // required private boolean overridebyAiravata; // required + private String loginUserName; // optional private org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol preferredJobSubmissionProtocol; // optional private org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol preferredDataMovementProtocol; // optional private String preferredBatchQueue; // optional @@ -105,19 +110,20 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { COMPUTE_RESOURCE_ID((short)1, "computeResourceId"), OVERRIDEBY_AIRAVATA((short)2, "overridebyAiravata"), + LOGIN_USER_NAME((short)3, "loginUserName"), /** * * @see org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol */ - PREFERRED_JOB_SUBMISSION_PROTOCOL((short)3, "preferredJobSubmissionProtocol"), + PREFERRED_JOB_SUBMISSION_PROTOCOL((short)4, "preferredJobSubmissionProtocol"), /** * * @see org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol */ - PREFERRED_DATA_MOVEMENT_PROTOCOL((short)4, "preferredDataMovementProtocol"), - PREFERRED_BATCH_QUEUE((short)5, "preferredBatchQueue"), - SCRATCH_LOCATION((short)6, "scratchLocation"), - ALLOCATION_PROJECT_NUMBER((short)7, "allocationProjectNumber"); + PREFERRED_DATA_MOVEMENT_PROTOCOL((short)5, "preferredDataMovementProtocol"), + PREFERRED_BATCH_QUEUE((short)6, "preferredBatchQueue"), + SCRATCH_LOCATION((short)7, "scratchLocation"), + ALLOCATION_PROJECT_NUMBER((short)8, "allocationProjectNumber"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -136,15 +142,17 @@ import org.slf4j.LoggerFactory; return COMPUTE_RESOURCE_ID; case 2: // OVERRIDEBY_AIRAVATA return OVERRIDEBY_AIRAVATA; - case 3: // PREFERRED_JOB_SUBMISSION_PROTOCOL + case 3: // LOGIN_USER_NAME + return LOGIN_USER_NAME; + case 4: // PREFERRED_JOB_SUBMISSION_PROTOCOL return PREFERRED_JOB_SUBMISSION_PROTOCOL; - case 4: // PREFERRED_DATA_MOVEMENT_PROTOCOL + case 5: // PREFERRED_DATA_MOVEMENT_PROTOCOL return PREFERRED_DATA_MOVEMENT_PROTOCOL; - case 5: // PREFERRED_BATCH_QUEUE + case 6: // PREFERRED_BATCH_QUEUE return PREFERRED_BATCH_QUEUE; - case 6: // SCRATCH_LOCATION + case 7: // SCRATCH_LOCATION return SCRATCH_LOCATION; - case 7: // ALLOCATION_PROJECT_NUMBER + case 8: // ALLOCATION_PROJECT_NUMBER return ALLOCATION_PROJECT_NUMBER; default: return null; @@ -188,7 +196,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __OVERRIDEBYAIRAVATA_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL,_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL,_Fields.PREFERRED_BATCH_QUEUE,_Fields.SCRATCH_LOCATION,_Fields.ALLOCATION_PROJECT_NUMBER}; + private _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}; 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); @@ -196,6 +204,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.OVERRIDEBY_AIRAVATA, new org.apache.thrift.meta_data.FieldMetaData("overridebyAiravata", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.LOGIN_USER_NAME, new org.apache.thrift.meta_data.FieldMetaData("loginUserName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.PREFERRED_JOB_SUBMISSION_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("preferredJobSubmissionProtocol", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.class))); tmpMap.put(_Fields.PREFERRED_DATA_MOVEMENT_PROTOCOL, new org.apache.thrift.meta_data.FieldMetaData("preferredDataMovementProtocol", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -234,6 +244,9 @@ import org.slf4j.LoggerFactory; this.computeResourceId = other.computeResourceId; } this.overridebyAiravata = other.overridebyAiravata; + if (other.isSetLoginUserName()) { + this.loginUserName = other.loginUserName; + } if (other.isSetPreferredJobSubmissionProtocol()) { this.preferredJobSubmissionProtocol = other.preferredJobSubmissionProtocol; } @@ -260,6 +273,7 @@ import org.slf4j.LoggerFactory; this.computeResourceId = null; this.overridebyAiravata = true; + this.loginUserName = null; this.preferredJobSubmissionProtocol = null; this.preferredDataMovementProtocol = null; this.preferredBatchQueue = null; @@ -312,6 +326,29 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OVERRIDEBYAIRAVATA_ISSET_ID, value); } + public String getLoginUserName() { + return this.loginUserName; + } + + public void setLoginUserName(String loginUserName) { + this.loginUserName = loginUserName; + } + + public void unsetLoginUserName() { + this.loginUserName = null; + } + + /** Returns true if field loginUserName is set (has been assigned a value) and false otherwise */ + public boolean isSetLoginUserName() { + return this.loginUserName != null; + } + + public void setLoginUserNameIsSet(boolean value) { + if (!value) { + this.loginUserName = null; + } + } + /** * * @see org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol @@ -461,6 +498,14 @@ import org.slf4j.LoggerFactory; } break; + case LOGIN_USER_NAME: + if (value == null) { + unsetLoginUserName(); + } else { + setLoginUserName((String)value); + } + break; + case PREFERRED_JOB_SUBMISSION_PROTOCOL: if (value == null) { unsetPreferredJobSubmissionProtocol(); @@ -512,6 +557,9 @@ import org.slf4j.LoggerFactory; case OVERRIDEBY_AIRAVATA: return Boolean.valueOf(isOverridebyAiravata()); + case LOGIN_USER_NAME: + return getLoginUserName(); + case PREFERRED_JOB_SUBMISSION_PROTOCOL: return getPreferredJobSubmissionProtocol(); @@ -542,6 +590,8 @@ import org.slf4j.LoggerFactory; return isSetComputeResourceId(); case OVERRIDEBY_AIRAVATA: return isSetOverridebyAiravata(); + case LOGIN_USER_NAME: + return isSetLoginUserName(); case PREFERRED_JOB_SUBMISSION_PROTOCOL: return isSetPreferredJobSubmissionProtocol(); case PREFERRED_DATA_MOVEMENT_PROTOCOL: @@ -587,6 +637,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_loginUserName = true && this.isSetLoginUserName(); + boolean that_present_loginUserName = true && that.isSetLoginUserName(); + if (this_present_loginUserName || that_present_loginUserName) { + if (!(this_present_loginUserName && that_present_loginUserName)) + return false; + if (!this.loginUserName.equals(that.loginUserName)) + return false; + } + boolean this_present_preferredJobSubmissionProtocol = true && this.isSetPreferredJobSubmissionProtocol(); boolean that_present_preferredJobSubmissionProtocol = true && that.isSetPreferredJobSubmissionProtocol(); if (this_present_preferredJobSubmissionProtocol || that_present_preferredJobSubmissionProtocol) { @@ -668,6 +727,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetLoginUserName()).compareTo(other.isSetLoginUserName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetLoginUserName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loginUserName, other.loginUserName); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetPreferredJobSubmissionProtocol()).compareTo(other.isSetPreferredJobSubmissionProtocol()); if (lastComparison != 0) { return lastComparison; @@ -749,6 +818,16 @@ import org.slf4j.LoggerFactory; sb.append("overridebyAiravata:"); sb.append(this.overridebyAiravata); first = false; + if (isSetLoginUserName()) { + if (!first) sb.append(", "); + sb.append("loginUserName:"); + if (this.loginUserName == null) { + sb.append("null"); + } else { + sb.append(this.loginUserName); + } + first = false; + } if (isSetPreferredJobSubmissionProtocol()) { if (!first) sb.append(", "); sb.append("preferredJobSubmissionProtocol:"); @@ -868,7 +947,15 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // PREFERRED_JOB_SUBMISSION_PROTOCOL + case 3: // LOGIN_USER_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.loginUserName = iprot.readString(); + struct.setLoginUserNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PREFERRED_JOB_SUBMISSION_PROTOCOL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.preferredJobSubmissionProtocol = org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32()); struct.setPreferredJobSubmissionProtocolIsSet(true); @@ -876,7 +963,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // PREFERRED_DATA_MOVEMENT_PROTOCOL + case 5: // PREFERRED_DATA_MOVEMENT_PROTOCOL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.preferredDataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); struct.setPreferredDataMovementProtocolIsSet(true); @@ -884,7 +971,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // PREFERRED_BATCH_QUEUE + case 6: // PREFERRED_BATCH_QUEUE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.preferredBatchQueue = iprot.readString(); struct.setPreferredBatchQueueIsSet(true); @@ -892,7 +979,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // SCRATCH_LOCATION + case 7: // SCRATCH_LOCATION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.scratchLocation = iprot.readString(); struct.setScratchLocationIsSet(true); @@ -900,7 +987,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // ALLOCATION_PROJECT_NUMBER + case 8: // ALLOCATION_PROJECT_NUMBER if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.allocationProjectNumber = iprot.readString(); struct.setAllocationProjectNumberIsSet(true); @@ -929,6 +1016,13 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(OVERRIDEBY_AIRAVATA_FIELD_DESC); oprot.writeBool(struct.overridebyAiravata); oprot.writeFieldEnd(); + if (struct.loginUserName != null) { + if (struct.isSetLoginUserName()) { + oprot.writeFieldBegin(LOGIN_USER_NAME_FIELD_DESC); + oprot.writeString(struct.loginUserName); + oprot.writeFieldEnd(); + } + } if (struct.preferredJobSubmissionProtocol != null) { if (struct.isSetPreferredJobSubmissionProtocol()) { oprot.writeFieldBegin(PREFERRED_JOB_SUBMISSION_PROTOCOL_FIELD_DESC); @@ -984,22 +1078,28 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.computeResourceId); oprot.writeBool(struct.overridebyAiravata); BitSet optionals = new BitSet(); - if (struct.isSetPreferredJobSubmissionProtocol()) { + if (struct.isSetLoginUserName()) { optionals.set(0); } - if (struct.isSetPreferredDataMovementProtocol()) { + if (struct.isSetPreferredJobSubmissionProtocol()) { optionals.set(1); } - if (struct.isSetPreferredBatchQueue()) { + if (struct.isSetPreferredDataMovementProtocol()) { optionals.set(2); } - if (struct.isSetScratchLocation()) { + if (struct.isSetPreferredBatchQueue()) { optionals.set(3); } - if (struct.isSetAllocationProjectNumber()) { + if (struct.isSetScratchLocation()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetAllocationProjectNumber()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); + if (struct.isSetLoginUserName()) { + oprot.writeString(struct.loginUserName); + } if (struct.isSetPreferredJobSubmissionProtocol()) { oprot.writeI32(struct.preferredJobSubmissionProtocol.getValue()); } @@ -1024,24 +1124,28 @@ import org.slf4j.LoggerFactory; struct.setComputeResourceIdIsSet(true); struct.overridebyAiravata = iprot.readBool(); struct.setOverridebyAiravataIsSet(true); - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { + struct.loginUserName = iprot.readString(); + struct.setLoginUserNameIsSet(true); + } + if (incoming.get(1)) { struct.preferredJobSubmissionProtocol = org.apache.airavata.model.appcatalog.computeresource.JobSubmissionProtocol.findByValue(iprot.readI32()); struct.setPreferredJobSubmissionProtocolIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(2)) { struct.preferredDataMovementProtocol = org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol.findByValue(iprot.readI32()); struct.setPreferredDataMovementProtocolIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { struct.preferredBatchQueue = iprot.readString(); struct.setPreferredBatchQueueIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.scratchLocation = iprot.readString(); struct.setScratchLocationIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.allocationProjectNumber = iprot.readString(); struct.setAllocationProjectNumberIsSet(true); } http://git-wip-us.apache.org/repos/asf/airavata/blob/33b403fc/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 fccc2be..1c317eb 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 @@ -55,12 +55,6 @@ import org.slf4j.LoggerFactory; * gatewayID: * Unique identifier for the gateway assigned by Airavata. Corelate this to Airavata Admin API Gateway Registration. * - * gatewayName: - * Name of the Gateway. - * - * gatewayDescription: - * A user friendly description of the gateway. - * * computeResourcePreferences: * List of resource preferences for each of the registered compute resources. *
