airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2727 default groupResourceProfileId in child models too
Date Fri, 04 May 2018 20:28:50 GMT
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 <machristie@apache.org>
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<BatchQu
   public BatchQueueResourcePolicy() {
     this.resourcePolicyId = "DO_NOT_SET_AT_CLIENTS";
 
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
   }
 
   public BatchQueueResourcePolicy(
@@ -197,7 +199,8 @@ public class BatchQueueResourcePolicy implements org.apache.thrift.TBase<BatchQu
     this.resourcePolicyId = "DO_NOT_SET_AT_CLIENTS";
 
     this.computeResourceId = null;
-    this.groupResourceProfileId = null;
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
     this.queuename = null;
     setMaxAllowedNodesIsSet(false);
     this.maxAllowedNodes = 0;
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourcePolicy.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourcePolicy.java
index 97e3b17..4f7f4bd 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourcePolicy.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/ComputeResourcePolicy.java
@@ -129,6 +129,8 @@ public class ComputeResourcePolicy implements org.apache.thrift.TBase<ComputeRes
   public ComputeResourcePolicy() {
     this.resourcePolicyId = "DO_NOT_SET_AT_CLIENTS";
 
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
   }
 
   public ComputeResourcePolicy(
@@ -170,7 +172,8 @@ public class ComputeResourcePolicy implements org.apache.thrift.TBase<ComputeRes
     this.resourcePolicyId = "DO_NOT_SET_AT_CLIENTS";
 
     this.computeResourceId = null;
-    this.groupResourceProfileId = null;
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
     this.allowedBatchQueues = null;
   }
 
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupAccountSSHProvisionerConfig.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupAccountSSHProvisionerConfig.java
index bea4e83..98c3329 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupAccountSSHProvisionerConfig.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/groupresourceprofile/GroupAccountSSHProvisionerConfig.java
@@ -126,6 +126,8 @@ public class GroupAccountSSHProvisionerConfig implements org.apache.thrift.TBase
   }
 
   public GroupAccountSSHProvisionerConfig() {
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
   }
 
   public GroupAccountSSHProvisionerConfig(
@@ -164,7 +166,8 @@ public class GroupAccountSSHProvisionerConfig implements org.apache.thrift.TBase
   @Override
   public void clear() {
     this.resourceId = null;
-    this.groupResourceProfileId = null;
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
     this.configName = null;
     this.configValue = null;
   }
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 53bb938..32c0c42 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
@@ -237,6 +237,8 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
   }
 
   public GroupComputeResourcePreference() {
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
     this.overridebyAiravata = true;
 
   }
@@ -319,7 +321,8 @@ public class GroupComputeResourcePreference implements org.apache.thrift.TBase<G
   @Override
   public void clear() {
     this.computeResourceId = null;
-    this.groupResourceProfileId = null;
+    this.groupResourceProfileId = "DO_NOT_SET_AT_CLIENTS";
+
     this.overridebyAiravata = true;
 
     this.loginUserName = null;
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 e3d04c2..5106ebc 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
@@ -29,14 +29,14 @@ include "data_movement_models.thrift"
 
 struct GroupAccountSSHProvisionerConfig {
     1: required string resourceId,
-    2: required string groupResourceProfileId,
+    2: required string groupResourceProfileId = airavata_commons.DEFAULT_ID,
     3: required string configName,
     4: optional string configValue
 }
 
 struct GroupComputeResourcePreference {
     1: required string computeResourceId,
-    2: required string groupResourceProfileId,
+    2: required string groupResourceProfileId = airavata_commons.DEFAULT_ID,
     3: required bool overridebyAiravata = 1,
     4: optional string loginUserName,
     5: optional compute_resource_model.JobSubmissionProtocol preferredJobSubmissionProtocol,
@@ -58,14 +58,14 @@ struct GroupComputeResourcePreference {
 struct ComputeResourcePolicy {
     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 list<string> 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.

Mime
View raw message