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 2018/11/19 20:44:07 UTC
[airavata] 02/02: AIRAVATA-2725 Documenting that a group admin must
also be member
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 10c3cfc9f0080708e997f011752aa57e895ab3c5
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 19 15:43:20 2018 -0500
AIRAVATA-2725 Documenting that a group admin must also be member
---
.../src/main/resources/lib/airavata/model/group/ttypes.py | 2 +-
.../main/java/org/apache/airavata/model/group/GroupModel.java | 9 +++++++++
.../user-tenant-group-models/group_manager_model.thrift | 3 +++
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/group/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/group/ttypes.py
index deccc9d..3be6af0 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/group/ttypes.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/model/group/ttypes.py
@@ -70,7 +70,7 @@ class GroupModel(object):
- ownerId
- description
- members
- - admins
+ - admins: Note: each admin must also be a member of the group.
"""
thrift_spec = (
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
index 28fcd33..357fe89 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/group/GroupModel.java
@@ -52,6 +52,9 @@ public class GroupModel implements org.apache.thrift.TBase<GroupModel, GroupMode
OWNER_ID((short)3, "ownerId"),
DESCRIPTION((short)4, "description"),
MEMBERS((short)5, "members"),
+ /**
+ * Note: each admin must also be a member of the group.
+ */
ADMINS((short)6, "admins");
private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -329,10 +332,16 @@ public class GroupModel implements org.apache.thrift.TBase<GroupModel, GroupMode
this.admins.add(elem);
}
+ /**
+ * Note: each admin must also be a member of the group.
+ */
public java.util.List<java.lang.String> getAdmins() {
return this.admins;
}
+ /**
+ * Note: each admin must also be a member of the group.
+ */
public void setAdmins(java.util.List<java.lang.String> admins) {
this.admins = admins;
}
diff --git a/thrift-interface-descriptions/data-models/user-tenant-group-models/group_manager_model.thrift b/thrift-interface-descriptions/data-models/user-tenant-group-models/group_manager_model.thrift
index 98b3cc1..19a719b 100644
--- a/thrift-interface-descriptions/data-models/user-tenant-group-models/group_manager_model.thrift
+++ b/thrift-interface-descriptions/data-models/user-tenant-group-models/group_manager_model.thrift
@@ -48,5 +48,8 @@ struct GroupModel{
3: optional string ownerId,
4: optional string description,
5: optional list<string> members,
+ /**
+ * Note: each admin must also be a member of the group.
+ */
6: optional list<string> admins,
}
\ No newline at end of file