Skip to content

Commit a6d9d70

Browse files
committed
deal with globbing in marvin test data
1 parent 64a2edc commit a6d9d70

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

plugins/acl/dynamic-role-based/src/main/java/org/apache/cloudstack/acl/DynamicRoleBasedAPIAccessChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public class DynamicRoleBasedAPIAccessChecker extends AdapterBase implements API
4747
private RoleService roleService;
4848

4949
private List<PluggableService> services;
50-
private Map<RoleType, Set<String>> annotationRoleBasedApisMap = new HashMap<RoleType, Set<String>>();
50+
private Map<RoleType, Set<String>> annotationRoleBasedApisMap = new HashMap<>();
5151

5252
private static final Logger LOGGER = Logger.getLogger(DynamicRoleBasedAPIAccessChecker.class.getName());
5353

5454
protected DynamicRoleBasedAPIAccessChecker() {
5555
super();
5656
for (RoleType roleType : RoleType.values()) {
57-
annotationRoleBasedApisMap.put(roleType, new HashSet<String>());
57+
annotationRoleBasedApisMap.put(roleType, new HashSet<>());
5858
}
5959
}
6060

test/integration/smoke/test_dynamicroles.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def __init__(self):
7373
"listApis": "allow",
7474
"listAccounts": "allow",
7575
"listClusters": "deny",
76+
"*VMwareDC*": "allow",
7677
"*VM*": "allow",
7778
"*Host*": "deny"
7879
}

0 commit comments

Comments
 (0)