http://git-wip-us.apache.org/repos/asf/ambari/blob/9faeaf5a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java index 13cb231..1cfba46 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog170Test.java @@ -134,6 +134,8 @@ public class UpgradeCatalog170Test { Capture<DBAccessor.DBColumnInfo> clusterConfigAttributesColumnCapture = new Capture<DBAccessor.DBColumnInfo>(); Capture<DBAccessor.DBColumnInfo> maskColumnCapture = new Capture<DBAccessor.DBColumnInfo>(); Capture<DBAccessor.DBColumnInfo> maskedColumnCapture = new Capture<DBAccessor.DBColumnInfo>(); + Capture<DBAccessor.DBColumnInfo> stageCommandParamsColumnCapture = new Capture<DBAccessor.DBColumnInfo>(); + Capture<DBAccessor.DBColumnInfo> stageHostParamsColumnCapture = new Capture<DBAccessor.DBColumnInfo>(); Capture<List<DBAccessor.DBColumnInfo>> alertDefinitionColumnCapture = new Capture<List<DBAccessor.DBColumnInfo>>(); Capture<List<DBAccessor.DBColumnInfo>> alertHistoryColumnCapture = new Capture<List<DBAccessor.DBColumnInfo>>(); Capture<List<DBAccessor.DBColumnInfo>> alertCurrentColumnCapture = new Capture<List<DBAccessor.DBColumnInfo>>(); @@ -148,6 +150,7 @@ public class UpgradeCatalog170Test { setViewExpectations(dbAccessor, maskColumnCapture); setViewParameterExpectations(dbAccessor, maskedColumnCapture); setClusterConfigExpectations(dbAccessor, clusterConfigAttributesColumnCapture); + setStageExpectations(dbAccessor, stageCommandParamsColumnCapture, stageHostParamsColumnCapture); dbAccessor.createTable(eq("alert_definition"), capture(alertDefinitionColumnCapture), eq("definition_id")); @@ -200,6 +203,7 @@ public class UpgradeCatalog170Test { assertClusterConfigColumns(clusterConfigAttributesColumnCapture); assertViewColumns(maskColumnCapture); assertViewParameterColumns(maskedColumnCapture); + assertStageColumns(stageCommandParamsColumnCapture, stageHostParamsColumnCapture); assertEquals(12, alertDefinitionColumnCapture.getValue().size()); assertEquals(11, alertHistoryColumnCapture.getValue().size()); @@ -424,6 +428,17 @@ public class UpgradeCatalog170Test { dbAccessor.addColumn(eq("clusterconfig"), capture(clusterConfigAttributesColumnCapture)); } + + private void setStageExpectations(DBAccessor dbAccessor, + Capture<DBAccessor.DBColumnInfo> stageCommandParamsColumnCapture, + Capture<DBAccessor.DBColumnInfo> stageHostParamsColumnCapture) + throws SQLException { + dbAccessor.addColumn(eq("stage"), + capture(stageCommandParamsColumnCapture)); + + dbAccessor.addColumn(eq("stage"), + capture(stageHostParamsColumnCapture)); + } @Test public void testGetSourceVersion() { @@ -465,4 +480,19 @@ public class UpgradeCatalog170Test { assertNull(column.getDefaultValue()); assertTrue(column.isNullable()); } + + private void assertStageColumns(Capture<DBAccessor.DBColumnInfo> stageCommandParamsColumnCapture, + Capture<DBAccessor.DBColumnInfo> stageHostParamsColumnCapture) { + DBAccessor.DBColumnInfo column = stageCommandParamsColumnCapture.getValue(); + assertEquals("command_params", column.getName()); + assertEquals(byte[].class, column.getType()); + assertEquals(null, column.getDefaultValue()); + assertTrue(column.isNullable()); + + column = stageHostParamsColumnCapture.getValue(); + assertEquals("host_params", column.getName()); + assertEquals(byte[].class, column.getType()); + assertEquals(null, column.getDefaultValue()); + assertTrue(column.isNullable()); + } }
http://git-wip-us.apache.org/repos/asf/ambari/blob/9faeaf5a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java index 6e587f1..988c67b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestStageUtils.java @@ -20,6 +20,8 @@ package org.apache.ambari.server.utils; import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.powermock.api.easymock.PowerMock.mockStaticPartial; +import static org.powermock.api.easymock.PowerMock.replayAll; import java.io.IOException; import java.net.UnknownHostException; @@ -42,8 +44,6 @@ import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; import org.apache.ambari.server.actionmanager.Stage; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.api.services.AmbariMetaInfo; -import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.controller.HostsMap; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.state.Cluster; @@ -63,9 +63,6 @@ import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import static org.powermock.api.easymock.PowerMock.replayAll; -import java.net.InetAddress; -import static org.powermock.api.easymock.PowerMock.*; import com.google.common.collect.ContiguousSet; import com.google.common.collect.DiscreteDomain; @@ -124,7 +121,7 @@ public class TestStageUtils { @Test @Ignore public void testGetATestStage() { - Stage s = StageUtils.getATestStage(1, 2, "host2"); + Stage s = StageUtils.getATestStage(1, 2, "host2", "", "hostParamsStage"); String hostname = s.getHosts().get(0); List<ExecutionCommandWrapper> wrappers = s.getExecutionCommands(hostname); for (ExecutionCommandWrapper wrapper : wrappers) { @@ -137,7 +134,7 @@ public class TestStageUtils { @Test @Ignore public void testJaxbToString() throws Exception { - Stage s = StageUtils.getATestStage(1, 2, "host1"); + Stage s = StageUtils.getATestStage(1, 2, "host1", "", "hostParamsStage"); String hostname = s.getHosts().get(0); List<ExecutionCommandWrapper> wrappers = s.getExecutionCommands(hostname); for (ExecutionCommandWrapper wrapper : wrappers) { @@ -150,7 +147,7 @@ public class TestStageUtils { @Ignore public void testJasonToExecutionCommand() throws JsonGenerationException, JsonMappingException, JAXBException, IOException { - Stage s = StageUtils.getATestStage(1, 2, "host1", "clusterHostInfo"); + Stage s = StageUtils.getATestStage(1, 2, "host1", "clusterHostInfo", "hostParamsStage"); ExecutionCommand cmd = s.getExecutionCommands("host1").get(0).getExecutionCommand(); HashMap<String, Map<String,String>> configTags = new HashMap<String, Map<String,String>>(); Map<String, String> globalTag = new HashMap<String, String>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/9faeaf5a/ambari-web/app/controllers/wizard/step3_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js index 88a328e..3510150 100644 --- a/ambari-web/app/controllers/wizard/step3_controller.js +++ b/ambari-web/app/controllers/wizard/step3_controller.js @@ -833,7 +833,6 @@ App.WizardStep3Controller = Em.Controller.extend({ "parameters": { "check_execute_list": "host_resolution_check", "jdk_location" : jdk_location, - "hosts": hosts, "threshold": "20" } };
