You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by tb...@apache.org on 2013/10/29 15:58:36 UTC
[2/3] AMBARI-3604 - Components in API should have 'category' field
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8b0fc1cb/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 6874abb..2206062 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -43,6 +43,7 @@ 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.internal.ComponentResourceProviderTest;
import org.apache.ambari.server.controller.internal.ServiceResourceProviderTest;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
@@ -219,7 +220,7 @@ public class AmbariManagementControllerTest {
Set<ServiceComponentRequest> requests =
new HashSet<ServiceComponentRequest>();
requests.add(r);
- controller.createComponents(requests);
+ ComponentResourceProviderTest.createComponents(controller, requests);
}
private void createServiceComponentHost(String clusterName,
@@ -685,7 +686,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest r =
new ServiceComponentRequest(clusterName, serviceName, null, null, null);
- Set<ServiceComponentResponse> response = controller.getComponents(Collections.singleton(r));
+ Set<ServiceComponentResponse> response = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(1, response.size());
ServiceComponentResponse sc = response.iterator().next();
@@ -712,7 +713,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest(null, null, null, null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for invalid requests");
} catch (Exception e) {
// Expected
@@ -723,7 +724,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest("c1", null, null, null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for invalid requests");
} catch (Exception e) {
// Expected
@@ -734,7 +735,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest("c1", "s1", null, null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for invalid requests");
} catch (Exception e) {
// Expected
@@ -745,7 +746,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest("c1", "s1", "sc1", null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for invalid cluster");
} catch (ParentObjectNotFoundException e) {
// Expected
@@ -760,7 +761,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest("c1", "HDFS", "NAMENODE", null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for invalid service");
} catch (ParentObjectNotFoundException e) {
// Expected
@@ -786,7 +787,7 @@ public class AmbariManagementControllerTest {
set1.add(valid1);
set1.add(valid2);
set1.add(valid3);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
try {
set1.clear();
@@ -796,7 +797,7 @@ public class AmbariManagementControllerTest {
new ServiceComponentRequest("c1", "HDFS", "HDFS_CLIENT", null, null);
set1.add(rInvalid1);
set1.add(rInvalid2);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for dups in requests");
} catch (Exception e) {
// Expected
@@ -810,7 +811,7 @@ public class AmbariManagementControllerTest {
new ServiceComponentRequest("c2", "HDFS", "HDFS_CLIENT", null, null);
set1.add(rInvalid1);
set1.add(rInvalid2);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for multiple clusters");
} catch (Exception e) {
// Expected
@@ -821,7 +822,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest rInvalid =
new ServiceComponentRequest("c1", "HDFS", "NAMENODE", null, null);
set1.add(rInvalid);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
fail("Expected failure for already existing component");
} catch (Exception e) {
// Expected
@@ -867,7 +868,7 @@ public class AmbariManagementControllerTest {
set1.add(valid1);
set1.add(valid2);
set1.add(valid3);
- controller.createComponents(set1);
+ ComponentResourceProviderTest.createComponents(controller, set1);
Assert.assertEquals(1, c1.getService("HDFS").getServiceComponents().size());
Assert.assertEquals(2, c1.getService("MAPREDUCE").getServiceComponents().size());
@@ -1879,7 +1880,7 @@ public class AmbariManagementControllerTest {
ServiceComponentRequest r = new ServiceComponentRequest("c1",
s1.getName(), sc1.getName(), null, null);
- Set<ServiceComponentResponse> resps = controller.getComponents(Collections.singleton(r));
+ Set<ServiceComponentResponse> resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(1, resps.size());
ServiceComponentResponse resp = resps.iterator().next();
@@ -1968,7 +1969,7 @@ public class AmbariManagementControllerTest {
null, null, null);
try {
- controller.getComponents(Collections.singleton(r));
+ ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
fail("Expected failure for invalid cluster");
} catch (Exception e) {
// Expected
@@ -1977,25 +1978,25 @@ public class AmbariManagementControllerTest {
// all comps per cluster
r = new ServiceComponentRequest(c1.getClusterName(),
null, null, null, null);
- Set<ServiceComponentResponse> resps = controller.getComponents(Collections.singleton(r));
+ Set<ServiceComponentResponse> resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(3, resps.size());
// all comps per cluster filter on state
r = new ServiceComponentRequest(c2.getClusterName(),
null, null, null, State.UNINSTALLED.toString());
- resps = controller.getComponents(Collections.singleton(r));
+ resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(4, resps.size());
// all comps for given service
r = new ServiceComponentRequest(c2.getClusterName(),
s5.getName(), null, null, null);
- resps = controller.getComponents(Collections.singleton(r));
+ resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(2, resps.size());
// all comps for given service filter by state
r = new ServiceComponentRequest(c2.getClusterName(),
s4.getName(), null, null, State.INIT.toString());
- resps = controller.getComponents(Collections.singleton(r));
+ resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(1, resps.size());
Assert.assertEquals(sc4.getName(),
resps.iterator().next().getComponentName());
@@ -2003,7 +2004,7 @@ public class AmbariManagementControllerTest {
// get single given comp
r = new ServiceComponentRequest(c2.getClusterName(),
null, sc5.getName(), null, State.INIT.toString());
- resps = controller.getComponents(Collections.singleton(r));
+ resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(1, resps.size());
Assert.assertEquals(sc5.getName(),
resps.iterator().next().getComponentName());
@@ -2011,7 +2012,7 @@ public class AmbariManagementControllerTest {
// get single given comp and given svc
r = new ServiceComponentRequest(c2.getClusterName(),
s4.getName(), sc5.getName(), null, State.INIT.toString());
- resps = controller.getComponents(Collections.singleton(r));
+ resps = ComponentResourceProviderTest.getComponents(controller, Collections.singleton(r));
Assert.assertEquals(1, resps.size());
Assert.assertEquals(sc5.getName(),
resps.iterator().next().getComponentName());
@@ -2026,7 +2027,7 @@ public class AmbariManagementControllerTest {
r3 = new ServiceComponentRequest(c1.getClusterName(),
null, null, null, State.INIT.toString());
reqs.addAll(Arrays.asList(r1, r2, r3));
- resps = controller.getComponents(reqs);
+ resps = ComponentResourceProviderTest.getComponents(controller, reqs);
Assert.assertEquals(7, resps.size());
}
@@ -2796,13 +2797,13 @@ public class AmbariManagementControllerTest {
req1 = new ServiceComponentRequest(clusterName, serviceName1,
sc3.getName(), null, State.INSTALLED.toString());
reqs.add(req1);
- controller.updateComponents(reqs, Collections.<String, String>emptyMap(), true);
+ ComponentResourceProviderTest.updateComponents(controller, reqs, Collections.<String, String>emptyMap(), true);
try {
reqs.clear();
req1 = new ServiceComponentRequest(clusterName, serviceName1,
sc1.getName(), null, State.INIT.toString());
reqs.add(req1);
- controller.updateComponents(reqs, Collections.<String, String>emptyMap(), true);
+ ComponentResourceProviderTest.updateComponents(controller, reqs, Collections.<String, String>emptyMap(), true);
fail("Expected failure for invalid state update");
} catch (Exception e) {
// Expected
@@ -2828,7 +2829,7 @@ public class AmbariManagementControllerTest {
req1 = new ServiceComponentRequest(clusterName, serviceName1,
sc1.getName(), null, State.STARTED.toString());
reqs.add(req1);
- controller.updateComponents(reqs, Collections.<String, String>emptyMap(), true);
+ ComponentResourceProviderTest.updateComponents(controller, reqs, Collections.<String, String>emptyMap(), true);
fail("Expected failure for invalid state update");
} catch (Exception e) {
// Expected
@@ -2859,7 +2860,7 @@ public class AmbariManagementControllerTest {
reqs.add(req1);
reqs.add(req2);
reqs.add(req3);
- RequestStatusResponse trackAction = controller.updateComponents(reqs, Collections.<String, String>emptyMap(), true);
+ RequestStatusResponse trackAction = ComponentResourceProviderTest.updateComponents(controller, reqs, Collections.<String, String>emptyMap(), true);
Assert.assertEquals(State.INSTALLED, s1.getDesiredState());
Assert.assertEquals(State.INSTALLED, sc1.getDesiredState());
@@ -2903,7 +2904,7 @@ public class AmbariManagementControllerTest {
sc2.getName(), null, State.INSTALLED.toString());
reqs.add(req1);
reqs.add(req2);
- trackAction = controller.updateComponents(reqs, Collections.<String, String>emptyMap(), true);
+ trackAction = ComponentResourceProviderTest.updateComponents(controller, reqs, Collections.<String, String>emptyMap(), true);
Assert.assertNull(trackAction);
}
@@ -3891,7 +3892,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName2, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(0, s.getDesiredConfigs().size());
Assert.assertEquals(0, sc1.getDesiredConfigs().size());
@@ -3976,7 +3977,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName1, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(3, s.getDesiredConfigs().size());
Assert.assertEquals(4, sc1.getDesiredConfigs().size());
@@ -4126,7 +4127,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName2, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(0, s.getDesiredConfigs().size());
Assert.assertEquals(0, sc1.getDesiredConfigs().size());
@@ -4211,7 +4212,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName1, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(3, s.getDesiredConfigs().size());
Assert.assertEquals(4, sc1.getDesiredConfigs().size());
@@ -4366,11 +4367,11 @@ public class AmbariManagementControllerTest {
configVersions.put("hdfs-site", "version1");
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName2, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName1, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(2, sc1.getDesiredConfigs().size());
Assert.assertEquals(2, sc2.getDesiredConfigs().size());
@@ -4381,7 +4382,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName2, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
Assert.assertEquals(2, sc2.getDesiredConfigs().size());
Assert.assertEquals("version122", sc2.getDesiredConfigs().get
@@ -4389,7 +4390,7 @@ public class AmbariManagementControllerTest {
scReqs.clear();
scReqs.add(new ServiceComponentRequest(clusterName, serviceName,
componentName1, configVersions, null));
- Assert.assertNull(controller.updateComponents(scReqs, Collections.<String, String>emptyMap(), true));
+ Assert.assertNull(ComponentResourceProviderTest.updateComponents(controller, scReqs, Collections.<String, String>emptyMap(), true));
entityManager.clear();
@@ -7472,7 +7473,7 @@ public class AmbariManagementControllerTest {
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, "YARN", "NODEMANAGER", null, null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, "HDFS", "HDFS_CLIENT", null, null));
- amc.createComponents(serviceComponentRequests);
+ ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);
Set<ServiceComponentHostRequest> componentHostRequests = new HashSet<ServiceComponentHostRequest>();
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, null, "DATANODE", HOST1, null, null));
@@ -7586,7 +7587,7 @@ public class AmbariManagementControllerTest {
serviceComponentRequests.add(new ServiceComponentRequest("c1", "HDFS", "DATANODE", null, null));
serviceComponentRequests.add(new ServiceComponentRequest("c1", "HDFS", "HDFS_CLIENT", null, null));
- amc.createComponents(serviceComponentRequests);
+ ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);
Set<HostRequest> hostRequests = new HashSet<HostRequest>();
hostRequests.add(new HostRequest("host1", "c1", null));
@@ -7779,7 +7780,7 @@ public class AmbariManagementControllerTest {
serviceComponentRequests.add(new ServiceComponentRequest("c1", "HDFS", "SECONDARY_NAMENODE", null, null));
serviceComponentRequests.add(new ServiceComponentRequest("c1", "HDFS", "DATANODE", null, null));
serviceComponentRequests.add(new ServiceComponentRequest("c1", "HDFS", "HDFS_CLIENT", null, null));
- amc.createComponents(serviceComponentRequests);
+ ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);
//Create ServiceComponentHosts
componentHostRequests = new HashSet<ServiceComponentHostRequest>();
@@ -7861,7 +7862,7 @@ public class AmbariManagementControllerTest {
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, "YARN", "RESOURCEMANAGER", null, null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, "YARN", "NODEMANAGER", null, null));
- amc.createComponents(serviceComponentRequests);
+ ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);
Set<HostRequest> hostRequests = new HashSet<HostRequest>();
hostRequests.add(new HostRequest(HOST1, CLUSTER_NAME, null));
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8b0fc1cb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
index a42f89e..1db614d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
@@ -18,7 +18,13 @@
package org.apache.ambari.server.controller.internal;
+import com.google.gson.Gson;
+import com.google.inject.Injector;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.ServiceComponentNotFoundException;
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
import org.apache.ambari.server.controller.RequestStatusResponse;
import org.apache.ambari.server.controller.ServiceComponentRequest;
import org.apache.ambari.server.controller.ServiceComponentResponse;
@@ -28,18 +34,42 @@ import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.easymock.*;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.ComponentInfo;
+import org.apache.ambari.server.state.Service;
+import org.apache.ambari.server.state.ServiceComponent;
+import org.apache.ambari.server.state.ServiceComponentFactory;
+import org.apache.ambari.server.state.ServiceComponentHost;
+import org.apache.ambari.server.state.StackId;
+import org.apache.ambari.server.state.State;
+import org.easymock.Capture;
import org.junit.Assert;
import org.junit.Test;
-import java.util.*;
-
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.easymock.EasyMock.anyBoolean;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Tests for the component resource provider.
@@ -50,14 +80,35 @@ public class ComponentResourceProviderTest {
Resource.Type type = Resource.Type.Component;
AmbariManagementController managementController = createMock(AmbariManagementController.class);
+ Clusters clusters = createNiceMock(Clusters.class);
+ Cluster cluster = createNiceMock(Cluster.class);
+ Service service = createNiceMock(Service.class);
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+ AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
+ ServiceComponentFactory serviceComponentFactory = createNiceMock(ServiceComponentFactory.class);
+ ServiceComponent serviceComponent = createNiceMock(ServiceComponent.class);
+ StackId stackId = createNiceMock(StackId.class);
+
+ expect(managementController.getClusters()).andReturn(clusters);
+ expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo);
+ expect(managementController.getServiceComponentFactory()).andReturn(serviceComponentFactory);
+
+ expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
+ expect(cluster.getService("Service100")).andReturn(service).anyTimes();
+
+ expect(service.getDesiredStackVersion()).andReturn(stackId).anyTimes();
+ expect(service.getName()).andReturn("Service100").anyTimes();
+
+ expect(stackId.getStackName()).andReturn("HDP").anyTimes();
+ expect(stackId.getStackVersion()).andReturn("99").anyTimes();
- managementController.createComponents(
- AbstractResourceProviderTest.Matcher.getComponentRequestSet(
- "Cluster100", "Service100", "Component100", null, null));
+ expect(ambariMetaInfo.isValidServiceComponent("HDP", "99", "Service100", "Component100")).andReturn(true).anyTimes();
+
+ expect(serviceComponentFactory.createNew(service, "Component100")).andReturn(serviceComponent);
// replay
- replay(managementController, response);
+ replay(managementController, response, clusters, cluster, service, stackId, ambariMetaInfo,
+ serviceComponentFactory, serviceComponent);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type,
@@ -84,7 +135,8 @@ public class ComponentResourceProviderTest {
provider.createResources(request);
// verify
- verify(managementController, response);
+ verify(managementController, response, clusters, cluster, service, stackId, ambariMetaInfo,
+ serviceComponentFactory, serviceComponent);
}
@Test
@@ -92,19 +144,45 @@ public class ComponentResourceProviderTest {
Resource.Type type = Resource.Type.Component;
AmbariManagementController managementController = createMock(AmbariManagementController.class);
-
- Set<ServiceComponentResponse> allResponse = new HashSet<ServiceComponentResponse>();
- allResponse.add(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component100", null, null, ""));
- allResponse.add(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component101", null, null, ""));
- allResponse.add(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component102", null, null, ""));
+ Clusters clusters = createNiceMock(Clusters.class);
+ Cluster cluster = createNiceMock(Cluster.class);
+ AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
+ Service service = createNiceMock(Service.class);
+ ServiceComponent serviceComponent1 = createNiceMock(ServiceComponent.class);
+ ServiceComponent serviceComponent2 = createNiceMock(ServiceComponent.class);
+ ServiceComponent serviceComponent3 = createNiceMock(ServiceComponent.class);
+ StackId stackId = createNiceMock(StackId.class);
+ ComponentInfo componentInfo = createNiceMock(ComponentInfo.class);
+
+
+ Map<String, ServiceComponent> serviceComponentMap = new HashMap<String, ServiceComponent>();
+ serviceComponentMap.put("Component101", serviceComponent1);
+ serviceComponentMap.put("Component102", serviceComponent2);
+ serviceComponentMap.put("Component103", serviceComponent3);
// set expectations
- expect(managementController.getComponents(
- AbstractResourceProviderTest.Matcher.getComponentRequestSet(
- "Cluster100", null, null, null, null))).andReturn(allResponse).once();
+ expect(managementController.getClusters()).andReturn(clusters);
+ expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo);
+ expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
+ expect(cluster.getDesiredStackVersion()).andReturn(stackId);
+
+ expect(cluster.getServices()).andReturn(Collections.singletonMap("Service100", service)).anyTimes();
+
+ expect(service.getServiceComponents()).andReturn(serviceComponentMap).anyTimes();
+
+ expect(serviceComponent1.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component100", null, null, ""));
+ expect(serviceComponent2.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component101", null, null, ""));
+ expect(serviceComponent3.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component102", null, null, ""));
+
+
+ expect(ambariMetaInfo.getComponentCategory((String) anyObject(), (String) anyObject(),
+ (String) anyObject(), (String) anyObject())).andReturn(componentInfo).anyTimes();
+
+ expect(componentInfo.getCategory()).andReturn("MASTER").anyTimes();
// replay
- replay(managementController);
+ replay(managementController, clusters, cluster, ambariMetaInfo, service,
+ serviceComponent1, serviceComponent2, serviceComponent3, stackId, componentInfo);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type,
@@ -116,6 +194,7 @@ public class ComponentResourceProviderTest {
propertyIds.add(ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID);
propertyIds.add(ComponentResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID);
+ propertyIds.add(ComponentResourceProvider.COMPONENT_CATEGORY_PROPERTY_ID);
Predicate predicate = new PredicateBuilder().property(ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID).
equals("Cluster100").toPredicate();
@@ -123,20 +202,17 @@ public class ComponentResourceProviderTest {
Set<Resource> resources = provider.getResources(request, predicate);
Assert.assertEquals(3, resources.size());
- Set<String> names = new HashSet<String>();
for (Resource resource : resources) {
String clusterName = (String) resource.getPropertyValue(
ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID);
Assert.assertEquals("Cluster100", clusterName);
- names.add((String) resource.getPropertyValue(ComponentResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID));
- }
- // Make sure that all of the response objects got moved into resources
- for (ServiceComponentResponse response : allResponse ) {
- Assert.assertTrue(names.contains(response.getComponentName()));
+ Assert.assertEquals("MASTER", resource.getPropertyValue(
+ ComponentResourceProvider.COMPONENT_CATEGORY_PROPERTY_ID));
}
// verify
- verify(managementController);
+ verify(managementController, clusters, cluster, ambariMetaInfo, service,
+ serviceComponent1, serviceComponent2, serviceComponent3, stackId, componentInfo);
}
@Test
@@ -144,23 +220,75 @@ public class ComponentResourceProviderTest {
Resource.Type type = Resource.Type.Component;
AmbariManagementController managementController = createMock(AmbariManagementController.class);
- RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+ Clusters clusters = createNiceMock(Clusters.class);
+ Cluster cluster = createNiceMock(Cluster.class);
+ AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
+ Service service = createNiceMock(Service.class);
+ ServiceComponent serviceComponent1 = createNiceMock(ServiceComponent.class);
+ ServiceComponent serviceComponent2 = createNiceMock(ServiceComponent.class);
+ ServiceComponent serviceComponent3 = createNiceMock(ServiceComponent.class);
+ ServiceComponentHost serviceComponentHost = createNiceMock(ServiceComponentHost.class);
+ RequestStatusResponse requestStatusResponse = createNiceMock(RequestStatusResponse.class);
+ StackId stackId = createNiceMock(StackId.class);
+
+ Map<String, ServiceComponent> serviceComponentMap = new HashMap<String, ServiceComponent>();
+ serviceComponentMap.put("Component101", serviceComponent1);
+ serviceComponentMap.put("Component102", serviceComponent2);
+ serviceComponentMap.put("Component103", serviceComponent3);
+
+ // set expectations
+ expect(managementController.getClusters()).andReturn(clusters).anyTimes();
+ expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
+ expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
+ expect(cluster.getDesiredStackVersion()).andReturn(stackId);
+
+ expect(cluster.getService("Service100")).andReturn(service).anyTimes();
+ expect(service.getServiceComponent("Component101")).andReturn(serviceComponent1).anyTimes();
+ expect(service.getServiceComponent("Component102")).andReturn(serviceComponent1).anyTimes();
+ expect(service.getServiceComponent("Component103")).andReturn(serviceComponent2).anyTimes();
+
+
+ expect(cluster.getServices()).andReturn(Collections.singletonMap("Service100", service)).anyTimes();
+
+ expect(service.getServiceComponents()).andReturn(serviceComponentMap).anyTimes();
+
+ expect(serviceComponent1.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component101", null, null, ""));
+ expect(serviceComponent2.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component102", null, null, ""));
+ expect(serviceComponent3.convertToResponse()).andReturn(new ServiceComponentResponse(100L, "Cluster100", "Service100", "Component103", null, null, ""));
+ expect(serviceComponent1.getDesiredState()).andReturn(State.INSTALLED).anyTimes();
+ expect(serviceComponent2.getDesiredState()).andReturn(State.INSTALLED).anyTimes();
+ expect(serviceComponent3.getDesiredState()).andReturn(State.INSTALLED).anyTimes();
+
+ expect(serviceComponentHost.getState()).andReturn(State.INSTALLED).anyTimes();
+
+ Map<String, ServiceComponentHost> serviceComponentHosts = Collections.singletonMap("Host100", serviceComponentHost);
+
+ expect(serviceComponent1.getServiceComponentHosts()).andReturn(serviceComponentHosts).anyTimes();
+ expect(serviceComponent2.getServiceComponentHosts()).andReturn(serviceComponentHosts).anyTimes();
+ expect(serviceComponent3.getServiceComponentHosts()).andReturn(serviceComponentHosts).anyTimes();
+
+
+ Capture<Map<String, String>> requestPropertiesCapture = new Capture<Map<String, String>>();
+ Capture<Map<State, List<Service>>> changedServicesCapture = new Capture<Map<State, List<Service>>>();
+ Capture<Map<State, List<ServiceComponent>>> changedCompsCapture = new Capture<Map<State, List<ServiceComponent>>>();
+ Capture<Map<String, Map<State, List<ServiceComponentHost>>>> changedScHostsCapture = new Capture<Map<String, Map<State, List<ServiceComponentHost>>>>();
+ Capture<Map<String, String>> requestParametersCapture = new Capture<Map<String, String>>();
+ Capture<Collection<ServiceComponentHost>> ignoredScHostsCapture = new Capture<Collection<ServiceComponentHost>>();
+ Capture<Cluster> clusterCapture = new Capture<Cluster>();
+
+ expect(managementController.createStages(capture(clusterCapture), capture(requestPropertiesCapture), capture(requestParametersCapture), capture(changedServicesCapture), capture(changedCompsCapture), capture(changedScHostsCapture), capture(ignoredScHostsCapture), anyBoolean(), anyBoolean()
+ )).andReturn(requestStatusResponse);
+
+
Map<String, String> mapRequestProps = new HashMap<String, String>();
mapRequestProps.put("context", "Called from a test");
- Set<ServiceComponentResponse> nameResponse = new HashSet<ServiceComponentResponse>();
- nameResponse.add(new ServiceComponentResponse(102L, "Cluster102", "Service", "Component", null, "1", "STARTED"));
-
- // set expectations
- expect(managementController.getComponents(EasyMock.<Set<ServiceComponentRequest>>anyObject())).
- andReturn(nameResponse).once();
- expect(managementController.updateComponents(
- AbstractResourceProviderTest.Matcher.getComponentRequestSet(
- "Cluster102", "Service", "Component", null, "STARTED"), eq(mapRequestProps), eq(false))).andReturn(response).once();
// replay
- replay(managementController, response);
+ replay(managementController, clusters, cluster, ambariMetaInfo, service,
+ serviceComponent1, serviceComponent2, serviceComponent3, serviceComponentHost,
+ requestStatusResponse, stackId);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type,
@@ -171,17 +299,20 @@ public class ComponentResourceProviderTest {
Map<String, Object> properties = new LinkedHashMap<String, Object>();
properties.put(ComponentResourceProvider.COMPONENT_STATE_PROPERTY_ID, "STARTED");
+ properties.put(ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID, "Cluster100");
// create the request
Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps);
// update the cluster named Cluster102
- Predicate predicate = new PredicateBuilder().property(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID).
- equals("Cluster102").toPredicate();
+ Predicate predicate = new PredicateBuilder().property(ComponentResourceProvider.COMPONENT_CLUSTER_NAME_PROPERTY_ID).
+ equals("Cluster100").toPredicate();
provider.updateResources(request, predicate);
// verify
- verify(managementController, response);
+ verify(managementController, clusters, cluster, ambariMetaInfo, service,
+ serviceComponent1, serviceComponent2, serviceComponent3, serviceComponentHost,
+ requestStatusResponse, stackId);
}
@Test
@@ -189,14 +320,9 @@ public class ComponentResourceProviderTest {
Resource.Type type = Resource.Type.Component;
AmbariManagementController managementController = createMock(AmbariManagementController.class);
- RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
-
- // set expectations
- expect(managementController.deleteComponents(AbstractResourceProviderTest.Matcher.
- getComponentRequestSet(null, null, "Component100", null, null))).andReturn(response);
// replay
- replay(managementController, response);
+ replay(managementController);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type,
@@ -210,17 +336,203 @@ public class ComponentResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(
ComponentResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("Component100").toPredicate();
- provider.deleteResources(predicate);
+ try {
+ provider.deleteResources(predicate);
+ Assert.fail("Expected exception.");
+ } catch (Exception e) {
+ // expected
+ }
+
+ // verify
+ verify(managementController);
+ }
+ @Test
+ public void testGetComponents() throws Exception {
+ // member state mocks
+ AmbariManagementController managementController = createMock(AmbariManagementController.class);
+ Clusters clusters = createNiceMock(Clusters.class);
+ AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
+ StackId stackId = createNiceMock(StackId.class);
+
+ Cluster cluster = createNiceMock(Cluster.class);
+ Service service = createNiceMock(Service.class);
+ ServiceComponent component = createNiceMock(ServiceComponent.class);
+ ServiceComponentResponse response = createNiceMock(ServiceComponentResponse.class);
+
+ // requests
+ ServiceComponentRequest request1 = new ServiceComponentRequest("cluster1", "service1", "component1",
+ Collections.<String, String>emptyMap(), null);
+
+ Set<ServiceComponentRequest> setRequests = new HashSet<ServiceComponentRequest>();
+ setRequests.add(request1);
+
+ // expectations
+ // constructor init
+ expect(managementController.getClusters()).andReturn(clusters).anyTimes();
+ expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
+
+ // getComponents
+ expect(clusters.getCluster("cluster1")).andReturn(cluster);
+ expect(cluster.getService("service1")).andReturn(service);
+ expect(cluster.getDesiredStackVersion()).andReturn(stackId).anyTimes();
+ expect(service.getServiceComponent("component1")).andReturn(component);
+
+ expect(component.convertToResponse()).andReturn(response);
+ // replay mocks
+ replay(clusters, cluster, service, component, response, ambariMetaInfo, stackId, managementController);
+
+ //test
+// AmbariManagementController controller = new AmbariManagementControllerImpl(null, clusters, injector);
+ Set<ServiceComponentResponse> setResponses = getComponentResourceProvider(managementController).getComponents(setRequests);
+
+ // assert and verify
+ assertEquals(1, setResponses.size());
+ assertTrue(setResponses.contains(response));
+
+ verify(clusters, cluster, service, component, response, ambariMetaInfo, stackId, managementController);
+ }
- ResourceProviderEvent lastEvent = observer.getLastEvent();
- Assert.assertNotNull(lastEvent);
- Assert.assertEquals(Resource.Type.Component, lastEvent.getResourceType());
- Assert.assertEquals(ResourceProviderEvent.Type.Delete, lastEvent.getType());
- Assert.assertEquals(predicate, lastEvent.getPredicate());
- Assert.assertNull(lastEvent.getRequest());
+ /**
+ * Ensure that ServiceComponentNotFoundException is handled where there are multiple requests as would be the
+ * case when an OR predicate is provided in the query.
+ */
+ @Test
+ public void testGetComponents___OR_Predicate_ServiceComponentNotFoundException() throws Exception {
+ // member state mocks
+ AmbariManagementController managementController = createMock(AmbariManagementController.class);
+ Clusters clusters = createNiceMock(Clusters.class);
+ AmbariMetaInfo ambariMetaInfo = createNiceMock(AmbariMetaInfo.class);
+ StackId stackId = createNiceMock(StackId.class);
+
+ Cluster cluster = createNiceMock(Cluster.class);
+ Service service = createNiceMock(Service.class);
+ ServiceComponent component1 = createNiceMock(ServiceComponent.class);
+ ServiceComponent component2 = createNiceMock(ServiceComponent.class);
+ ServiceComponentResponse response1 = createNiceMock(ServiceComponentResponse.class);
+ ServiceComponentResponse response2 = createNiceMock(ServiceComponentResponse.class);
+
+ // requests
+ ServiceComponentRequest request1 = new ServiceComponentRequest("cluster1", "service1", "component1",
+ Collections.<String, String>emptyMap(), null);
+ ServiceComponentRequest request2 = new ServiceComponentRequest("cluster1", "service1", "component2",
+ Collections.<String, String>emptyMap(), null);
+ ServiceComponentRequest request3 = new ServiceComponentRequest("cluster1", "service1", "component3",
+ Collections.<String, String>emptyMap(), null);
+ ServiceComponentRequest request4 = new ServiceComponentRequest("cluster1", "service1", "component4",
+ Collections.<String, String>emptyMap(), null);
+
+ Set<ServiceComponentRequest> setRequests = new HashSet<ServiceComponentRequest>();
+ setRequests.add(request1);
+ setRequests.add(request2);
+ setRequests.add(request3);
+ setRequests.add(request4);
+
+ // expectations
+ // constructor init
+ expect(managementController.getClusters()).andReturn(clusters).anyTimes();
+ expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes();
+
+ // getComponents
+ expect(clusters.getCluster("cluster1")).andReturn(cluster).times(4);
+ expect(cluster.getDesiredStackVersion()).andReturn(stackId).anyTimes();
+ expect(cluster.getService("service1")).andReturn(service).times(4);
+
+ expect(service.getServiceComponent("component1")).andThrow(new ServiceComponentNotFoundException("cluster1", "service1", "component1"));
+ expect(service.getServiceComponent("component2")).andThrow(new ServiceComponentNotFoundException("cluster1", "service1", "component2"));
+ expect(service.getServiceComponent("component3")).andReturn(component1);
+ expect(service.getServiceComponent("component4")).andReturn(component2);
+
+ expect(component1.convertToResponse()).andReturn(response1);
+ expect(component2.convertToResponse()).andReturn(response2);
+ // replay mocks
+ replay(clusters, cluster, service, component1, component2, response1, response2, ambariMetaInfo, stackId, managementController);
+
+ //test
+ Set<ServiceComponentResponse> setResponses = getComponentResourceProvider(managementController).getComponents(setRequests);
+
+ // assert and verify
+ assertEquals(2, setResponses.size());
+ assertTrue(setResponses.contains(response1));
+ assertTrue(setResponses.contains(response2));
+
+ verify(clusters, cluster, service, component1, component2, response1, response2, ambariMetaInfo, stackId, managementController);
+ }
- // verify
- verify(managementController, response);
+ public static ComponentResourceProvider getComponentResourceProvider(AmbariManagementController managementController) {
+ Resource.Type type = Resource.Type.Component;
+
+ return (ComponentResourceProvider) AbstractControllerResourceProvider.getResourceProvider(
+ type,
+ PropertyHelper.getPropertyIds(type),
+ PropertyHelper.getKeyPropertyIds(type),
+ managementController);
+ }
+
+ /**
+ * Ensure that ServiceComponentNotFoundException is propagated in case where there is a single request.
+ */
+ @Test
+ public void testGetComponents___ServiceComponentNotFoundException() throws Exception {
+ // member state mocks
+ Injector injector = createStrictMock(Injector.class);
+ Capture<AmbariManagementController> controllerCapture = new Capture<AmbariManagementController>();
+ Clusters clusters = createNiceMock(Clusters.class);
+
+ Cluster cluster = createNiceMock(Cluster.class);
+ Service service = createNiceMock(Service.class);
+
+ // requests
+ ServiceComponentRequest request1 = new ServiceComponentRequest("cluster1", "service1", "component1",
+ Collections.<String, String>emptyMap(), null);
+
+ Set<ServiceComponentRequest> setRequests = new HashSet<ServiceComponentRequest>();
+ setRequests.add(request1);
+
+ // expectations
+ // constructor init
+ injector.injectMembers(capture(controllerCapture));
+ expect(injector.getInstance(Gson.class)).andReturn(null);
+
+ // getComponents
+ expect(clusters.getCluster("cluster1")).andReturn(cluster);
+ expect(cluster.getService("service1")).andReturn(service);
+ expect(service.getServiceComponent("component1")).andThrow(
+ new ServiceComponentNotFoundException("cluster1", "service1", "component1"));
+ // replay mocks
+ replay(injector, clusters, cluster, service);
+
+ //test
+ AmbariManagementController controller = new AmbariManagementControllerImpl(null, clusters, injector);
+
+ // assert that exception is thrown in case where there is a single request
+ try {
+ getComponentResourceProvider(controller).getComponents(setRequests);
+ fail("expected ServiceComponentNotFoundException");
+ } catch (ServiceComponentNotFoundException e) {
+ // expected
+ }
+
+ assertSame(controller, controllerCapture.getValue());
+ verify(injector, clusters, cluster, service);
+ }
+
+ public static void createComponents(AmbariManagementController controller, Set<ServiceComponentRequest> requests) throws AmbariException {
+ ComponentResourceProvider provider = getComponentResourceProvider(controller);
+ provider.createComponents(requests);
+ }
+
+ public static Set<ServiceComponentResponse> getComponents(AmbariManagementController controller,
+ Set<ServiceComponentRequest> requests) throws AmbariException {
+ ComponentResourceProvider provider = getComponentResourceProvider(controller);
+ return provider.getComponents(requests);
+ }
+
+ public static RequestStatusResponse updateComponents(AmbariManagementController controller,
+ Set<ServiceComponentRequest> requests,
+ Map<String, String> requestProperties, boolean runSmokeTest) throws AmbariException
+ {
+ ComponentResourceProvider provider = getComponentResourceProvider(controller);
+ return provider.updateComponents(requests, requestProperties, runSmokeTest);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8b0fc1cb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
index b19d4ce..b15a203 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
@@ -89,7 +89,7 @@ public class JMXHostProviderTest {
Set<ServiceComponentRequest> requests =
new HashSet<ServiceComponentRequest>();
requests.add(r);
- controller.createComponents(requests);
+ ComponentResourceProviderTest.createComponents(controller, requests);
}
private void createServiceComponentHost(String clusterName,