Github user bhaisaab commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1489#discussion_r59773313
--- Diff: api/src/org/apache/cloudstack/acl/RoleType.java ---
@@ -16,18 +16,90 @@
// under the License.
package org.apache.cloudstack.acl;
+import com.cloud.user.Account;
+import com.google.common.base.Enums;
+import com.google.common.base.Strings;
+
// Enum for default roles in CloudStack
public enum RoleType {
- Admin(1), ResourceAdmin(2), DomainAdmin(4), User(8), Unknown(0);
+ Admin(1L, Account.ACCOUNT_TYPE_ADMIN, 1),
+ ResourceAdmin(2L, Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN, 2),
+ DomainAdmin(3L, Account.ACCOUNT_TYPE_DOMAIN_ADMIN, 4),
+ User(4L, Account.ACCOUNT_TYPE_NORMAL, 8),
+ Unknown(-1L, (short) -1, 0);
+ private long id;
+ private short accountType;
private int mask;
- private RoleType(int mask) {
+ RoleType(final long id, final short accountType, final int mask) {
+ this.id = id;
+ this.accountType = accountType;
this.mask = mask;
}
- public int getValue() {
+ public long getId() {
+ return id;
+ }
+
+ public short getAccountType() {
+ return accountType;
+ }
+
+ public int getMask() {
return mask;
}
-}
+ public static RoleType fromString(final String name) {
+ if (!Strings.isNullOrEmpty(name)
+ && Enums.getIfPresent(RoleType.class, name).isPresent()) {
+ return RoleType.valueOf(name);
+ }
+ return null;
+ }
+
+ public static RoleType fromMask(int mask) {
+ for (RoleType roleType : RoleType.values()) {
+ if (roleType.getMask() == mask) {
+ return roleType;
+ }
+ }
+ return Unknown;
+ }
+
+ public static RoleType getByAccountType(final short accountType) {
+ RoleType roleType = RoleType.Unknown;
+ switch (accountType) {
+ case Account.ACCOUNT_TYPE_ADMIN:
+ roleType = RoleType.Admin;
+ break;
+ case Account.ACCOUNT_TYPE_DOMAIN_ADMIN:
+ roleType = RoleType.DomainAdmin;
+ break;
+ case Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN:
+ roleType = RoleType.ResourceAdmin;
+ break;
+ case Account.ACCOUNT_TYPE_NORMAL:
+ roleType = RoleType.User;
+ break;
+ }
+ return roleType;
+ }
+
+ public static Long getRoleByAccountType(final Long roleId, final Short
accountType) {
--- End diff --
This is for doing backward compatiblity in create APIs when roleId passed
is null, but an account type is passed. This does the translation using above
method.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
