Repository: ambari Updated Branches: refs/heads/branch-2.5 2027166f5 -> 8d3e8f29d
AMBARI-18517 : Changes in upgrade path for Kafka metrics collector hosts config (Addendum patch) (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8d3e8f29 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8d3e8f29 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8d3e8f29 Branch: refs/heads/branch-2.5 Commit: 8d3e8f29d6dd6ab3fc60e6a01dbe829bd0fba062 Parents: 2027166 Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Fri Nov 18 08:42:46 2016 -0800 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Fri Nov 18 08:42:46 2016 -0800 ---------------------------------------------------------------------- .../server/upgrade/UpgradeCatalog250.java | 17 ---- .../server/upgrade/UpgradeCatalog250Test.java | 90 -------------------- 2 files changed, 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8d3e8f29/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java index 196a10f..bc3c120 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java @@ -19,7 +19,6 @@ package org.apache.ambari.server.upgrade; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -134,7 +133,6 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { protected void executeDMLUpdates() throws AmbariException, SQLException { addNewConfigurationsFromXml(); updateAMSConfigs(); - createRoleAuthorizations(); updateKafkaConfigs(); } @@ -204,21 +202,6 @@ public class UpgradeCatalog250 extends AbstractUpgradeCatalog { } /** - * Create new role authorizations: CLUSTER.RUN_CUSTOM_COMMAND and AMBARI.RUN_CUSTOM_COMMAND - * - * @throws SQLException - */ - protected void createRoleAuthorizations() throws SQLException { - LOG.info("Adding authorizations"); - - addRoleAuthorization("CLUSTER.RUN_CUSTOM_COMMAND", "Perform custom cluster-level actions", - Arrays.asList("AMBARI.ADMINISTRATOR:AMBARI", "CLUSTER.ADMINISTRATOR:CLUSTER")); - - addRoleAuthorization("AMBARI.RUN_CUSTOM_COMMAND", "Perform custom administrative actions", - Collections.singletonList("AMBARI.ADMINISTRATOR:AMBARI")); - } - - /** * Creates the servicecomponent_version table * * @throws SQLException http://git-wip-us.apache.org/repos/asf/ambari/blob/8d3e8f29/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java index 2f562b8..4135919 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog250Test.java @@ -38,15 +38,11 @@ import static org.junit.Assert.assertTrue; import java.lang.reflect.Method; import java.sql.Connection; import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.AmbariManagementController; @@ -54,12 +50,6 @@ import org.apache.ambari.server.controller.AmbariManagementControllerImpl; import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.controller.MaintenanceStateHelper; import org.apache.ambari.server.orm.DBAccessor; -import org.apache.ambari.server.orm.dao.PermissionDAO; -import org.apache.ambari.server.orm.dao.ResourceTypeDAO; -import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO; -import org.apache.ambari.server.orm.entities.PermissionEntity; -import org.apache.ambari.server.orm.entities.ResourceTypeEntity; -import org.apache.ambari.server.orm.entities.RoleAuthorizationEntity; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; @@ -220,13 +210,11 @@ public class UpgradeCatalog250Test { @Test public void testExecuteDMLUpdates() throws Exception { Method updateAmsConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateAMSConfigs"); - Method createRoleAuthorizations = UpgradeCatalog250.class.getDeclaredMethod("createRoleAuthorizations"); Method updateKafkaConfigs = UpgradeCatalog250.class.getDeclaredMethod("updateKafkaConfigs"); Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml"); UpgradeCatalog250 upgradeCatalog250 = createMockBuilder(UpgradeCatalog250.class) .addMockedMethod(updateAmsConfigs) - .addMockedMethod(createRoleAuthorizations) .addMockedMethod(updateKafkaConfigs) .addMockedMethod(addNewConfigurationsFromXml) .createMock(); @@ -320,84 +308,6 @@ public class UpgradeCatalog250Test { } @Test - public void testCreateRoleAuthorizations() throws AmbariException, SQLException { - - EasyMockSupport easyMockSupport = new EasyMockSupport(); - - ResourceTypeEntity ambariResourceTypeEntity = easyMockSupport.createMock(ResourceTypeEntity.class); - - ResourceTypeEntity clusterResourceTypeEntity = easyMockSupport.createMock(ResourceTypeEntity.class); - - Collection<RoleAuthorizationEntity> ambariAdministratorAuthorizations = new ArrayList<RoleAuthorizationEntity>(); - Collection<RoleAuthorizationEntity> clusterAdministratorAuthorizations = new ArrayList<RoleAuthorizationEntity>(); - - PermissionEntity clusterAdministratorPermissionEntity = easyMockSupport.createMock(PermissionEntity.class); - expect(clusterAdministratorPermissionEntity.getAuthorizations()) - .andReturn(clusterAdministratorAuthorizations) - .times(1); - - PermissionEntity ambariAdministratorPermissionEntity = easyMockSupport.createMock(PermissionEntity.class); - expect(ambariAdministratorPermissionEntity.getAuthorizations()) - .andReturn(ambariAdministratorAuthorizations) - .times(2); - - PermissionDAO permissionDAO = easyMockSupport.createMock(PermissionDAO.class); - expect(permissionDAO.findPermissionByNameAndType("AMBARI.ADMINISTRATOR", ambariResourceTypeEntity)) - .andReturn(ambariAdministratorPermissionEntity) - .times(2); - expect(permissionDAO.findPermissionByNameAndType("CLUSTER.ADMINISTRATOR", clusterResourceTypeEntity)) - .andReturn(clusterAdministratorPermissionEntity) - .times(1); - expect(permissionDAO.merge(ambariAdministratorPermissionEntity)) - .andReturn(ambariAdministratorPermissionEntity) - .times(2); - expect(permissionDAO.merge(clusterAdministratorPermissionEntity)) - .andReturn(clusterAdministratorPermissionEntity) - .times(1); - - ResourceTypeDAO resourceTypeDAO = easyMockSupport.createMock(ResourceTypeDAO.class); - expect(resourceTypeDAO.findByName("AMBARI")).andReturn(ambariResourceTypeEntity).times(2); - expect(resourceTypeDAO.findByName("CLUSTER")).andReturn(clusterResourceTypeEntity).times(1); - - RoleAuthorizationDAO roleAuthorizationDAO = easyMockSupport.createMock(RoleAuthorizationDAO.class); - expect(roleAuthorizationDAO.findById("CLUSTER.RUN_CUSTOM_COMMAND")).andReturn(null).times(1); - expect(roleAuthorizationDAO.findById("AMBARI.RUN_CUSTOM_COMMAND")).andReturn(null).times(1); - - Capture<RoleAuthorizationEntity> captureClusterRunCustomCommandEntity = newCapture(); - roleAuthorizationDAO.create(capture(captureClusterRunCustomCommandEntity)); - expectLastCall().times(1); - - Capture<RoleAuthorizationEntity> captureAmbariRunCustomCommandEntity = newCapture(); - roleAuthorizationDAO.create(capture(captureAmbariRunCustomCommandEntity)); - expectLastCall().times(1); - - Injector injector = easyMockSupport.createNiceMock(Injector.class); - expect(injector.getInstance(RoleAuthorizationDAO.class)).andReturn(roleAuthorizationDAO).atLeastOnce(); - expect(injector.getInstance(PermissionDAO.class)).andReturn(permissionDAO).atLeastOnce(); - expect(injector.getInstance(ResourceTypeDAO.class)).andReturn(resourceTypeDAO).atLeastOnce(); - - easyMockSupport.replayAll(); - new UpgradeCatalog250(injector).createRoleAuthorizations(); - easyMockSupport.verifyAll(); - - RoleAuthorizationEntity ambariRunCustomCommandEntity = captureAmbariRunCustomCommandEntity.getValue(); - RoleAuthorizationEntity clusterRunCustomCommandEntity = captureClusterRunCustomCommandEntity.getValue(); - - Assert.assertEquals("AMBARI.RUN_CUSTOM_COMMAND", ambariRunCustomCommandEntity.getAuthorizationId()); - Assert.assertEquals("Perform custom administrative actions", ambariRunCustomCommandEntity.getAuthorizationName()); - - Assert.assertEquals("CLUSTER.RUN_CUSTOM_COMMAND", clusterRunCustomCommandEntity.getAuthorizationId()); - Assert.assertEquals("Perform custom cluster-level actions", clusterRunCustomCommandEntity.getAuthorizationName()); - - Assert.assertEquals(2, ambariAdministratorAuthorizations.size()); - Assert.assertTrue(ambariAdministratorAuthorizations.contains(clusterRunCustomCommandEntity)); - Assert.assertTrue(ambariAdministratorAuthorizations.contains(ambariRunCustomCommandEntity)); - - Assert.assertEquals(1, clusterAdministratorAuthorizations.size()); - Assert.assertTrue(clusterAdministratorAuthorizations.contains(clusterRunCustomCommandEntity)); - } - - @Test public void testKafkaUpdateConfigs() throws Exception { Map<String, String> oldProperties = new HashMap<String, String>() {
