You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2020/05/11 14:15:28 UTC
[airavata] branch develop updated (aea921a -> e10b84c)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from aea921a Merge pull request #248 from isururanawaka/pythonSDK
new 8fc6574 AIRAVATA-3327 thrift stubs - removed deprecated reservation fields
new e10b84c AIRAVATA-3327 Remove columns and usage of deprecated reservation columns
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../appcatalog/groupresourceprofile/ttypes.py | 41 +--
.../ComputeResourceReservation.java | 32 +-
.../GroupComputeResourcePreference.java | 397 +++------------------
.../airavata/helix/impl/task/TaskContext.java | 5 -
.../database_scripts/appcatalog-mysql.sql | 3 -
.../init/03-appcatalog-migrations.sql | 5 +
.../appcatalog/GroupComputeResourcePrefEntity.java | 33 --
.../src/main/resources/appcatalog-derby.sql | 3 -
.../next/DeltaScripts/appCatalog_schema_delta.sql | 5 +
.../group_resource_profile_model.thrift | 3 -
10 files changed, 78 insertions(+), 449 deletions(-)
[airavata] 01/02: AIRAVATA-3327 thrift stubs - removed deprecated
reservation fields
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 8fc657428bdb8261b28506e403e1fae53c61e2d4
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon May 11 10:13:29 2020 -0400
AIRAVATA-3327 thrift stubs - removed deprecated reservation fields
---
.../appcatalog/groupresourceprofile/ttypes.py | 41 +--
.../ComputeResourceReservation.java | 32 +-
.../GroupComputeResourcePreference.java | 397 +++------------------
.../group_resource_profile_model.thrift | 3 -
4 files changed, 68 insertions(+), 405 deletions(-)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata/model/appcatalog/groupresourceprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata/model/appcatalog/groupresourceprofile/ttypes.py
index d5b8e18..61df7f6 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata/model/appcatalog/groupresourceprofile/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/airavata/model/appcatalog/groupresourceprofile/ttypes.py
@@ -259,9 +259,6 @@ class GroupComputeResourcePreference(object):
- resourceSpecificCredentialStoreToken
- usageReportingGatewayId
- qualityOfService
- - reservation
- - reservationStartTime
- - reservationEndTime
- sshAccountProvisioner
- groupSSHAccountProvisionerConfigs
- sshAccountProvisionerAdditionalInfo
@@ -282,16 +279,16 @@ class GroupComputeResourcePreference(object):
(10, TType.STRING, 'resourceSpecificCredentialStoreToken', 'UTF8', None, ), # 10
(11, TType.STRING, 'usageReportingGatewayId', 'UTF8', None, ), # 11
(12, TType.STRING, 'qualityOfService', 'UTF8', None, ), # 12
- (13, TType.STRING, 'reservation', 'UTF8', None, ), # 13
- (14, TType.I64, 'reservationStartTime', None, None, ), # 14
- (15, TType.I64, 'reservationEndTime', None, None, ), # 15
+ None, # 13
+ None, # 14
+ None, # 15
(16, TType.STRING, 'sshAccountProvisioner', 'UTF8', None, ), # 16
(17, TType.LIST, 'groupSSHAccountProvisionerConfigs', (TType.STRUCT, (GroupAccountSSHProvisionerConfig, GroupAccountSSHProvisionerConfig.thrift_spec), False), None, ), # 17
(18, TType.STRING, 'sshAccountProvisionerAdditionalInfo', 'UTF8', None, ), # 18
(19, TType.LIST, 'reservations', (TType.STRUCT, (ComputeResourceReservation, ComputeResourceReservation.thrift_spec), False), None, ), # 19
)
- def __init__(self, computeResourceId=None, groupResourceProfileId=thrift_spec[2][4], overridebyAiravata=thrift_spec[3][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None, qualityOfService=None, reservation=None, reservationStartTime=None, reservationEndTime=None, sshAccountProvisioner=None, [...]
+ def __init__(self, computeResourceId=None, groupResourceProfileId=thrift_spec[2][4], overridebyAiravata=thrift_spec[3][4], loginUserName=None, preferredJobSubmissionProtocol=None, preferredDataMovementProtocol=None, preferredBatchQueue=None, scratchLocation=None, allocationProjectNumber=None, resourceSpecificCredentialStoreToken=None, usageReportingGatewayId=None, qualityOfService=None, sshAccountProvisioner=None, groupSSHAccountProvisionerConfigs=None, sshAccountProvisionerAdditiona [...]
self.computeResourceId = computeResourceId
self.groupResourceProfileId = groupResourceProfileId
self.overridebyAiravata = overridebyAiravata
@@ -304,9 +301,6 @@ class GroupComputeResourcePreference(object):
self.resourceSpecificCredentialStoreToken = resourceSpecificCredentialStoreToken
self.usageReportingGatewayId = usageReportingGatewayId
self.qualityOfService = qualityOfService
- self.reservation = reservation
- self.reservationStartTime = reservationStartTime
- self.reservationEndTime = reservationEndTime
self.sshAccountProvisioner = sshAccountProvisioner
self.groupSSHAccountProvisionerConfigs = groupSSHAccountProvisionerConfigs
self.sshAccountProvisionerAdditionalInfo = sshAccountProvisionerAdditionalInfo
@@ -381,21 +375,6 @@ class GroupComputeResourcePreference(object):
self.qualityOfService = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
else:
iprot.skip(ftype)
- elif fid == 13:
- if ftype == TType.STRING:
- self.reservation = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
- else:
- iprot.skip(ftype)
- elif fid == 14:
- if ftype == TType.I64:
- self.reservationStartTime = iprot.readI64()
- else:
- iprot.skip(ftype)
- elif fid == 15:
- if ftype == TType.I64:
- self.reservationEndTime = iprot.readI64()
- else:
- iprot.skip(ftype)
elif fid == 16:
if ftype == TType.STRING:
self.sshAccountProvisioner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
@@ -486,18 +465,6 @@ class GroupComputeResourcePreference(object):
oprot.writeFieldBegin('qualityOfService', TType.STRING, 12)
oprot.writeString(self.qualityOfService.encode('utf-8') if sys.version_info[0] == 2 else self.qualityOfService)
oprot.writeFieldEnd()
- if self.reservation is not None:
- oprot.writeFieldBegin('reservation', TType.STRING, 13)
- oprot.writeString(self.reservation.encode('utf-8') if sys.version_info[0] == 2 else self.reservation)
- oprot.writeFieldEnd()
- if self.reservationStartTime is not None:
- oprot.writeFieldBegin('reservationStartTime', TType.I64, 14)
- oprot.writeI64(self.reservationStartTime)
- oprot.writeFieldEnd()
- if self.reservationEndTime is not None:
- oprot.writeFieldBegin('reservationEndTime', TType.I64, 15)
- oprot.writeI64(self.reservationEndTime)
- oprot.writeFieldEnd()
if self.sshAccountProvisioner is not None:
oprot.writeFieldBegin('sshAccountProvisioner', TType.STRING, 16)
oprot.writeString(self.sshAccountProvisioner.encode('utf-8') if sys.version_info[0] == 2 else self.sshAccountProvisioner)
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourceReservation.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourceReservation.java
index 5909f9c..df76be4 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourceReservation.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourceReservation.java
@@ -686,13 +686,13 @@ public class ComputeResourceReservation implements org.apache.thrift.TBase<Compu
case 3: // QUEUE_NAMES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
- struct.queueNames = new java.util.ArrayList<java.lang.String>(_list16.size);
- java.lang.String _elem17;
- for (int _i18 = 0; _i18 < _list16.size; ++_i18)
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.queueNames = new java.util.ArrayList<java.lang.String>(_list0.size);
+ java.lang.String _elem1;
+ for (int _i2 = 0; _i2 < _list0.size; ++_i2)
{
- _elem17 = iprot.readString();
- struct.queueNames.add(_elem17);
+ _elem1 = iprot.readString();
+ struct.queueNames.add(_elem1);
}
iprot.readListEnd();
}
@@ -744,9 +744,9 @@ public class ComputeResourceReservation implements org.apache.thrift.TBase<Compu
oprot.writeFieldBegin(QUEUE_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.queueNames.size()));
- for (java.lang.String _iter19 : struct.queueNames)
+ for (java.lang.String _iter3 : struct.queueNames)
{
- oprot.writeString(_iter19);
+ oprot.writeString(_iter3);
}
oprot.writeListEnd();
}
@@ -779,9 +779,9 @@ public class ComputeResourceReservation implements org.apache.thrift.TBase<Compu
oprot.writeString(struct.reservationName);
{
oprot.writeI32(struct.queueNames.size());
- for (java.lang.String _iter20 : struct.queueNames)
+ for (java.lang.String _iter4 : struct.queueNames)
{
- oprot.writeString(_iter20);
+ oprot.writeString(_iter4);
}
}
oprot.writeI64(struct.startTime);
@@ -796,13 +796,13 @@ public class ComputeResourceReservation implements org.apache.thrift.TBase<Compu
struct.reservationName = iprot.readString();
struct.setReservationNameIsSet(true);
{
- org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.queueNames = new java.util.ArrayList<java.lang.String>(_list21.size);
- java.lang.String _elem22;
- for (int _i23 = 0; _i23 < _list21.size; ++_i23)
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.queueNames = new java.util.ArrayList<java.lang.String>(_list5.size);
+ java.lang.String _elem6;
+ for (int _i7 = 0; _i7 < _list5.size; ++_i7)
{
- _elem22 = iprot.readString();
- struct.queueNames.add(_elem22);
+ _elem6 = iprot.readString();
+ struct.queueNames.add(_elem6);
}
}
struct.setQueueNamesIsSet(true);
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupComputeResourcePreference.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupComputeResourcePreference.java
index f43c58b..eb1572c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupComputeResourcePreference.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupComputeResourcePreference.java
@@ -40,9 +40,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
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)10);
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)11);
private static final org.apache.thrift.protocol.TField QUALITY_OF_SERVICE_FIELD_DESC = new org.apache.thrift.protocol.TField("qualityOfService", org.apache.thrift.protocol.TType.STRING, (short)12);
- 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)13);
- 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)14);
- 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)15);
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)16);
private static final org.apache.thrift.protocol.TField GROUP_SSHACCOUNT_PROVISIONER_CONFIGS_FIELD_DESC = new org.apache.thrift.protocol.TField("groupSSHAccountProvisionerConfigs", org.apache.thrift.protocol.TType.LIST, (short)17);
private static final org.apache.thrift.protocol.TField SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("sshAccountProvisionerAdditionalInfo", org.apache.thrift.protocol.TType.STRING, (short)18);
@@ -63,9 +60,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
private java.lang.String resourceSpecificCredentialStoreToken; // optional
private java.lang.String usageReportingGatewayId; // optional
private java.lang.String qualityOfService; // optional
- private java.lang.String reservation; // optional
- private long reservationStartTime; // optional
- private long reservationEndTime; // optional
private java.lang.String sshAccountProvisioner; // optional
private java.util.List<GroupAccountSSHProvisionerConfig> groupSSHAccountProvisionerConfigs; // optional
private java.lang.String sshAccountProvisionerAdditionalInfo; // optional
@@ -93,9 +87,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
RESOURCE_SPECIFIC_CREDENTIAL_STORE_TOKEN((short)10, "resourceSpecificCredentialStoreToken"),
USAGE_REPORTING_GATEWAY_ID((short)11, "usageReportingGatewayId"),
QUALITY_OF_SERVICE((short)12, "qualityOfService"),
- RESERVATION((short)13, "reservation"),
- RESERVATION_START_TIME((short)14, "reservationStartTime"),
- RESERVATION_END_TIME((short)15, "reservationEndTime"),
SSH_ACCOUNT_PROVISIONER((short)16, "sshAccountProvisioner"),
GROUP_SSHACCOUNT_PROVISIONER_CONFIGS((short)17, "groupSSHAccountProvisionerConfigs"),
SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO((short)18, "sshAccountProvisionerAdditionalInfo"),
@@ -138,12 +129,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
return USAGE_REPORTING_GATEWAY_ID;
case 12: // QUALITY_OF_SERVICE
return QUALITY_OF_SERVICE;
- case 13: // RESERVATION
- return RESERVATION;
- case 14: // RESERVATION_START_TIME
- return RESERVATION_START_TIME;
- case 15: // RESERVATION_END_TIME
- return RESERVATION_END_TIME;
case 16: // SSH_ACCOUNT_PROVISIONER
return SSH_ACCOUNT_PROVISIONER;
case 17: // GROUP_SSHACCOUNT_PROVISIONER_CONFIGS
@@ -193,10 +178,8 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
// isset id assignments
private static final int __OVERRIDEBYAIRAVATA_ISSET_ID = 0;
- 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,_Fields.SSH_ACCOUNT_PROVISIONER,_Fields.GROUP_SSHACCOUNT_PR [...]
+ 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.SSH_ACCOUNT_PROVISIONER,_Fields.GROUP_SSHACCOUNT_PROVISIONER_CONFIGS,_Fields.SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO,_Fields.RESERV [...]
public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -224,12 +207,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.QUALITY_OF_SERVICE, new org.apache.thrift.meta_data.FieldMetaData("qualityOfService", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.RESERVATION, new org.apache.thrift.meta_data.FieldMetaData("reservation", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- tmpMap.put(_Fields.RESERVATION_START_TIME, new org.apache.thrift.meta_data.FieldMetaData("reservationStartTime", org.apache.thrift.TFieldRequirementType.OPTIONAL,
- 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.GROUP_SSHACCOUNT_PROVISIONER_CONFIGS, new org.apache.thrift.meta_data.FieldMetaData("groupSSHAccountProvisionerConfigs", org.apache.thrift.TFieldRequirementType.OPTIONAL,
@@ -239,7 +216,7 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.RESERVATIONS, new org.apache.thrift.meta_data.FieldMetaData("reservations", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
- new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT , "ComputeResourceReservation"))));
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ComputeResourceReservation.class))));
metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GroupComputeResourcePreference.class, metaDataMap);
}
@@ -302,11 +279,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (other.isSetQualityOfService()) {
this.qualityOfService = other.qualityOfService;
}
- if (other.isSetReservation()) {
- this.reservation = other.reservation;
- }
- this.reservationStartTime = other.reservationStartTime;
- this.reservationEndTime = other.reservationEndTime;
if (other.isSetSshAccountProvisioner()) {
this.sshAccountProvisioner = other.sshAccountProvisioner;
}
@@ -323,7 +295,7 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (other.isSetReservations()) {
java.util.List<ComputeResourceReservation> __this__reservations = new java.util.ArrayList<ComputeResourceReservation>(other.reservations.size());
for (ComputeResourceReservation other_element : other.reservations) {
- __this__reservations.add(other_element);
+ __this__reservations.add(new ComputeResourceReservation(other_element));
}
this.reservations = __this__reservations;
}
@@ -349,11 +321,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
this.resourceSpecificCredentialStoreToken = null;
this.usageReportingGatewayId = null;
this.qualityOfService = null;
- this.reservation = null;
- setReservationStartTimeIsSet(false);
- this.reservationStartTime = 0;
- setReservationEndTimeIsSet(false);
- this.reservationEndTime = 0;
this.sshAccountProvisioner = null;
this.groupSSHAccountProvisionerConfigs = null;
this.sshAccountProvisionerAdditionalInfo = null;
@@ -651,73 +618,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
}
}
- public java.lang.String getReservation() {
- return this.reservation;
- }
-
- public void setReservation(java.lang.String reservation) {
- this.reservation = reservation;
- }
-
- public void unsetReservation() {
- this.reservation = null;
- }
-
- /** Returns true if field reservation is set (has been assigned a value) and false otherwise */
- public boolean isSetReservation() {
- return this.reservation != null;
- }
-
- public void setReservationIsSet(boolean value) {
- if (!value) {
- this.reservation = null;
- }
- }
-
- public long getReservationStartTime() {
- return this.reservationStartTime;
- }
-
- public void setReservationStartTime(long reservationStartTime) {
- this.reservationStartTime = reservationStartTime;
- setReservationStartTimeIsSet(true);
- }
-
- public void unsetReservationStartTime() {
- __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID);
- }
-
- /** Returns true if field reservationStartTime is set (has been assigned a value) and false otherwise */
- public boolean isSetReservationStartTime() {
- return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID);
- }
-
- public void setReservationStartTimeIsSet(boolean value) {
- __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONSTARTTIME_ISSET_ID, value);
- }
-
- public long getReservationEndTime() {
- return this.reservationEndTime;
- }
-
- public void setReservationEndTime(long reservationEndTime) {
- this.reservationEndTime = reservationEndTime;
- setReservationEndTimeIsSet(true);
- }
-
- public void unsetReservationEndTime() {
- __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID);
- }
-
- /** Returns true if field reservationEndTime is set (has been assigned a value) and false otherwise */
- public boolean isSetReservationEndTime() {
- return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID);
- }
-
- public void setReservationEndTimeIsSet(boolean value) {
- __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RESERVATIONENDTIME_ISSET_ID, value);
- }
-
public java.lang.String getSshAccountProvisioner() {
return this.sshAccountProvisioner;
}
@@ -938,30 +838,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
}
break;
- case RESERVATION:
- if (value == null) {
- unsetReservation();
- } else {
- setReservation((java.lang.String)value);
- }
- break;
-
- case RESERVATION_START_TIME:
- if (value == null) {
- unsetReservationStartTime();
- } else {
- setReservationStartTime((java.lang.Long)value);
- }
- break;
-
- case RESERVATION_END_TIME:
- if (value == null) {
- unsetReservationEndTime();
- } else {
- setReservationEndTime((java.lang.Long)value);
- }
- break;
-
case SSH_ACCOUNT_PROVISIONER:
if (value == null) {
unsetSshAccountProvisioner();
@@ -1035,15 +911,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
case QUALITY_OF_SERVICE:
return getQualityOfService();
- case RESERVATION:
- return getReservation();
-
- case RESERVATION_START_TIME:
- return getReservationStartTime();
-
- case RESERVATION_END_TIME:
- return getReservationEndTime();
-
case SSH_ACCOUNT_PROVISIONER:
return getSshAccountProvisioner();
@@ -1091,12 +958,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
return isSetUsageReportingGatewayId();
case QUALITY_OF_SERVICE:
return isSetQualityOfService();
- case RESERVATION:
- return isSetReservation();
- case RESERVATION_START_TIME:
- return isSetReservationStartTime();
- case RESERVATION_END_TIME:
- return isSetReservationEndTime();
case SSH_ACCOUNT_PROVISIONER:
return isSetSshAccountProvisioner();
case GROUP_SSHACCOUNT_PROVISIONER_CONFIGS:
@@ -1232,33 +1093,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
return false;
}
- boolean this_present_reservation = true && this.isSetReservation();
- boolean that_present_reservation = true && that.isSetReservation();
- if (this_present_reservation || that_present_reservation) {
- if (!(this_present_reservation && that_present_reservation))
- return false;
- if (!this.reservation.equals(that.reservation))
- return false;
- }
-
- boolean this_present_reservationStartTime = true && this.isSetReservationStartTime();
- boolean that_present_reservationStartTime = true && that.isSetReservationStartTime();
- if (this_present_reservationStartTime || that_present_reservationStartTime) {
- if (!(this_present_reservationStartTime && that_present_reservationStartTime))
- return false;
- if (this.reservationStartTime != that.reservationStartTime)
- return false;
- }
-
- boolean this_present_reservationEndTime = true && this.isSetReservationEndTime();
- boolean that_present_reservationEndTime = true && that.isSetReservationEndTime();
- if (this_present_reservationEndTime || that_present_reservationEndTime) {
- if (!(this_present_reservationEndTime && that_present_reservationEndTime))
- return false;
- if (this.reservationEndTime != that.reservationEndTime)
- return false;
- }
-
boolean this_present_sshAccountProvisioner = true && this.isSetSshAccountProvisioner();
boolean that_present_sshAccountProvisioner = true && that.isSetSshAccountProvisioner();
if (this_present_sshAccountProvisioner || that_present_sshAccountProvisioner) {
@@ -1348,18 +1182,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (isSetQualityOfService())
hashCode = hashCode * 8191 + qualityOfService.hashCode();
- hashCode = hashCode * 8191 + ((isSetReservation()) ? 131071 : 524287);
- if (isSetReservation())
- hashCode = hashCode * 8191 + reservation.hashCode();
-
- hashCode = hashCode * 8191 + ((isSetReservationStartTime()) ? 131071 : 524287);
- if (isSetReservationStartTime())
- hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationStartTime);
-
- hashCode = hashCode * 8191 + ((isSetReservationEndTime()) ? 131071 : 524287);
- if (isSetReservationEndTime())
- hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(reservationEndTime);
-
hashCode = hashCode * 8191 + ((isSetSshAccountProvisioner()) ? 131071 : 524287);
if (isSetSshAccountProvisioner())
hashCode = hashCode * 8191 + sshAccountProvisioner.hashCode();
@@ -1507,36 +1329,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
return lastComparison;
}
}
- lastComparison = java.lang.Boolean.valueOf(isSetReservation()).compareTo(other.isSetReservation());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetReservation()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reservation, other.reservation);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = java.lang.Boolean.valueOf(isSetReservationStartTime()).compareTo(other.isSetReservationStartTime());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetReservationStartTime()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reservationStartTime, other.reservationStartTime);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
- lastComparison = java.lang.Boolean.valueOf(isSetReservationEndTime()).compareTo(other.isSetReservationEndTime());
- if (lastComparison != 0) {
- return lastComparison;
- }
- if (isSetReservationEndTime()) {
- lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reservationEndTime, other.reservationEndTime);
- if (lastComparison != 0) {
- return lastComparison;
- }
- }
lastComparison = java.lang.Boolean.valueOf(isSetSshAccountProvisioner()).compareTo(other.isSetSshAccountProvisioner());
if (lastComparison != 0) {
return lastComparison;
@@ -1706,28 +1498,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
}
first = false;
}
- if (isSetReservation()) {
- if (!first) sb.append(", ");
- sb.append("reservation:");
- if (this.reservation == null) {
- sb.append("null");
- } else {
- sb.append(this.reservation);
- }
- first = false;
- }
- if (isSetReservationStartTime()) {
- if (!first) sb.append(", ");
- sb.append("reservationStartTime:");
- sb.append(this.reservationStartTime);
- first = false;
- }
- if (isSetReservationEndTime()) {
- if (!first) sb.append(", ");
- sb.append("reservationEndTime:");
- sb.append(this.reservationEndTime);
- first = false;
- }
if (isSetSshAccountProvisioner()) {
if (!first) sb.append(", ");
sb.append("sshAccountProvisioner:");
@@ -1921,30 +1691,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 13: // RESERVATION
- if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
- struct.reservation = iprot.readString();
- struct.setReservationIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 14: // RESERVATION_START_TIME
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.reservationStartTime = iprot.readI64();
- struct.setReservationStartTimeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
- case 15: // RESERVATION_END_TIME
- if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
- struct.reservationEndTime = iprot.readI64();
- struct.setReservationEndTimeIsSet(true);
- } else {
- org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
- }
- break;
case 16: // SSH_ACCOUNT_PROVISIONER
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.sshAccountProvisioner = iprot.readString();
@@ -1956,14 +1702,14 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
case 17: // GROUP_SSHACCOUNT_PROVISIONER_CONFIGS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.groupSSHAccountProvisionerConfigs = new java.util.ArrayList<GroupAccountSSHProvisionerConfig>(_list0.size);
- GroupAccountSSHProvisionerConfig _elem1;
- for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+ org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+ struct.groupSSHAccountProvisionerConfigs = new java.util.ArrayList<GroupAccountSSHProvisionerConfig>(_list8.size);
+ GroupAccountSSHProvisionerConfig _elem9;
+ for (int _i10 = 0; _i10 < _list8.size; ++_i10)
{
- _elem1 = new GroupAccountSSHProvisionerConfig();
- _elem1.read(iprot);
- struct.groupSSHAccountProvisionerConfigs.add(_elem1);
+ _elem9 = new GroupAccountSSHProvisionerConfig();
+ _elem9.read(iprot);
+ struct.groupSSHAccountProvisionerConfigs.add(_elem9);
}
iprot.readListEnd();
}
@@ -1983,14 +1729,14 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
case 19: // RESERVATIONS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
- struct.reservations = new java.util.ArrayList<ComputeResourceReservation>(_list3.size);
- ComputeResourceReservation _elem4;
- for (int _i5 = 0; _i5 < _list3.size; ++_i5)
+ org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
+ struct.reservations = new java.util.ArrayList<ComputeResourceReservation>(_list11.size);
+ ComputeResourceReservation _elem12;
+ for (int _i13 = 0; _i13 < _list11.size; ++_i13)
{
- _elem4 = new ComputeResourceReservation();
- _elem4.read(iprot);
- struct.reservations.add(_elem4);
+ _elem12 = new ComputeResourceReservation();
+ _elem12.read(iprot);
+ struct.reservations.add(_elem12);
}
iprot.readListEnd();
}
@@ -2088,23 +1834,6 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
oprot.writeFieldEnd();
}
}
- if (struct.reservation != null) {
- if (struct.isSetReservation()) {
- oprot.writeFieldBegin(RESERVATION_FIELD_DESC);
- oprot.writeString(struct.reservation);
- oprot.writeFieldEnd();
- }
- }
- if (struct.isSetReservationStartTime()) {
- oprot.writeFieldBegin(RESERVATION_START_TIME_FIELD_DESC);
- oprot.writeI64(struct.reservationStartTime);
- oprot.writeFieldEnd();
- }
- if (struct.isSetReservationEndTime()) {
- oprot.writeFieldBegin(RESERVATION_END_TIME_FIELD_DESC);
- oprot.writeI64(struct.reservationEndTime);
- oprot.writeFieldEnd();
- }
if (struct.sshAccountProvisioner != null) {
if (struct.isSetSshAccountProvisioner()) {
oprot.writeFieldBegin(SSH_ACCOUNT_PROVISIONER_FIELD_DESC);
@@ -2117,9 +1846,9 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
oprot.writeFieldBegin(GROUP_SSHACCOUNT_PROVISIONER_CONFIGS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.groupSSHAccountProvisionerConfigs.size()));
- for (GroupAccountSSHProvisionerConfig _iter6 : struct.groupSSHAccountProvisionerConfigs)
+ for (GroupAccountSSHProvisionerConfig _iter14 : struct.groupSSHAccountProvisionerConfigs)
{
- _iter6.write(oprot);
+ _iter14.write(oprot);
}
oprot.writeListEnd();
}
@@ -2138,9 +1867,9 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
oprot.writeFieldBegin(RESERVATIONS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.reservations.size()));
- for (ComputeResourceReservation _iter7 : struct.reservations)
+ for (ComputeResourceReservation _iter15 : struct.reservations)
{
- _iter7.write(oprot);
+ _iter15.write(oprot);
}
oprot.writeListEnd();
}
@@ -2195,28 +1924,19 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (struct.isSetQualityOfService()) {
optionals.set(8);
}
- if (struct.isSetReservation()) {
- optionals.set(9);
- }
- if (struct.isSetReservationStartTime()) {
- optionals.set(10);
- }
- if (struct.isSetReservationEndTime()) {
- optionals.set(11);
- }
if (struct.isSetSshAccountProvisioner()) {
- optionals.set(12);
+ optionals.set(9);
}
if (struct.isSetGroupSSHAccountProvisionerConfigs()) {
- optionals.set(13);
+ optionals.set(10);
}
if (struct.isSetSshAccountProvisionerAdditionalInfo()) {
- optionals.set(14);
+ optionals.set(11);
}
if (struct.isSetReservations()) {
- optionals.set(15);
+ optionals.set(12);
}
- oprot.writeBitSet(optionals, 16);
+ oprot.writeBitSet(optionals, 13);
if (struct.isSetLoginUserName()) {
oprot.writeString(struct.loginUserName);
}
@@ -2244,24 +1964,15 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (struct.isSetQualityOfService()) {
oprot.writeString(struct.qualityOfService);
}
- if (struct.isSetReservation()) {
- oprot.writeString(struct.reservation);
- }
- if (struct.isSetReservationStartTime()) {
- oprot.writeI64(struct.reservationStartTime);
- }
- if (struct.isSetReservationEndTime()) {
- oprot.writeI64(struct.reservationEndTime);
- }
if (struct.isSetSshAccountProvisioner()) {
oprot.writeString(struct.sshAccountProvisioner);
}
if (struct.isSetGroupSSHAccountProvisionerConfigs()) {
{
oprot.writeI32(struct.groupSSHAccountProvisionerConfigs.size());
- for (GroupAccountSSHProvisionerConfig _iter8 : struct.groupSSHAccountProvisionerConfigs)
+ for (GroupAccountSSHProvisionerConfig _iter16 : struct.groupSSHAccountProvisionerConfigs)
{
- _iter8.write(oprot);
+ _iter16.write(oprot);
}
}
}
@@ -2271,9 +1982,9 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
if (struct.isSetReservations()) {
{
oprot.writeI32(struct.reservations.size());
- for (ComputeResourceReservation _iter9 : struct.reservations)
+ for (ComputeResourceReservation _iter17 : struct.reservations)
{
- _iter9.write(oprot);
+ _iter17.write(oprot);
}
}
}
@@ -2288,7 +1999,7 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
struct.setGroupResourceProfileIdIsSet(true);
struct.overridebyAiravata = iprot.readBool();
struct.setOverridebyAiravataIsSet(true);
- java.util.BitSet incoming = iprot.readBitSet(16);
+ java.util.BitSet incoming = iprot.readBitSet(13);
if (incoming.get(0)) {
struct.loginUserName = iprot.readString();
struct.setLoginUserNameIsSet(true);
@@ -2326,49 +2037,37 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
struct.setQualityOfServiceIsSet(true);
}
if (incoming.get(9)) {
- struct.reservation = iprot.readString();
- struct.setReservationIsSet(true);
- }
- if (incoming.get(10)) {
- struct.reservationStartTime = iprot.readI64();
- struct.setReservationStartTimeIsSet(true);
- }
- if (incoming.get(11)) {
- struct.reservationEndTime = iprot.readI64();
- struct.setReservationEndTimeIsSet(true);
- }
- if (incoming.get(12)) {
struct.sshAccountProvisioner = iprot.readString();
struct.setSshAccountProvisionerIsSet(true);
}
- if (incoming.get(13)) {
+ if (incoming.get(10)) {
{
- org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.groupSSHAccountProvisionerConfigs = new java.util.ArrayList<GroupAccountSSHProvisionerConfig>(_list10.size);
- GroupAccountSSHProvisionerConfig _elem11;
- for (int _i12 = 0; _i12 < _list10.size; ++_i12)
+ org.apache.thrift.protocol.TList _list18 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.groupSSHAccountProvisionerConfigs = new java.util.ArrayList<GroupAccountSSHProvisionerConfig>(_list18.size);
+ GroupAccountSSHProvisionerConfig _elem19;
+ for (int _i20 = 0; _i20 < _list18.size; ++_i20)
{
- _elem11 = new GroupAccountSSHProvisionerConfig();
- _elem11.read(iprot);
- struct.groupSSHAccountProvisionerConfigs.add(_elem11);
+ _elem19 = new GroupAccountSSHProvisionerConfig();
+ _elem19.read(iprot);
+ struct.groupSSHAccountProvisionerConfigs.add(_elem19);
}
}
struct.setGroupSSHAccountProvisionerConfigsIsSet(true);
}
- if (incoming.get(14)) {
+ if (incoming.get(11)) {
struct.sshAccountProvisionerAdditionalInfo = iprot.readString();
struct.setSshAccountProvisionerAdditionalInfoIsSet(true);
}
- if (incoming.get(15)) {
+ if (incoming.get(12)) {
{
- org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.reservations = new java.util.ArrayList<ComputeResourceReservation>(_list13.size);
- ComputeResourceReservation _elem14;
- for (int _i15 = 0; _i15 < _list13.size; ++_i15)
+ org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.reservations = new java.util.ArrayList<ComputeResourceReservation>(_list21.size);
+ ComputeResourceReservation _elem22;
+ for (int _i23 = 0; _i23 < _list21.size; ++_i23)
{
- _elem14 = new ComputeResourceReservation();
- _elem14.read(iprot);
- struct.reservations.add(_elem14);
+ _elem22 = new ComputeResourceReservation();
+ _elem22.read(iprot);
+ struct.reservations.add(_elem22);
}
}
struct.setReservationsIsSet(true);
diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/group_resource_profile_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/group_resource_profile_model.thrift
index 868db38..063f7c6 100644
--- a/thrift-interface-descriptions/data-models/resource-catalog-models/group_resource_profile_model.thrift
+++ b/thrift-interface-descriptions/data-models/resource-catalog-models/group_resource_profile_model.thrift
@@ -55,9 +55,6 @@ struct GroupComputeResourcePreference {
10: optional string resourceSpecificCredentialStoreToken,
11: optional string usageReportingGatewayId,
12: optional string qualityOfService,
- 13: optional string reservation,
- 14: optional i64 reservationStartTime,
- 15: optional i64 reservationEndTime,
16: optional string sshAccountProvisioner,
17: optional list<GroupAccountSSHProvisionerConfig> groupSSHAccountProvisionerConfigs,
18: optional string sshAccountProvisionerAdditionalInfo,
[airavata] 02/02: AIRAVATA-3327 Remove columns and usage of
deprecated reservation columns
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit e10b84c8ee75fc46463d0ca2fd83dae88372957a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon May 11 10:14:39 2020 -0400
AIRAVATA-3327 Remove columns and usage of deprecated reservation columns
---
.../airavata/helix/impl/task/TaskContext.java | 5 ----
.../database_scripts/appcatalog-mysql.sql | 3 --
.../init/03-appcatalog-migrations.sql | 5 ++++
.../appcatalog/GroupComputeResourcePrefEntity.java | 33 ----------------------
.../src/main/resources/appcatalog-derby.sql | 3 --
.../next/DeltaScripts/appCatalog_schema_delta.sql | 5 ++++
6 files changed, 10 insertions(+), 44 deletions(-)
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
index e57fa1e..7e32c00 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
@@ -647,11 +647,6 @@ public class TaskContext {
reservation = userComputeResourcePreference.getReservation();
start = userComputeResourcePreference.getReservationStartTime();
end = userComputeResourcePreference.getReservationEndTime();
- } else {
- // TODO: remove this once we've migrated to groupComputeResourcePreference.getReservations()
- reservation = groupComputeResourcePreference.getReservation();
- start = groupComputeResourcePreference.getReservationStartTime();
- end = groupComputeResourcePreference.getReservationEndTime();
}
if (reservation != null && start > 0 && start < end) {
long now = Calendar.getInstance().getTimeInMillis();
diff --git a/modules/ide-integration/src/main/resources/database_scripts/appcatalog-mysql.sql b/modules/ide-integration/src/main/resources/database_scripts/appcatalog-mysql.sql
index 6c0359c..c6dfbc5 100644
--- a/modules/ide-integration/src/main/resources/database_scripts/appcatalog-mysql.sql
+++ b/modules/ide-integration/src/main/resources/database_scripts/appcatalog-mysql.sql
@@ -600,9 +600,6 @@ CREATE TABLE GROUP_COMPUTE_RESOURCE_PREFERENCE
RESOURCE_CS_TOKEN VARCHAR(255),
USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
QUALITY_OF_SERVICE VARCHAR(255),
- RESERVATION VARCHAR (255),
- RESERVATION_START_TIME timestamp,
- RESERVATION_END_TIME timestamp,
SSH_ACCOUNT_PROVISIONER VARCHAR(255),
SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000),
PRIMARY KEY(RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID),
diff --git a/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql b/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
index f6978cb..e4ea6b0 100644
--- a/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
+++ b/modules/ide-integration/src/main/resources/database_scripts/init/03-appcatalog-migrations.sql
@@ -10,3 +10,8 @@ CREATE TABLE IF NOT EXISTS COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID VA
)ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE INDEX I_CMPTN_Q_RESERVATION_ID ON COMPUTE_RESOURCE_RESERVATION_QUEUE (RESERVATION_ID);
ALTER TABLE COMPUTE_RESOURCE_RESERVATION ADD CONSTRAINT FK_COMPUTE_RESOURCE_RESERVATION FOREIGN KEY (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) REFERENCES GROUP_COMPUTE_RESOURCE_PREFERENCE (RESOURCE_ID, GROUP_RESOURCE_PROFILE_ID) ON DELETE CASCADE;
+
+-- AIRAVATA-3327: Remove deprecated reservation fields
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION;
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION_START_TIME;
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column RESERVATION_END_TIME;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
index 22e0673..97383e8 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/GroupComputeResourcePrefEntity.java
@@ -82,15 +82,6 @@ public class GroupComputeResourcePrefEntity implements Serializable {
@Column(name = "QUALITY_OF_SERVICE")
private String qualityOfService;
- @Column(name = "RESERVATION")
- private String reservation;
-
- @Column(name = "RESERVATION_END_TIME")
- private Timestamp reservationEndTime;
-
- @Column(name = "RESERVATION_START_TIME")
- private Timestamp reservationStartTime;
-
@Column(name = "RESOURCE_CS_TOKEN")
private String resourceSpecificCredentialStoreToken;
@@ -193,30 +184,6 @@ public class GroupComputeResourcePrefEntity implements Serializable {
this.qualityOfService = qualityOfService;
}
- public String getReservation() {
- return reservation;
- }
-
- public void setReservation(String reservation) {
- this.reservation = reservation;
- }
-
- public Timestamp getReservationEndTime() {
- return reservationEndTime;
- }
-
- public void setReservationEndTime(Timestamp reservationEndTime) {
- this.reservationEndTime = reservationEndTime;
- }
-
- public Timestamp getReservationStartTime() {
- return reservationStartTime;
- }
-
- public void setReservationStartTime(Timestamp reservationStartTime) {
- this.reservationStartTime = reservationStartTime;
- }
-
public String getResourceSpecificCredentialStoreToken() {
return resourceSpecificCredentialStoreToken;
}
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 afe5fed..ab1bcab 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -609,9 +609,6 @@ CREATE TABLE GROUP_COMPUTE_RESOURCE_PREFERENCE
RESOURCE_CS_TOKEN VARCHAR(255),
USAGE_REPORTING_GATEWAY_ID VARCHAR(255),
QUALITY_OF_SERVICE VARCHAR(255),
- RESERVATION VARCHAR (255),
- RESERVATION_START_TIME timestamp,
- RESERVATION_END_TIME timestamp,
SSH_ACCOUNT_PROVISIONER VARCHAR(255),
SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO VARCHAR(1000),
PRIMARY KEY(RESOURCE_ID,GROUP_RESOURCE_PROFILE_ID),
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index 839c2e1..8092f44 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -19,3 +19,8 @@
--
use app_catalog;
+
+-- AIRAVATA-3327: Remove deprecated reservation fields
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
+alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;