From commits-return-19241-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Fri May 4 22:28:52 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D8FF1180634 for ; Fri, 4 May 2018 22:28:51 +0200 (CEST) Received: (qmail 15273 invoked by uid 500); 4 May 2018 20:28:51 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 15261 invoked by uid 99); 4 May 2018 20:28:51 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2018 20:28:51 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6690C80779; Fri, 4 May 2018 20:28:50 +0000 (UTC) Date: Fri, 04 May 2018 20:28:50 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch group-based-auth updated: AIRAVATA-2727 default groupResourceProfileId in child models too MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152546573035.13401.4173821169116538269@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/group-based-auth X-Git-Reftype: branch X-Git-Oldrev: f0a6e8422add33825976601d49c6ceffcc71ad27 X-Git-Newrev: eaf8d1c7a89f87f4ccdde8fc6e1f713bb702afdb X-Git-Rev: eaf8d1c7a89f87f4ccdde8fc6e1f713bb702afdb X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/group-based-auth by this push: new eaf8d1c AIRAVATA-2727 default groupResourceProfileId in child models too eaf8d1c is described below commit eaf8d1c7a89f87f4ccdde8fc6e1f713bb702afdb Author: Marcus Christie AuthorDate: Fri May 4 16:28:02 2018 -0400 AIRAVATA-2727 default groupResourceProfileId in child models too --- .../model/appcatalog/groupresourceprofile/ttypes.py | 16 ++++++++-------- .../groupresourceprofile/BatchQueueResourcePolicy.java | 5 ++++- .../groupresourceprofile/ComputeResourcePolicy.java | 5 ++++- .../GroupAccountSSHProvisionerConfig.java | 5 ++++- .../GroupComputeResourcePreference.java | 5 ++++- .../group_resource_profile_model.thrift | 8 ++++---- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/appcatalog/groupresourceprofile/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/appcatalog/groupresourceprofile/ttypes.py index d2a9d71..f757db1 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/appcatalog/groupresourceprofile/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/appcatalog/groupresourceprofile/ttypes.py @@ -28,12 +28,12 @@ class GroupAccountSSHProvisionerConfig(object): thrift_spec = ( None, # 0 (1, TType.STRING, 'resourceId', 'UTF8', None, ), # 1 - (2, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 2 + (2, TType.STRING, 'groupResourceProfileId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 2 (3, TType.STRING, 'configName', 'UTF8', None, ), # 3 (4, TType.STRING, 'configValue', 'UTF8', None, ), # 4 ) - def __init__(self, resourceId=None, groupResourceProfileId=None, configName=None, configValue=None,): + def __init__(self, resourceId=None, groupResourceProfileId=thrift_spec[2][4], configName=None, configValue=None,): self.resourceId = resourceId self.groupResourceProfileId = groupResourceProfileId self.configName = configName @@ -144,7 +144,7 @@ class GroupComputeResourcePreference(object): thrift_spec = ( None, # 0 (1, TType.STRING, 'computeResourceId', 'UTF8', None, ), # 1 - (2, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 2 + (2, TType.STRING, 'groupResourceProfileId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 2 (3, TType.BOOL, 'overridebyAiravata', None, True, ), # 3 (4, TType.STRING, 'loginUserName', 'UTF8', None, ), # 4 (5, TType.I32, 'preferredJobSubmissionProtocol', None, None, ), # 5 @@ -163,7 +163,7 @@ class GroupComputeResourcePreference(object): (18, TType.STRING, 'sshAccountProvisionerAdditionalInfo', 'UTF8', None, ), # 18 ) - def __init__(self, computeResourceId=None, groupResourceProfileId=None, 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, groupSSHAccou [...] + 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, [...] self.computeResourceId = computeResourceId self.groupResourceProfileId = groupResourceProfileId self.overridebyAiravata = overridebyAiravata @@ -410,11 +410,11 @@ class ComputeResourcePolicy(object): None, # 0 (1, TType.STRING, 'resourcePolicyId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1 (2, TType.STRING, 'computeResourceId', 'UTF8', None, ), # 2 - (3, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 3 + (3, TType.STRING, 'groupResourceProfileId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 3 (4, TType.LIST, 'allowedBatchQueues', (TType.STRING, 'UTF8', False), None, ), # 4 ) - def __init__(self, resourcePolicyId=thrift_spec[1][4], computeResourceId=None, groupResourceProfileId=None, allowedBatchQueues=None,): + def __init__(self, resourcePolicyId=thrift_spec[1][4], computeResourceId=None, groupResourceProfileId=thrift_spec[3][4], allowedBatchQueues=None,): self.resourcePolicyId = resourcePolicyId self.computeResourceId = computeResourceId self.groupResourceProfileId = groupResourceProfileId @@ -523,14 +523,14 @@ class BatchQueueResourcePolicy(object): None, # 0 (1, TType.STRING, 'resourcePolicyId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 1 (2, TType.STRING, 'computeResourceId', 'UTF8', None, ), # 2 - (3, TType.STRING, 'groupResourceProfileId', 'UTF8', None, ), # 3 + (3, TType.STRING, 'groupResourceProfileId', 'UTF8', "DO_NOT_SET_AT_CLIENTS", ), # 3 (4, TType.STRING, 'queuename', 'UTF8', None, ), # 4 (5, TType.I32, 'maxAllowedNodes', None, None, ), # 5 (6, TType.I32, 'maxAllowedCores', None, None, ), # 6 (7, TType.I32, 'maxAllowedWalltime', None, None, ), # 7 ) - def __init__(self, resourcePolicyId=thrift_spec[1][4], computeResourceId=None, groupResourceProfileId=None, queuename=None, maxAllowedNodes=None, maxAllowedCores=None, maxAllowedWalltime=None,): + def __init__(self, resourcePolicyId=thrift_spec[1][4], computeResourceId=None, groupResourceProfileId=thrift_spec[3][4], queuename=None, maxAllowedNodes=None, maxAllowedCores=None, maxAllowedWalltime=None,): self.resourcePolicyId = resourcePolicyId self.computeResourceId = computeResourceId self.groupResourceProfileId = groupResourceProfileId diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/BatchQueueResourcePolicy.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/BatchQueueResourcePolicy.java index 157b543..6af52b6 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/BatchQueueResourcePolicy.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/BatchQueueResourcePolicy.java @@ -153,6 +153,8 @@ public class BatchQueueResourcePolicy implements org.apache.thrift.TBase allowedBatchQueues } struct BatchQueueResourcePolicy { 1: required string resourcePolicyId = airavata_commons.DEFAULT_ID, 2: required string computeResourceId, - 3: required string groupResourceProfileId, + 3: required string groupResourceProfileId = airavata_commons.DEFAULT_ID, 4: optional string queuename, 5: optional i32 maxAllowedNodes, 6: optional i32 maxAllowedCores, -- To stop receiving notification emails like this one, please contact machristie@apache.org.