You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2014/03/19 19:45:41 UTC
[3/3] git commit: updated refs/heads/4.4 to 0cc6b30
IAMEntityType change in the test after merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0cc6b303
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0cc6b303
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0cc6b303
Branch: refs/heads/4.4
Commit: 0cc6b303e099d8a3fe3e143e4e5f71a3e4ca29fb
Parents: b3e2219
Author: Prachi Damle <pr...@cloud.com>
Authored: Wed Mar 19 10:59:45 2014 -0700
Committer: Prachi Damle <pr...@cloud.com>
Committed: Wed Mar 19 11:31:23 2014 -0700
----------------------------------------------------------------------
.../test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cc6b303/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java
----------------------------------------------------------------------
diff --git a/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java b/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java
index 1f09720..84e1e56 100644
--- a/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java
+++ b/services/iam/plugin/test/org/apache/cloudstack/iam/test/IAMApiServiceTest.java
@@ -295,7 +295,7 @@ public class IAMApiServiceTest {
_iamSrv.addIAMPermissionToIAMPolicy(policyId, VirtualMachine.class.getSimpleName(),
PermissionScope.RESOURCE.toString(), resId, "listVirtualMachines",
AccessType.UseEntry.toString(), Permission.Allow, false)).thenReturn(policy);
- _aclSrv.addIAMPermissionToIAMPolicy(policyId, IAMEntityType.VirtualMachine.toString(),
+ _aclSrv.addIAMPermissionToIAMPolicy(policyId, VirtualMachine.class.getSimpleName(),
PermissionScope.RESOURCE, resId, "listVirtualMachines", Permission.Allow, false, false);
Pair<List<IAMPolicy>, Integer> policyList = new Pair<List<IAMPolicy>, Integer>(policies, 1);
List<IAMPolicyPermission> policyPerms = new ArrayList<IAMPolicyPermission>();