You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/05/23 10:34:30 UTC
[32/49] ambari git commit: AMBARI-20951. Integrate HostService
resource with Swagger
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index ac6ac1d..01dd8e3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -73,6 +73,7 @@ import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostConfig;
import org.apache.ambari.server.state.HostHealthStatus;
import org.apache.ambari.server.state.HostHealthStatus.HealthStatus;
+import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.stack.OsFamily;
@@ -162,7 +163,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
// add properties to the request map
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, "Cluster100");
- properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, "Host100");
+ properties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, "Host100");
propertySet.add(properties);
@@ -244,7 +245,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_MAINTENANCE_STATE_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -329,11 +330,8 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(hostResponse1.getClusterName()).andReturn("").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.HEALTHY.name()).anyTimes();
-
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(),
@@ -348,7 +346,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -443,7 +441,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -483,7 +481,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
Clusters clusters = injector.getInstance(Clusters.class);
Cluster cluster = createMock(Cluster.class);
- HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
ComponentInfo componentInfo = createNiceMock(ComponentInfo.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
@@ -526,11 +523,8 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.UNHEALTHY.name()).anyTimes();
-
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(),
(String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes();
@@ -544,7 +538,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -583,7 +577,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
Clusters clusters = injector.getInstance(Clusters.class);
Cluster cluster = createMock(Cluster.class);
- HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
ResourceProviderFactory resourceProviderFactory = createNiceMock(ResourceProviderFactory.class);
@@ -610,11 +603,8 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.UNKNOWN.name()).anyTimes();
-
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.UNKNOWN).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("UNKNOWN").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("UNKNOWN").anyTimes();
expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(),
EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(hostResourceProvider).anyTimes();
@@ -622,7 +612,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -727,7 +717,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_RECOVERY_REPORT_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_RECOVERY_SUMMARY_PROPERTY_ID);
@@ -810,10 +800,8 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes();
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
expect(hostResponse1.getStatus()).andReturn(HealthStatus.ALERT.name()).anyTimes();
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(ambariMetaInfo.getComponent((String) anyObject(), (String) anyObject(),
(String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes();
expect(componentInfo.getCategory()).andReturn("SLAVE").anyTimes();
@@ -825,7 +813,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<String> propertyIds = new HashSet<>();
propertyIds.add(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID);
- propertyIds.add(HostResourceProvider.HOST_NAME_PROPERTY_ID);
+ propertyIds.add(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID);
propertyIds.add(HostResourceProvider.HOST_HOST_STATUS_PROPERTY_ID);
Predicate predicate = buildPredicate("Cluster100", null);
@@ -883,7 +871,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
Clusters clusters = injector.getInstance(Clusters.class);
Cluster cluster = createMock(Cluster.class);
- HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
ResourceProviderFactory resourceProviderFactory = createNiceMock(ResourceProviderFactory.class);
@@ -915,9 +902,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes();
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(),
EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(hostResourceProvider).anyTimes();
@@ -930,7 +915,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Map<String, Object> properties = new LinkedHashMap<>();
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, "Cluster100");
- properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, "Host100");
+ properties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, "Host100");
properties.put(PropertyHelper.getPropertyId("Hosts.desired_config", "type"), "global");
properties.put(PropertyHelper.getPropertyId("Hosts.desired_config", "tag"), "version1");
properties.put(PropertyHelper.getPropertyId("Hosts.desired_config.properties", "a"), "b");
@@ -975,7 +960,6 @@ public class HostResourceProviderTest extends EasyMockSupport {
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
Clusters clusters = injector.getInstance(Clusters.class);
Cluster cluster = createMock(Cluster.class);
- HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
ResourceProviderFactory resourceProviderFactory = createNiceMock(ResourceProviderFactory.class);
@@ -1008,9 +992,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
expect(cluster.getDesiredConfigs()).andReturn(new HashMap<String, DesiredConfig>()).anyTimes();
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
expect(resourceProviderFactory.getHostResourceProvider(EasyMock.<Set<String>>anyObject(),
EasyMock.<Map<Resource.Type, String>>anyObject(),
eq(managementController))).andReturn(hostResourceProvider).anyTimes();
@@ -1147,7 +1129,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Set<Cluster> setCluster = Collections.singleton(cluster);
// requests
- HostRequest request1 = new HostRequest("host1", "cluster1", Collections.<String, String>emptyMap());
+ HostRequest request1 = new HostRequest("host1", "cluster1");
Set<HostRequest> setRequests = new HashSet<>();
setRequests.add(request1);
@@ -1193,7 +1175,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Cluster cluster = createMock(Cluster.class);
// requests
- HostRequest request1 = new HostRequest("host1", "cluster1", Collections.<String, String>emptyMap());
+ HostRequest request1 = new HostRequest("host1", "cluster1");
Set<HostRequest> setRequests = Collections.singleton(request1);
// expectations
@@ -1224,7 +1206,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Host host = createNiceMock(Host.class);
// requests
- HostRequest request1 = new HostRequest("host1", "cluster1", Collections.<String, String>emptyMap());
+ HostRequest request1 = new HostRequest("host1", "cluster1");
Set<HostRequest> setRequests = Collections.singleton(request1);
// expectations
@@ -1264,10 +1246,10 @@ public class HostResourceProviderTest extends EasyMockSupport {
HostResponse response2 = createNiceMock(HostResponse.class);
// requests
- HostRequest request1 = new HostRequest("host1", "cluster1", Collections.<String, String>emptyMap());
- HostRequest request2 = new HostRequest("host2", "cluster1", Collections.<String, String>emptyMap());
- HostRequest request3 = new HostRequest("host3", "cluster1", Collections.<String, String>emptyMap());
- HostRequest request4 = new HostRequest("host4", "cluster1", Collections.<String, String>emptyMap());
+ HostRequest request1 = new HostRequest("host1", "cluster1");
+ HostRequest request2 = new HostRequest("host2", "cluster1");
+ HostRequest request3 = new HostRequest("host3", "cluster1");
+ HostRequest request4 = new HostRequest("host4", "cluster1");
Set<HostRequest> setRequests = new HashSet<>();
setRequests.add(request1);
@@ -1321,7 +1303,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
for (HostRequest request : requests) {
Map<String, Object> requestProperties = new HashMap<>();
- requestProperties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, request.getHostname());
+ requestProperties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, request.getHostname());
requestProperties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, request.getClusterName());
properties.add(requestProperties);
}
@@ -1409,8 +1391,8 @@ public class HostResourceProviderTest extends EasyMockSupport {
String status, String recoverySummary, RecoveryReport recoveryReport) {
Host host = createMock(Host.class);
HostHealthStatus hostHealthStatus = new HostHealthStatus(HealthStatus.HEALTHY, "");
- HostResponse hostResponse = new HostResponse(hostName, clusterName, null, null, 1, 1, null,
- "centos6", null, 1024, 1024, null, 1, 1, null, null, null, hostHealthStatus, "HEALTHY", status);
+ HostResponse hostResponse = new HostResponse(hostName, clusterName, null, 1, 1, null,
+ "centos6", 1024, null, 1, 1, null, null, null, hostHealthStatus, HostState.HEALTHY, status);
hostResponse.setRecoverySummary(recoverySummary);
hostResponse.setRecoveryReport(recoveryReport);
@@ -1434,11 +1416,11 @@ public class HostResourceProviderTest extends EasyMockSupport {
PredicateBuilder builder = new PredicateBuilder();
if (clusterName != null && hostName != null) {
return builder.property(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID).equals(clusterName)
- .and().property(HostResourceProvider.HOST_NAME_PROPERTY_ID).equals(hostName).toPredicate();
+ .and().property(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID).equals(hostName).toPredicate();
}
return clusterName != null ?
builder.property(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID).equals(clusterName).toPredicate() :
- builder.property(HostResourceProvider.HOST_NAME_PROPERTY_ID).equals(hostName).toPredicate();
+ builder.property(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID).equals(hostName).toPredicate();
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
index f15c9f2..cbf891b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProviderTest.java
@@ -43,7 +43,6 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
-import org.apache.ambari.server.state.HostHealthStatus;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -57,7 +56,6 @@ public class RootServiceHostComponentResourceProviderTest {
Clusters clusters = createNiceMock(Clusters.class);
Cluster cluster = createNiceMock(Cluster.class);
Host host1 = createNiceMock(Host.class);
- HostHealthStatus healthStatus = createNiceMock(HostHealthStatus.class);
HostResponse hostResponse1 = createNiceMock(HostResponse.class);
@@ -92,16 +90,13 @@ public class RootServiceHostComponentResourceProviderTest {
expect(hostResponse1.getClusterName()).andReturn("Cluster100").anyTimes();
expect(hostResponse1.getHostname()).andReturn("Host100").anyTimes();
- expect(hostResponse1.getHealthStatus()).andReturn(healthStatus).anyTimes();
-
- expect(healthStatus.getHealthStatus()).andReturn(HostHealthStatus.HealthStatus.HEALTHY).anyTimes();
- expect(healthStatus.getHealthReport()).andReturn("HEALTHY").anyTimes();
+ expect(hostResponse1.getHealthReport()).andReturn("HEALTHY").anyTimes();
// replay
replay(managementController, clusters, cluster,
host1,
hostResponse1,
- healthStatus, factory, response);
+ factory, response);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
@@ -129,7 +124,7 @@ public class RootServiceHostComponentResourceProviderTest {
verify(managementController, clusters, cluster,
host1,
hostResponse1,
- healthStatus, factory, response);
+ factory, response);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
index 48d1351..c5d17bd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ScaleClusterRequestTest.java
@@ -341,8 +341,8 @@ public class ScaleClusterRequestTest {
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, GROUP1_NAME);
- properties.put(HostResourceProvider.HOST_NAME_NO_CATEGORY_PROPERTY_ID, HOST1_NAME);
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, GROUP1_NAME);
+ properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, HOST1_NAME);
return properties;
}
@@ -352,7 +352,7 @@ public class ScaleClusterRequestTest {
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, GROUP2_NAME);
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, GROUP2_NAME);
properties.put(HostResourceProvider.HOST_COUNT_PROPERTY_ID, 1);
return properties;
@@ -363,7 +363,7 @@ public class ScaleClusterRequestTest {
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, GROUP3_NAME);
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, GROUP3_NAME);
properties.put(HostResourceProvider.HOST_COUNT_PROPERTY_ID, 1);
properties.put(HostResourceProvider.HOST_PREDICATE_PROPERTY_ID, PREDICATE);
@@ -375,7 +375,7 @@ public class ScaleClusterRequestTest {
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, GROUP3_NAME);
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, GROUP3_NAME);
properties.put(HostResourceProvider.HOST_COUNT_PROPERTY_ID, 2);
return properties;
@@ -386,8 +386,8 @@ public class ScaleClusterRequestTest {
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, clusterName);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, blueprintName);
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, GROUP1_NAME);
- properties.put(HostResourceProvider.HOST_NAME_NO_CATEGORY_PROPERTY_ID, HOST2_NAME);
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, GROUP1_NAME);
+ properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, HOST2_NAME);
return properties;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e13b018/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
index 2d5978b..10406f1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/TopologyManagerTest.java
@@ -534,8 +534,8 @@ public class TopologyManagerTest {
public void testScaleHosts__alreadyExistingHost() throws InvalidTopologyTemplateException, InvalidTopologyException, AmbariException, NoSuchStackException {
HashSet<Map<String, Object>> propertySet = new HashSet<>();
Map<String,Object> properties = new TreeMap<>();
- properties.put(HostResourceProvider.HOST_NAME_PROPERTY_ID, "host1");
- properties.put(HostResourceProvider.HOSTGROUP_PROPERTY_ID, "group1");
+ properties.put(HostResourceProvider.HOST_HOST_NAME_PROPERTY_ID, "host1");
+ properties.put(HostResourceProvider.HOST_GROUP_PROPERTY_ID, "group1");
properties.put(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID, CLUSTER_NAME);
properties.put(HostResourceProvider.BLUEPRINT_PROPERTY_ID, BLUEPRINT_NAME);
propertySet.add(properties);