You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2017/11/23 10:22:56 UTC
[7/7] ambari git commit: AMBARI-22493. Fix build for test classes in
feature branch.(vbrodetskyi)
AMBARI-22493. Fix build for test classes in feature branch.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f176845
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f176845
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f176845
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 1f176845ec636adbc1dc710c03f8062f979f5405
Parents: 35d704c
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Nov 23 12:22:11 2017 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Nov 23 12:22:11 2017 +0200
----------------------------------------------------------------------
ambari-server/pom.xml | 2 +-
.../ExecutionCommandWrapperTest.java | 2 +-
.../TestActionSchedulerThreading.java | 8 +-
.../server/agent/HeartbeatProcessorTest.java | 2 +-
.../server/agent/TestHeartbeatHandler.java | 2 +-
.../server/agent/TestHeartbeatMonitor.java | 10 +-
.../render/ClusterBlueprintRendererTest.java | 8 +-
.../api/services/ComponentServiceTest.java | 4 +-
.../api/services/ConfigurationServiceTest.java | 2 +-
.../server/api/services/ServiceServiceTest.java | 8 +-
.../StackAdvisorBlueprintProcessorTest.java | 12 +-
.../checks/ComponentsInstallationCheckTest.java | 12 +-
.../server/checks/ServicesUpCheckTest.java | 16 +-
.../configuration/RecoveryConfigHelperTest.java | 12 +-
.../AmbariCustomCommandExecutionHelperTest.java | 13 +-
.../AmbariManagementControllerImplTest.java | 58 +-
.../AmbariManagementControllerTest.java | 892 +++++++++----------
.../BackgroundCustomCommandExecutionTest.java | 8 +-
.../server/controller/ClusterResponseTest.java | 2 +-
...hYarnCapacitySchedulerReleaseConfigTest.java | 16 +-
.../internal/AbstractResourceProviderTest.java | 4 +-
.../BlueprintConfigurationProcessorTest.java | 306 +++----
.../ClientConfigResourceProviderTest.java | 4 +-
.../internal/ClusterResourceProviderTest.java | 4 +-
.../internal/ComponentResourceProviderTest.java | 20 +-
.../ConfigGroupResourceProviderTest.java | 10 +-
.../internal/ExportBlueprintRequestTest.java | 2 +-
.../HostComponentResourceProviderTest.java | 14 +-
.../internal/HostResourceProviderTest.java | 26 +-
.../internal/JMXHostProviderTest.java | 24 +-
.../internal/ProvisionClusterRequestTest.java | 2 +-
.../internal/RequestResourceProviderTest.java | 2 +-
.../internal/ScaleClusterRequestTest.java | 2 +-
.../internal/ServiceResourceProviderTest.java | 6 +-
.../StackConfigurationResourceProviderTest.java | 14 +-
.../StackDefinedPropertyProviderTest.java | 8 +-
...kLevelConfigurationResourceProviderTest.java | 14 +-
.../server/controller/internal/StackTest.java | 17 +-
.../StackUpgradeConfigurationMergeTest.java | 6 +-
.../controller/internal/UnitUpdaterTest.java | 8 +-
.../internal/UpgradeResourceProviderTest.java | 20 +-
.../UpgradeSummaryResourceProviderTest.java | 2 +-
.../VersionDefinitionResourceProviderTest.java | 2 +-
.../LoggingSearchPropertyProviderTest.java | 6 +-
.../utilities/KerberosIdentityCleanerTest.java | 4 +-
.../GeneralServiceCalculatedStateTest.java | 2 +-
.../apache/ambari/server/events/EventsTest.java | 4 +-
.../HostVersionOutOfSyncListenerTest.java | 8 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 5 +-
.../apache/ambari/server/orm/TestOrmImpl.java | 14 +-
.../server/orm/dao/ServiceConfigDAOTest.java | 30 +-
.../orm/dao/TopologyLogicalRequestDAOTest.java | 4 +-
.../server/orm/dao/TopologyRequestDAOTest.java | 8 +-
.../orm/entities/ServiceConfigEntityTest.java | 2 +-
.../ComponentVersionCheckActionTest.java | 4 +-
.../upgrades/ConfigureActionTest.java | 5 +-
.../PreconfigureKerberosActionTest.java | 2 +-
.../upgrades/UpgradeActionTest.java | 4 +-
.../ambari/server/state/ConfigGroupTest.java | 3 +-
.../ambari/server/state/ConfigHelperTest.java | 11 +-
.../ambari/server/state/DesiredConfigTest.java | 4 +-
.../server/state/ServiceComponentTest.java | 58 +-
.../apache/ambari/server/state/ServiceTest.java | 16 +-
.../ambari/server/state/UpgradeHelperTest.java | 33 +-
.../state/alerts/AlertEventPublisherTest.java | 4 +-
.../state/alerts/InitialAlertEventTest.java | 4 +-
.../state/cluster/ClusterDeadlockTest.java | 3 +-
.../server/state/cluster/ClusterImplTest.java | 4 +-
.../server/state/cluster/ClusterTest.java | 137 +--
.../state/cluster/ClustersDeadlockTest.java | 3 +-
.../server/state/cluster/ClustersTest.java | 20 +-
.../ConcurrentServiceConfigVersionTest.java | 9 +-
...omponentHostConcurrentWriteDeadlockTest.java | 3 +-
.../svccomphost/ServiceComponentHostTest.java | 23 +-
.../server/topology/AmbariContextTest.java | 14 +-
.../ClusterConfigurationRequestTest.java | 8 +-
.../ClusterDeployWithStartOnlyTest.java | 4 +-
...InstallWithoutStartOnComponentLevelTest.java | 4 +-
.../ClusterInstallWithoutStartTest.java | 4 +-
.../topology/ClusterTopologyImplTest.java | 12 +-
.../server/topology/LogicalRequestTest.java | 2 +-
.../topology/RequiredPasswordValidatorTest.java | 2 +-
.../server/topology/TopologyManagerTest.java | 31 +-
.../ClusterConfigTypeValidatorTest.java | 2 +-
.../validators/HiveServiceValidatorTest.java | 10 +-
.../RequiredConfigPropertiesValidatorTest.java | 2 +-
.../StackConfigTypeValidatorTest.java | 2 +-
.../topology/validators/UnitValidatorTest.java | 8 +-
.../upgrade/AbstractUpgradeCatalogTest.java | 7 +-
.../server/upgrade/UpgradeCatalog252Test.java | 19 +-
.../server/upgrade/UpgradeCatalog260Test.java | 31 +-
.../server/upgrade/UpgradeCatalog300Test.java | 15 +-
.../ambari/server/view/ViewRegistryTest.java | 2 +-
93 files changed, 1151 insertions(+), 1071 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index e15e23e..5e07b3c 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -48,7 +48,7 @@
<stacksSrcLocation>src/main/resources/stacks/${stack.distribution}</stacksSrcLocation>
<tarballResourcesFolder>src/main/resources</tarballResourcesFolder>
<skipPythonTests>false</skipPythonTests>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>false</maven.test.skip>
<hadoop.version>2.7.2</hadoop.version>
<empty.dir>src/main/package</empty.dir> <!-- any directory in project with not very big amount of files (not to waste-load them) -->
<el.log>ALL</el.log> <!-- log level for EclipseLink eclipselink-staticweave-maven-plugin -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
index fb84df5..8dbe691 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapperTest.java
@@ -115,7 +115,7 @@ public class ExecutionCommandWrapperTest {
OrmTestHelper helper = injector.getInstance(OrmTestHelper.class);
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster1);
- cluster1.addService("HDFS", repositoryVersion);
+ cluster1.addService(null, "HDFS", "", repositoryVersion);
SERVICE_SITE_CLUSTER = new HashMap<>();
SERVICE_SITE_CLUSTER.put(SERVICE_SITE_NAME1, SERVICE_SITE_VAL1);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
index 96269f8..22f23c8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/actionmanager/TestActionSchedulerThreading.java
@@ -108,7 +108,7 @@ public class TestActionSchedulerThreading {
// add a service
String serviceName = "ZOOKEEPER";
RepositoryVersionEntity repositoryVersion = ormTestHelper.getOrCreateRepositoryVersion(cluster);
- Service service = cluster.addService(serviceName, repositoryVersion);
+ Service service = cluster.addService(null, serviceName, "", repositoryVersion);
String configType = "zoo.cfg";
Map<String, String> properties = new HashMap<>();
@@ -118,7 +118,7 @@ public class TestActionSchedulerThreading {
// zoo-cfg for v1 on current stack
properties.put("foo-property-1", "foo-value-1");
- Config c1 = configFactory.createNew(stackId, cluster, configType, "version-1", properties, propertiesAttributes);
+ Config c1 = configFactory.createNew(stackId, cluster, configType, "version-1", properties, propertiesAttributes, 1L);
// make v1 "current"
cluster.addDesiredConfig("admin", Sets.newHashSet(c1), "note-1");
@@ -129,7 +129,7 @@ public class TestActionSchedulerThreading {
// save v2
// zoo-cfg for v2 on new stack
properties.put("foo-property-2", "foo-value-2");
- Config c2 = configFactory.createNew(newStackId, cluster, configType, "version-2", properties, propertiesAttributes);
+ Config c2 = configFactory.createNew(newStackId, cluster, configType, "version-2", properties, propertiesAttributes, 1L);
// make v2 "current"
cluster.addDesiredConfig("admin", Sets.newHashSet(c2), "note-2");
@@ -167,7 +167,7 @@ public class TestActionSchedulerThreading {
threadInitialCachingSemaphore.acquire();
// apply the configs for the old stack
- cluster.applyLatestConfigurations(stackId, serviceName);
+ cluster.applyLatestConfigurations(stackId, 1L);
// wake the thread up and have it verify that it can see the updated configs
applyLatestConfigsSemaphore.release();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
index b3c4e26..8a6025f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
@@ -1310,6 +1310,6 @@ public class HeartbeatProcessorTest {
*/
private Service addService(Cluster cluster, String serviceName) throws AmbariException {
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- return cluster.addService(serviceName, repositoryVersion);
+ return cluster.addService(null, serviceName, "", repositoryVersion);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index 20ff949..eecb92e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -1575,7 +1575,7 @@ public class TestHeartbeatHandler {
*/
private Service addService(Cluster cluster, String serviceName) throws AmbariException {
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- return cluster.addService(serviceName, repositoryVersion);
+ return cluster.addService(null, serviceName, "", repositoryVersion);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index 374774a..4f8c423 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -173,7 +173,7 @@ public class TestHeartbeatMonitor {
clusters.mapAndPublishHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName, repositoryVersion);
+ Service hdfs = cluster.addService(null, serviceName, "", repositoryVersion);
hdfs.addServiceComponent(Role.DATANODE.name());
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1);
hdfs.addServiceComponent(Role.NAMENODE.name());
@@ -275,7 +275,7 @@ public class TestHeartbeatMonitor {
clusters.mapAndPublishHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName, repositoryVersion);
+ Service hdfs = cluster.addService(null, serviceName, "", repositoryVersion);
hdfs.addServiceComponent(Role.DATANODE.name());
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost
(hostname1);
@@ -382,7 +382,7 @@ public class TestHeartbeatMonitor {
clusters.mapAndPublishHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName, repositoryVersion);
+ Service hdfs = cluster.addService(null, serviceName, "", repositoryVersion);
hdfs.addServiceComponent(Role.DATANODE.name());
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1);
hdfs.addServiceComponent(Role.NAMENODE.name());
@@ -463,7 +463,7 @@ public class TestHeartbeatMonitor {
clusters.mapAndPublishHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName, repositoryVersion);
+ Service hdfs = cluster.addService(null, serviceName, "", repositoryVersion);
hdfs.addServiceComponent(Role.DATANODE.name());
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1);
hdfs.addServiceComponent(Role.NAMENODE.name());
@@ -581,7 +581,7 @@ public class TestHeartbeatMonitor {
clusters.mapAndPublishHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName, repositoryVersion);
+ Service hdfs = cluster.addService(null, serviceName, "", repositoryVersion);
hdfs.addServiceComponent(Role.DATANODE.name());
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java
index b47a25d..3d44c55 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRendererTest.java
@@ -155,9 +155,9 @@ public class ClusterBlueprintRendererTest {
groupInfoMap.put("host_group_1", group1Info);
groupInfoMap.put("host_group_2", group2Info);
- expect(topology.isNameNodeHAEnabled()).andReturn(false).anyTimes();
+ expect(topology.isNameNodeHAEnabled(null)).andReturn(false).anyTimes();
expect(topology.getConfiguration()).andReturn(clusterConfig).anyTimes();
- expect(topology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(topology.getBlueprint()).andReturn(null).anyTimes();
expect(topology.getHostGroupInfo()).andReturn(groupInfoMap).anyTimes();
expect(blueprint.getStack()).andReturn(stack).anyTimes();
expect(blueprint.getHostGroups()).andReturn(hostGroups).anyTimes();
@@ -207,9 +207,9 @@ public class ClusterBlueprintRendererTest {
groupInfoMap.put("host_group_1", group1Info);
groupInfoMap.put("host_group_2", group2Info);
- expect(topology.isNameNodeHAEnabled()).andReturn(false).anyTimes();
+ expect(topology.isNameNodeHAEnabled(null)).andReturn(false).anyTimes();
expect(topology.getConfiguration()).andReturn(clusterConfig).anyTimes();
- expect(topology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(topology.getBlueprint()).andReturn(null).anyTimes();
expect(topology.getHostGroupInfo()).andReturn(groupInfoMap).anyTimes();
expect(topology.getClusterId()).andReturn(new Long(1)).anyTimes();
expect(topology.getAmbariContext()).andReturn(ambariContext).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
index e4285d0..52b3219 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
@@ -92,13 +92,13 @@ public class ComponentServiceTest extends BaseServiceTest {
private String m_componentId;
private TestComponentService(String clusterId, String serviceId, String componentId) {
- super(clusterId, serviceId);
+ super(null, null, null);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_componentId = componentId;
}
- @Override
+
ResourceInstance createComponentResource(String clusterName, String serviceName, String componentName) {
assertEquals(m_clusterId, clusterName);
assertEquals(m_serviceId, serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
index 679e645..1080f73 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
@@ -60,7 +60,7 @@ public class ConfigurationServiceTest extends BaseServiceTest {
m_clusterId = clusterId;
}
- @Override
+
ResourceInstance createConfigurationResource(String clusterName) {
assertEquals(m_clusterId, clusterName);
return getTestResource();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
index a5bb5e7..b8384a6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
@@ -133,26 +133,26 @@ public class ServiceServiceTest extends BaseServiceTest {
private String m_artifact_id;
private TestServiceService(String clusterId, String serviceId) {
- super(clusterId);
+ super(clusterId, serviceId);
m_clusterId = clusterId;
m_serviceId = serviceId;
}
private TestServiceService(String clusterId, String serviceId, String artifactId) {
- super(clusterId);
+ super(clusterId, serviceId);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_artifact_id = artifactId;
}
- @Override
+
ResourceInstance createServiceResource(String clusterName, String serviceName) {
assertEquals(m_clusterId, clusterName);
assertEquals(m_serviceId, serviceName);
return getTestResource();
}
- @Override
+
ResourceInstance createArtifactResource(String clusterName, String serviceName, String artifactName) {
assertEquals(m_clusterId, clusterName);
assertEquals(m_serviceId, serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessorTest.java
index bc82999..8a5dec4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorBlueprintProcessorTest.java
@@ -75,7 +75,7 @@ public class StackAdvisorBlueprintProcessorTest {
// GIVEN
Map<String, Map<String, String>> props = createProps();
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
@@ -110,7 +110,7 @@ public class StackAdvisorBlueprintProcessorTest {
// GIVEN
Map<String, Map<String, String>> props = createProps();
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
@@ -146,7 +146,7 @@ public class StackAdvisorBlueprintProcessorTest {
Map<String, Map<String, String>> props = createProps();
props.get("core-site").put("dummyKey3", "stackDefaultValue");
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
@@ -180,7 +180,7 @@ public class StackAdvisorBlueprintProcessorTest {
// GIVEN
Map<String, Map<String, String>> props = createProps();
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
@@ -213,7 +213,7 @@ public class StackAdvisorBlueprintProcessorTest {
// GIVEN
Map<String, Map<String, String>> props = createProps();
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
@@ -242,7 +242,7 @@ public class StackAdvisorBlueprintProcessorTest {
// GIVEN
Map<String, Map<String, String>> props = createProps();
Map<String, AdvisedConfiguration> advisedConfigurations = new HashMap<>();
- expect(clusterTopology.getBlueprint()).andReturn(blueprint).anyTimes();
+ expect(clusterTopology.getBlueprint()).andReturn(null).anyTimes();
expect(clusterTopology.getHostGroupInfo()).andReturn(createHostGroupInfo()).anyTimes();
expect(clusterTopology.getAdvisedConfigurations()).andReturn(advisedConfigurations).anyTimes();
expect(clusterTopology.getConfiguration()).andReturn(configuration).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
index 0e57966..6d5189b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ComponentsInstallationCheckTest.java
@@ -270,12 +270,12 @@ public class ComponentsInstallationCheckTest {
Mockito.when(hcsMetricsMonitor.getHostName()).thenReturn("host3");
// Mock the static method
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2, hcsDataNode3));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("TEZ", "TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS", "METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS", "METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2, hcsDataNode3));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(1L, 1L, 1L, "METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
for (String hostName : hosts.keySet()) {
Mockito.when(clusters.getHost(hostName)).thenReturn(hosts.get(hostName));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
index 4d00644..c79e761 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/checks/ServicesUpCheckTest.java
@@ -276,13 +276,17 @@ public class ServicesUpCheckTest {
allHostComponentSummaries.add(hcsMetricsCollector);
allHostComponentSummaries.add(hcsMetricsMonitor);
+ long clusterId = 1;
+ long serviceGroupId = 1;
+ long serviceId = 1;
+
// Mock the static method
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2, hcsDataNode3));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("HDFS", "ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("TEZ", "TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS", "METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
- Mockito.when(HostComponentSummary.getHostComponentSummaries("AMBARI_METRICS", "METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "NAMENODE")).thenReturn(Arrays.asList(hcsNameNode));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "DATANODE")).thenReturn(Arrays.asList(hcsDataNode1, hcsDataNode2, hcsDataNode3));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "ZKFC")).thenReturn(Arrays.asList(hcsZKFC));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "TEZ_CLIENT")).thenReturn(Arrays.asList(hcsTezClient));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "METRICS_COLLECTOR")).thenReturn(Arrays.asList(hcsMetricsCollector));
+ Mockito.when(HostComponentSummary.getHostComponentSummaries(clusterId, serviceGroupId, serviceId, "METRICS_MONITOR")).thenReturn(Arrays.asList(hcsMetricsMonitor));
// Case 1. Initialize with good values
for (HostComponentSummary hcs : allHostComponentSummaries) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
index 7b8bd8b..040b571 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/RecoveryConfigHelperTest.java
@@ -147,7 +147,7 @@ public class RecoveryConfigHelperTest {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1);
@@ -181,7 +181,7 @@ public class RecoveryConfigHelperTest {
throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1);
@@ -217,7 +217,7 @@ public class RecoveryConfigHelperTest {
throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1);
@@ -257,7 +257,7 @@ public class RecoveryConfigHelperTest {
throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1);
@@ -292,7 +292,7 @@ public class RecoveryConfigHelperTest {
throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1);
@@ -335,7 +335,7 @@ public class RecoveryConfigHelperTest {
RepositoryVersionEntity repositoryVersion = helper.getOrCreateRepositoryVersion(cluster);
// Add HDFS service with DATANODE component to the cluster
- Service hdfs = cluster.addService(HDFS, repositoryVersion);
+ Service hdfs = cluster.addService(null, HDFS, "", repositoryVersion);
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
index 883e891..f1fc7f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelperTest.java
@@ -598,8 +598,8 @@ public class AmbariCustomCommandExecutionHelperTest {
repositoryVersion = repoVersionDAO.merge(repositoryVersion);
// add a repo version associated with a component
- ServiceComponentDesiredStateEntity componentEntity = componentDAO.findByName(cluster.getClusterId(),
- serviceYARN.getName(), componentRM.getName());
+ ServiceComponentDesiredStateEntity componentEntity = componentDAO.findByName(cluster.getClusterId(), serviceYARN.getServiceGroupId(),
+ serviceYARN.getServiceId(), componentRM.getName());
ServiceComponentVersionEntity componentVersionEntity = new ServiceComponentVersionEntity();
componentVersionEntity.setRepositoryVersion(repositoryVersion);
@@ -688,8 +688,9 @@ public class AmbariCustomCommandExecutionHelperTest {
private void createService(String clusterName, String serviceName,
RepositoryVersionEntity repositoryVersion) throws AmbariException, AuthorizationException {
- ServiceRequest r1 = new ServiceRequest(clusterName, serviceName,
- repositoryVersion.getId(), null, "false");
+
+ ServiceRequest r1 = new ServiceRequest(clusterName, "", serviceName,
+ repositoryVersion.getId(), null, null);
Set<ServiceRequest> requests = new HashSet<>();
requests.add(r1);
@@ -705,7 +706,7 @@ public class AmbariCustomCommandExecutionHelperTest {
if (desiredState != null) {
dStateStr = desiredState.toString();
}
- ServiceComponentRequest r = new ServiceComponentRequest(clusterName,
+ ServiceComponentRequest r = new ServiceComponentRequest(clusterName, "",
serviceName, componentName, dStateStr);
Set<ServiceComponentRequest> requests =
new HashSet<>();
@@ -719,7 +720,7 @@ public class AmbariCustomCommandExecutionHelperTest {
if (desiredState != null) {
dStateStr = desiredState.toString();
}
- ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName,
+ ServiceComponentHostRequest r = new ServiceComponentHostRequest(clusterName, "",
serviceName, componentName, hostname, dStateStr);
Set<ServiceComponentHostRequest> requests =
new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f176845/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
index a5f83af..e56bc9b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerImplTest.java
@@ -360,7 +360,7 @@ public class AmbariManagementControllerImplTest {
ComponentInfo compInfo = createNiceMock(ComponentInfo.class);
expect(serviceInfo.getClientComponent()).andReturn(compInfo);
expect(compInfo.getName()).andReturn("component");
- expect(component.getServiceComponentHosts()).andReturn(Collections.singletonMap("host", null));
+ expect(component.getServiceComponentHosts()).andReturn(new HashMap<String, ServiceComponentHost>());
expect(ambariMetaInfo.getService("stack", "1.0", "service")).andReturn(serviceInfo);
replay(injector, cluster, service, component, serviceInfo, compInfo, ambariMetaInfo, stackId);
@@ -385,7 +385,7 @@ public class AmbariManagementControllerImplTest {
expect(service.getName()).andReturn("service");
expect(service.getServiceComponent("component")).andThrow(
- new ServiceComponentNotFoundException("cluster", "service", "component"));
+ new ServiceComponentNotFoundException("cluster", "service", "component", "", ""));
expect(service.getDesiredStackId()).andReturn(stackId);
expect(stackId.getStackName()).andReturn("stack");
expect(stackId.getStackVersion()).andReturn("1.0");
@@ -395,7 +395,7 @@ public class AmbariManagementControllerImplTest {
expect(service.getServiceComponents()).andReturn(componentsMap);
expect(component1.getServiceComponentHosts()).andReturn(Collections.emptyMap());
expect(component2.getServiceComponentHosts()).andReturn(
- Collections.singletonMap("anyHost", null));
+ new HashMap<String, ServiceComponentHost>());
ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class);
ComponentInfo compInfo = createNiceMock(ComponentInfo.class);
@@ -433,7 +433,7 @@ public class AmbariManagementControllerImplTest {
expect(service.getServiceComponents()).andReturn(componentsMap);
expect(component1.getServiceComponentHosts()).andReturn(Collections.emptyMap());
expect(component2.getServiceComponentHosts()).andReturn(
- Collections.singletonMap("anyHost", null));
+ new HashMap<String, ServiceComponentHost>());
ServiceInfo serviceInfo = createNiceMock(ServiceInfo.class);
expect(serviceInfo.getClientComponent()).andReturn(null);
@@ -1044,7 +1044,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
setRequests.add(request1);
@@ -1111,7 +1111,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1177,7 +1177,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
request1.setState("INSTALLED");
@@ -1254,7 +1254,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
request1.setMaintenanceState("ON");
@@ -1338,13 +1338,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host1", null);
+ "cluster1", null, "component2", "host1", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", "host1", null);
+ "cluster1", null, "component3", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1437,13 +1437,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host1", null);
+ "cluster1", null, "component2", "host1", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", "host1", null);
+ "cluster1", null, "component3", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1543,13 +1543,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host1", null);
+ "cluster1", null, "component2", "host1", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", "host1", null);
+ "cluster1", null, "component3", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1592,7 +1592,7 @@ public class AmbariManagementControllerImplTest {
expect(cluster.getServiceByComponentName("component2")).andReturn(service2);
expect(service2.getName()).andReturn("service2");
expect(service2.getServiceComponent("component2")).
- andThrow(new ServiceComponentNotFoundException("cluster1", "service2", "component2"));
+ andThrow(new ServiceComponentNotFoundException("cluster1", "service2", "component2", "", ""));
// expect(ambariMetaInfo.getComponentToService("stackName", "stackVersion", "component3")).andReturn("service1");
expect(cluster.getService("service1")).andReturn(service);
@@ -1653,13 +1653,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", null, null);
+ "cluster1", null, "component1", null, null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host2", null);
+ "cluster1", null, "component2", "host2", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", null, null);
+ "cluster1", null, "component3", null, null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1738,13 +1738,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host1", null);
+ "cluster1", null, "component2", "host1", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", "host1", null);
+ "cluster1", null, "component3", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1793,13 +1793,13 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", "host1", null);
+ "cluster1", null, "component1", "host1", null, null);
ServiceComponentHostRequest request2 = new ServiceComponentHostRequest(
- "cluster1", null, "component2", "host2", null);
+ "cluster1", null, "component2", "host2", null, null);
ServiceComponentHostRequest request3 = new ServiceComponentHostRequest(
- "cluster1", null, "component3", "host1", null);
+ "cluster1", null, "component3", "host1", null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1858,7 +1858,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, "component1", null, null);
+ "cluster1", null, "component1", null, null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();
@@ -1938,7 +1938,7 @@ public class AmbariManagementControllerImplTest {
// requests
ServiceComponentHostRequest request1 = new ServiceComponentHostRequest(
- "cluster1", null, null, null, null);
+ "cluster1", null, null, null, null, null);
Set<ServiceComponentHostRequest> setRequests = new HashSet<>();