AMBARI-6854. Add resource name to privileges API. (mahadev)

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java

@@ -46,6 +46,7 @@ import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.internal.AbstractControllerResourceProvider;
 import org.apache.ambari.server.controller.internal.AlertDefinitionResourceProvider;
+import org.apache.ambari.server.controller.internal.AmbariPrivilegeResourceProvider;
 import org.apache.ambari.server.controller.internal.BlueprintResourceProvider;
 import org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider;
 import org.apache.ambari.server.controller.internal.ClusterResourceProvider;
@@ -538,6 +539,7 @@ public class AmbariServer {
         injector.getInstance(GroupDAO.class), injector.getInstance(PrincipalDAO.class),
         injector.getInstance(PermissionDAO.class), injector.getInstance(ResourceDAO.class));
     ClusterPrivilegeResourceProvider.init(injector.getInstance(ClusterDAO.class));
+    AmbariPrivilegeResourceProvider.init(injector.getInstance(ClusterDAO.class));
     ViewRegistry.init(injector.getInstance(ViewDAO.class), injector.getInstance(ViewInstanceDAO.class),
         injector.getInstance(UserDAO.class), injector.getInstance(MemberDAO.class),
         injector.getInstance(PrivilegeDAO.class), injector.getInstance(SecurityHelper.class),

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProvider.java

@@ -19,19 +19,40 @@ package org.apache.ambari.server.controller.internal;
 
 import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.orm.dao.ClusterDAO;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
+import org.apache.ambari.server.orm.entities.GroupEntity;
+import org.apache.ambari.server.orm.entities.PrivilegeEntity;
 import org.apache.ambari.server.orm.entities.ResourceEntity;
+import org.apache.ambari.server.orm.entities.ResourceTypeEntity;
+import org.apache.ambari.server.orm.entities.UserEntity;
+import org.apache.ambari.server.orm.entities.ViewEntity;
+import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
+import org.apache.ambari.server.view.ViewRegistry;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static org.apache.ambari.server.controller.internal.ClusterPrivilegeResourceProvider.PRIVILEGE_CLUSTER_NAME_PROPERTY_ID;
+import static org.apache.ambari.server.controller.internal.ViewPrivilegeResourceProvider.PRIVILEGE_INSTANCE_NAME_PROPERTY_ID;
+import static org.apache.ambari.server.controller.internal.ViewPrivilegeResourceProvider.PRIVILEGE_VIEW_NAME_PROPERTY_ID;
+import static org.apache.ambari.server.controller.internal.ViewPrivilegeResourceProvider.PRIVILEGE_VIEW_VERSION_PROPERTY_ID;
+
 /**
  * Resource provider for Ambari privileges.
  */
 public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<Object> {
 
+  public static final String PRIVILEGE_TYPE_PROPERTY_ID  = "PrivilegeInfo/type";
+
+  /**
+   * Data access object used to obtain privilege entities.
+   */
+  protected static ClusterDAO clusterDAO;
+
   /**
    * The property ids for an Ambari privilege resource.
    */
@@ -41,6 +62,12 @@ public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<O
     propertyIds.add(PERMISSION_NAME_PROPERTY_ID);
     propertyIds.add(PRINCIPAL_NAME_PROPERTY_ID);
     propertyIds.add(PRINCIPAL_TYPE_PROPERTY_ID);
+    propertyIds.add(PRIVILEGE_VIEW_NAME_PROPERTY_ID);
+    propertyIds.add(PRIVILEGE_VIEW_VERSION_PROPERTY_ID);
+    propertyIds.add(PRIVILEGE_INSTANCE_NAME_PROPERTY_ID);
+    propertyIds.add(PRIVILEGE_CLUSTER_NAME_PROPERTY_ID);
+    propertyIds.add(PRIVILEGE_TYPE_PROPERTY_ID);
+
   }
 
   /**
@@ -61,6 +88,16 @@ public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<O
     super(propertyIds, keyPropertyIds, Resource.Type.AmbariPrivilege);
   }
 
+  // ----- AmbariPrivilegeResourceProvider ---------------------------------
+
+  /**
+   * Static initialization.
+   *
+   * @param clusterDao  the cluster data access object
+   */
+  public static void init(ClusterDAO clusterDao) {
+    clusterDAO  = clusterDao;
+  }
 
   // ----- AbstractResourceProvider ------------------------------------------
 
@@ -74,10 +111,60 @@ public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<O
 
   @Override
   public Map<Long, Object> getResourceEntities(Map<String, Object> properties) {
-    // the singleton Ambari entity is implied
-    return Collections.singletonMap(ResourceEntity.AMBARI_RESOURCE_ID, null);
+    Map<Long, Object> resourceEntities = new HashMap<Long, Object>();
+
+    resourceEntities.put(ResourceEntity.AMBARI_RESOURCE_ID, null);
+    // add cluster entities
+    List<ClusterEntity> clusterEntities = clusterDAO.findAll();
+
+    if (clusterEntities != null) {
+      for (ClusterEntity clusterEntity : clusterEntities) {
+        resourceEntities.put(clusterEntity.getResource().getId(), clusterEntity);
+      }
+    }
+    //add view entites
+    ViewRegistry viewRegistry = ViewRegistry.getInstance();
+    for (ViewEntity viewEntity : viewRegistry.getDefinitions()) {
+      for (ViewInstanceEntity viewInstanceEntity : viewEntity.getInstances()) {
+        resourceEntities.put(viewInstanceEntity.getResource().getId(), viewInstanceEntity);
+      }
+    }
+    return resourceEntities;
   }
 
+  @Override
+  protected Resource toResource(PrivilegeEntity privilegeEntity,
+                                Map<Long, UserEntity> userEntities,
+                                Map<Long, GroupEntity> groupEntities,
+                                Map<Long, Object> resourceEntities, Set<String> requestedIds) {
+    Resource resource = super.toResource(privilegeEntity, userEntities, groupEntities, resourceEntities, requestedIds);
+    if (resource != null) {
+      ResourceEntity resourceEntity = privilegeEntity.getResource();
+      ResourceTypeEntity type = resourceEntity.getResourceType();
+      String privilegeType;
+      switch (type.getId()) {
+        case ResourceTypeEntity.CLUSTER_RESOURCE_TYPE:
+          ClusterEntity clusterEntity = (ClusterEntity) resourceEntities.get(resourceEntity.getId());
+          privilegeType = ResourceTypeEntity.CLUSTER_RESOURCE_TYPE_NAME;
+          setResourceProperty(resource, PRIVILEGE_CLUSTER_NAME_PROPERTY_ID, clusterEntity.getClusterName(), requestedIds);
+          break;
+        case ResourceTypeEntity.AMBARI_RESOURCE_TYPE:
+          privilegeType = ResourceTypeEntity.AMBARI_RESOURCE_TYPE_NAME;
+          break;
+        default:
+          privilegeType = ResourceTypeEntity.VIEW_RESOURCE_TYPE_NAME;
+          ViewInstanceEntity viewInstanceEntity = (ViewInstanceEntity) resourceEntities.get(resourceEntity.getId());
+          ViewEntity viewEntity = viewInstanceEntity.getViewEntity();
+
+          setResourceProperty(resource, PRIVILEGE_VIEW_NAME_PROPERTY_ID, viewEntity.getCommonName(), requestedIds);
+          setResourceProperty(resource, PRIVILEGE_VIEW_VERSION_PROPERTY_ID, viewEntity.getVersion(), requestedIds);
+          setResourceProperty(resource, PRIVILEGE_INSTANCE_NAME_PROPERTY_ID, viewInstanceEntity.getName(), requestedIds);
+          break;
+      }
+      setResourceProperty(resource, PRIVILEGE_TYPE_PROPERTY_ID, privilegeType, requestedIds);
+    }
+    return resource;
+  }
   @Override
   public Long getResourceEntityId(Predicate predicate) {
     return ResourceEntity.AMBARI_RESOURCE_ID;

ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java

@@ -18,6 +18,7 @@
 
 package org.apache.ambari.server.controller.internal;
 
+import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.expect;
@@ -25,6 +26,7 @@ import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -33,15 +35,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.ambari.server.controller.ivory.Cluster;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.orm.dao.ClusterDAO;
 import org.apache.ambari.server.orm.dao.GroupDAO;
 import org.apache.ambari.server.orm.dao.PermissionDAO;
 import org.apache.ambari.server.orm.dao.PrincipalDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
 import org.apache.ambari.server.orm.entities.GroupEntity;
 import org.apache.ambari.server.orm.entities.PermissionEntity;
 import org.apache.ambari.server.orm.entities.PrincipalEntity;
@@ -50,6 +55,9 @@ import org.apache.ambari.server.orm.entities.PrivilegeEntity;
 import org.apache.ambari.server.orm.entities.ResourceEntity;
 import org.apache.ambari.server.orm.entities.ResourceTypeEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
+import org.apache.ambari.server.orm.entities.ViewEntity;
+import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
+import org.apache.ambari.server.view.ViewRegistry;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
@@ -61,6 +69,7 @@ import org.junit.Test;
  */
 public class AmbariPrivilegeResourceProviderTest {
   private final static PrivilegeDAO privilegeDAO = createStrictMock(PrivilegeDAO.class);
+  private final static ClusterDAO clusterDAO = createStrictMock(ClusterDAO.class);
   private final static UserDAO userDAO = createStrictMock(UserDAO.class);
   private final static GroupDAO groupDAO = createStrictMock(GroupDAO.class);
   private final static PrincipalDAO principalDAO = createStrictMock(PrincipalDAO.class);
@@ -69,12 +78,13 @@ public class AmbariPrivilegeResourceProviderTest {
 
   @BeforeClass
   public static void initClass() {
-    AmbariPrivilegeResourceProvider.init(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO);
+    PrivilegeResourceProvider.init(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO);
+    AmbariPrivilegeResourceProvider.init(clusterDAO);
   }
 
   @Before
   public void resetGlobalMocks() {
-    reset(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO);
+    reset(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO, clusterDAO);
   }
 
   @Test
@@ -84,6 +94,7 @@ public class AmbariPrivilegeResourceProviderTest {
 
     PrivilegeEntity privilegeEntity = createNiceMock(PrivilegeEntity.class);
     ResourceEntity resourceEntity = createNiceMock(ResourceEntity.class);
+    ResourceTypeEntity resourceTypeEntity = createNiceMock(ResourceTypeEntity.class);
     UserEntity userEntity = createNiceMock(UserEntity.class);
     PrincipalEntity principalEntity = createNiceMock(PrincipalEntity.class);
     PrincipalTypeEntity principalTypeEntity = createNiceMock(PrincipalTypeEntity.class);
@@ -102,6 +113,8 @@ public class AmbariPrivilegeResourceProviderTest {
     expect(privilegeEntity.getPrincipal()).andReturn(principalEntity).anyTimes();
     expect(privilegeEntity.getPermission()).andReturn(permissionEntity).anyTimes();
     expect(resourceEntity.getId()).andReturn(1L).anyTimes();
+    expect(resourceEntity.getResourceType()).andReturn(resourceTypeEntity).anyTimes();
+    expect(resourceTypeEntity.getId()).andReturn(1).anyTimes();
     expect(principalEntity.getId()).andReturn(1L).anyTimes();
     expect(userEntity.getPrincipal()).andReturn(principalEntity).anyTimes();
     expect(userEntity.getUserName()).andReturn("joe").anyTimes();
@@ -110,10 +123,12 @@ public class AmbariPrivilegeResourceProviderTest {
     expect(principalTypeEntity.getName()).andReturn("USER").anyTimes();
 
     expect(userDAO.findUsersByPrincipal(principalEntities)).andReturn(userEntities);
+    expect(clusterDAO.findAll()).andReturn(Collections.<ClusterEntity>emptyList());
     expect(groupDAO.findGroupsByPrincipal(principalEntities)).andReturn(Collections.<GroupEntity>emptyList());
 
-    replay(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO, privilegeEntity, resourceEntity,
-        userEntity, principalEntity, permissionEntity, principalTypeEntity);
+    replay(privilegeDAO, userDAO, groupDAO, principalDAO, permissionDAO, resourceDAO, clusterDAO,
+        privilegeEntity, resourceEntity, resourceTypeEntity, userEntity, principalEntity,
+        permissionEntity, principalTypeEntity);
 
     PrivilegeResourceProvider provider = new AmbariPrivilegeResourceProvider();
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
@@ -130,6 +145,160 @@ public class AmbariPrivilegeResourceProviderTest {
         userEntity, principalEntity, permissionEntity, principalTypeEntity);
   }
 
+  @Test
+  public void testGetResources_allTypes() throws Exception {
+
+    PrivilegeEntity ambariPrivilegeEntity = createNiceMock(PrivilegeEntity.class);
+    ResourceEntity ambariResourceEntity = createNiceMock(ResourceEntity.class);
+    ResourceTypeEntity ambariResourceTypeEntity = createNiceMock(ResourceTypeEntity.class);
+    UserEntity ambariUserEntity = createNiceMock(UserEntity.class);
+    PrincipalEntity ambariPrincipalEntity = createNiceMock(PrincipalEntity.class);
+    PrincipalTypeEntity ambariPrincipalTypeEntity = createNiceMock(PrincipalTypeEntity.class);
+    PermissionEntity ambariPermissionEntity = createNiceMock(PermissionEntity.class);
+    expect(ambariPrivilegeEntity.getResource()).andReturn(ambariResourceEntity).anyTimes();
+    expect(ambariPrivilegeEntity.getId()).andReturn(31).anyTimes();
+    expect(ambariPrivilegeEntity.getPrincipal()).andReturn(ambariPrincipalEntity).anyTimes();
+    expect(ambariPrivilegeEntity.getPermission()).andReturn(ambariPermissionEntity).anyTimes();
+    expect(ambariResourceEntity.getResourceType()).andReturn(ambariResourceTypeEntity).anyTimes();
+    expect(ambariResourceTypeEntity.getId()).andReturn(1).anyTimes();
+    expect(ambariPrincipalEntity.getId()).andReturn(1L).anyTimes();
+    expect(ambariUserEntity.getPrincipal()).andReturn(ambariPrincipalEntity).anyTimes();
+    expect(ambariUserEntity.getUserName()).andReturn("joe").anyTimes();
+    expect(ambariPermissionEntity.getPermissionName()).andReturn("AMBARI.ADMIN").anyTimes();
+    expect(ambariPrincipalEntity.getPrincipalType()).andReturn(ambariPrincipalTypeEntity).anyTimes();
+    expect(ambariPrincipalTypeEntity.getName()).andReturn("USER").anyTimes();
+
+    PrivilegeEntity viewPrivilegeEntity = createNiceMock(PrivilegeEntity.class);
+    ResourceEntity viewResourceEntity = createNiceMock(ResourceEntity.class);
+    ViewEntity viewEntity = createNiceMock(ViewEntity.class);
+    ViewInstanceEntity viewInstanceEntity = createNiceMock(ViewInstanceEntity.class);
+    ResourceTypeEntity viewResourceTypeEntity = createNiceMock(ResourceTypeEntity.class);
+    UserEntity viewUserEntity = createNiceMock(UserEntity.class);
+    PrincipalEntity viewPrincipalEntity = createNiceMock(PrincipalEntity.class);
+    PrincipalTypeEntity viewPrincipalTypeEntity = createNiceMock(PrincipalTypeEntity.class);
+    PermissionEntity viewPermissionEntity = createNiceMock(PermissionEntity.class);
+    expect(viewPrivilegeEntity.getResource()).andReturn(viewResourceEntity).anyTimes();
+    expect(viewPrivilegeEntity.getPrincipal()).andReturn(viewPrincipalEntity).anyTimes();
+    expect(viewPrivilegeEntity.getPermission()).andReturn(viewPermissionEntity).anyTimes();
+    expect(viewPrivilegeEntity.getId()).andReturn(33).anyTimes();
+    expect(viewResourceEntity.getResourceType()).andReturn(viewResourceTypeEntity).anyTimes();
+    expect(viewResourceTypeEntity.getId()).andReturn(3).anyTimes();
+    expect(viewPrincipalEntity.getId()).andReturn(5L).anyTimes();
+    expect(viewEntity.getInstances()).andReturn(Arrays.asList(viewInstanceEntity)).anyTimes();
+    expect(viewInstanceEntity.getViewEntity()).andReturn(viewEntity).anyTimes();
+    expect(viewEntity.getCommonName()).andReturn("view").anyTimes();
+    expect(viewEntity.getVersion()).andReturn("1.0.1").anyTimes();
+    expect(viewInstanceEntity.getName()).andReturn("inst1").anyTimes();
+    expect(viewInstanceEntity.getResource()).andReturn(viewResourceEntity).anyTimes();
+    expect(viewUserEntity.getPrincipal()).andReturn(viewPrincipalEntity).anyTimes();
+    expect(viewUserEntity.getUserName()).andReturn("bob").anyTimes();
+    expect(viewPermissionEntity.getPermissionName()).andReturn("VIEW.USE").anyTimes();
+    expect(viewPrincipalEntity.getPrincipalType()).andReturn(viewPrincipalTypeEntity).anyTimes();
+    expect(viewPrincipalTypeEntity.getName()).andReturn("USER").anyTimes();
+
+    PrivilegeEntity clusterPrivilegeEntity = createNiceMock(PrivilegeEntity.class);
+    ResourceEntity clusterResourceEntity = createNiceMock(ResourceEntity.class);
+    ResourceTypeEntity clusterResourceTypeEntity = createNiceMock(ResourceTypeEntity.class);
+    UserEntity clusterUserEntity = createNiceMock(UserEntity.class);
+    PrincipalEntity clusterPrincipalEntity = createNiceMock(PrincipalEntity.class);
+    PrincipalTypeEntity clusterPrincipalTypeEntity = createNiceMock(PrincipalTypeEntity.class);
+    PermissionEntity clusterPermissionEntity = createNiceMock(PermissionEntity.class);
+    ClusterEntity clusterEntity = createNiceMock(ClusterEntity.class);
+    expect(clusterPrivilegeEntity.getResource()).andReturn(clusterResourceEntity).anyTimes();
+    expect(clusterPrivilegeEntity.getPrincipal()).andReturn(clusterPrincipalEntity).anyTimes();
+    expect(clusterPrivilegeEntity.getPermission()).andReturn(clusterPermissionEntity).anyTimes();
+    expect(clusterPrivilegeEntity.getId()).andReturn(32).anyTimes();
+    expect(clusterResourceEntity.getId()).andReturn(7L).anyTimes();
+    expect(clusterResourceEntity.getResourceType()).andReturn(clusterResourceTypeEntity).anyTimes();
+    expect(clusterResourceTypeEntity.getId()).andReturn(2).anyTimes();
+    expect(clusterPrincipalEntity.getId()).andReturn(8L).anyTimes();
+    expect(clusterUserEntity.getPrincipal()).andReturn(clusterPrincipalEntity).anyTimes();
+    expect(clusterUserEntity.getUserName()).andReturn("jeff").anyTimes();
+    expect(clusterPermissionEntity.getPermissionName()).andReturn("CLUSTER.READ").anyTimes();
+    expect(clusterPrincipalEntity.getPrincipalType()).andReturn(clusterPrincipalTypeEntity).anyTimes();
+    expect(clusterPrincipalTypeEntity.getName()).andReturn("USER").anyTimes();
+    expect(clusterEntity.getResource()).andReturn(clusterResourceEntity).anyTimes();
+    expect(clusterEntity.getClusterName()).andReturn("cluster1").anyTimes();
+
+    List<PrincipalEntity> principalEntities = new LinkedList<PrincipalEntity>();
+    principalEntities.add(ambariPrincipalEntity);
+    principalEntities.add(viewPrincipalEntity);
+    principalEntities.add(clusterPrincipalEntity);
+
+    List<UserEntity> userEntities = new LinkedList<UserEntity>();
+    userEntities.add(ambariUserEntity);
+    userEntities.add(viewUserEntity);
+    userEntities.add(clusterUserEntity);
+
+    List<PrivilegeEntity> privilegeEntities = new LinkedList<PrivilegeEntity>();
+    privilegeEntities.add(ambariPrivilegeEntity);
+    privilegeEntities.add(viewPrivilegeEntity);
+    privilegeEntities.add(clusterPrivilegeEntity);
+
+    List<ClusterEntity> clusterEntities = new LinkedList<ClusterEntity>();
+    clusterEntities.add(clusterEntity);
+
+    expect(clusterDAO.findAll()).andReturn(clusterEntities);
+    expect(privilegeDAO.findAll()).andReturn(privilegeEntities);
+    expect(userDAO.findUsersByPrincipal(anyObject(List.class))).andReturn(userEntities).anyTimes();
+    expect(groupDAO.findGroupsByPrincipal(anyObject(List.class))).andReturn(Collections.<GroupEntity>emptyList()).anyTimes();
+
+    replay(privilegeDAO, userDAO, principalDAO, permissionDAO, groupDAO, resourceDAO, clusterDAO, ambariPrivilegeEntity,
+        ambariResourceEntity, ambariResourceTypeEntity, ambariUserEntity, ambariPrincipalEntity, ambariPermissionEntity, viewPrivilegeEntity,
+        viewResourceEntity, viewResourceTypeEntity, viewUserEntity, viewPrincipalEntity, viewPrincipalTypeEntity, viewPermissionEntity, clusterPrivilegeEntity,
+        clusterResourceEntity, clusterResourceTypeEntity, clusterUserEntity, clusterPrincipalEntity, clusterPermissionEntity,clusterPrincipalTypeEntity,
+        ambariPrincipalTypeEntity, clusterEntity, viewEntity, viewInstanceEntity);
+
+    ViewRegistry.getInstance().addDefinition(viewEntity);
+    PrivilegeResourceProvider provider = new AmbariPrivilegeResourceProvider();
+    Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
+
+    Assert.assertEquals(3, resources.size());
+
+    Map<Object, Resource> resourceMap = new HashMap<Object, Resource>();
+
+    for (Resource resource : resources) {
+      resourceMap.put(resource.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_ID_PROPERTY_ID), resource);
+    }
+
+    Resource resource1 = resourceMap.get(31);
+
+    Assert.assertEquals(5, resource1.getPropertiesMap().get("PrivilegeInfo").size());
+    Assert.assertEquals("AMBARI.ADMIN", resource1.getPropertyValue(AmbariPrivilegeResourceProvider.PERMISSION_NAME_PROPERTY_ID));
+    Assert.assertEquals("joe", resource1.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_NAME_PROPERTY_ID));
+    Assert.assertEquals("USER", resource1.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_TYPE_PROPERTY_ID));
+    Assert.assertEquals(31, resource1.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_ID_PROPERTY_ID));
+    Assert.assertEquals("AMBARI", resource1.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_TYPE_PROPERTY_ID));
+
+    Resource resource2 = resourceMap.get(32);
+
+    Assert.assertEquals(6, resource2.getPropertiesMap().get("PrivilegeInfo").size());
+    Assert.assertEquals("CLUSTER.READ", resource2.getPropertyValue(AmbariPrivilegeResourceProvider.PERMISSION_NAME_PROPERTY_ID));
+    Assert.assertEquals("jeff", resource2.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_NAME_PROPERTY_ID));
+    Assert.assertEquals("USER", resource2.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_TYPE_PROPERTY_ID));
+    Assert.assertEquals(32, resource2.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_ID_PROPERTY_ID));
+    Assert.assertEquals("cluster1", resource2.getPropertyValue(ClusterPrivilegeResourceProvider.PRIVILEGE_CLUSTER_NAME_PROPERTY_ID));
+    Assert.assertEquals("CLUSTER", resource2.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_TYPE_PROPERTY_ID));
+
+    Resource resource3 = resourceMap.get(33);
+
+    Assert.assertEquals(8, resource3.getPropertiesMap().get("PrivilegeInfo").size());
+    Assert.assertEquals("VIEW.USE", resource3.getPropertyValue(AmbariPrivilegeResourceProvider.PERMISSION_NAME_PROPERTY_ID));
+    Assert.assertEquals("bob", resource3.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_NAME_PROPERTY_ID));
+    Assert.assertEquals("USER", resource3.getPropertyValue(AmbariPrivilegeResourceProvider.PRINCIPAL_TYPE_PROPERTY_ID));
+    Assert.assertEquals(33, resource3.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_ID_PROPERTY_ID));
+    Assert.assertEquals("view", resource3.getPropertyValue(ViewPrivilegeResourceProvider.PRIVILEGE_VIEW_NAME_PROPERTY_ID));
+    Assert.assertEquals("1.0.1", resource3.getPropertyValue(ViewPrivilegeResourceProvider.PRIVILEGE_VIEW_VERSION_PROPERTY_ID));
+    Assert.assertEquals("inst1", resource3.getPropertyValue(ViewPrivilegeResourceProvider.PRIVILEGE_INSTANCE_NAME_PROPERTY_ID));
+    Assert.assertEquals("VIEW", resource3.getPropertyValue(AmbariPrivilegeResourceProvider.PRIVILEGE_TYPE_PROPERTY_ID));
+
+    verify(privilegeDAO, userDAO, principalDAO, permissionDAO, groupDAO, resourceDAO, clusterDAO, ambariPrivilegeEntity,
+        ambariResourceEntity, ambariResourceTypeEntity, ambariUserEntity, ambariPrincipalEntity, ambariPermissionEntity, viewPrivilegeEntity,
+        viewResourceEntity, viewResourceTypeEntity, viewUserEntity, viewPrincipalEntity, viewPrincipalTypeEntity, viewPermissionEntity, clusterPrivilegeEntity,
+        clusterResourceEntity, clusterResourceTypeEntity, clusterUserEntity, clusterPrincipalEntity, clusterPermissionEntity,clusterPrincipalTypeEntity,
+        ambariPrincipalTypeEntity, clusterEntity, viewEntity, viewInstanceEntity);
+  }
+
   @Test
   public void testUpdateResources() throws Exception {
     PrivilegeResourceProvider provider = new AmbariPrivilegeResourceProvider();
@@ -156,6 +325,7 @@ public class AmbariPrivilegeResourceProviderTest {
         });
       }
     }).anyTimes();
+    expect(clusterDAO.findAll()).andReturn(Collections.<ClusterEntity>emptyList());
     expect(permissionDAO.findPermissionByNameAndType(EasyMock.eq("READ"), EasyMock.<ResourceTypeEntity> anyObject())).andReturn(permissionEntity);
     expect(resourceDAO.findById(EasyMock.anyLong())).andReturn(resourceEntity);
     expect(userDAO.findLocalUserByName("admin")).andReturn(userEntity);
@@ -171,7 +341,8 @@ public class AmbariPrivilegeResourceProviderTest {
     privilegeDAO.create(EasyMock.<PrivilegeEntity> anyObject());
     EasyMock.expectLastCall().anyTimes();
 
-    replay(privilegeEntity, privilegeDAO, request, permissionDAO, permissionEntity, resourceEntity, resourceDAO, principalEntity, principalDAO, userDAO, userEntity, resourceTypeEntity);
+    replay(privilegeEntity, privilegeDAO, request, permissionDAO, permissionEntity, resourceEntity, resourceDAO,
+        principalEntity, principalDAO, userDAO, userEntity, resourceTypeEntity, clusterDAO);
 
     provider.updateResources(request, null);