Repository: ambari Updated Branches: refs/heads/trunk e81706fc0 -> ac8641fb3
http://git-wip-us.apache.org/repos/asf/ambari/blob/ac8641fb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java index 99a1120..6d94183 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java @@ -21,6 +21,9 @@ package org.apache.ambari.server.controller.internal; import com.google.gson.Gson; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.api.services.AmbariMetaInfo; +import org.apache.ambari.server.controller.AmbariManagementController; +import org.apache.ambari.server.controller.StackServiceRequest; +import org.apache.ambari.server.controller.StackServiceResponse; import org.apache.ambari.server.controller.predicate.EqualsPredicate; import org.apache.ambari.server.controller.spi.NoSuchParentResourceException; import org.apache.ambari.server.controller.spi.NoSuchResourceException; @@ -99,7 +102,9 @@ public class BlueprintResourceProviderTest { public void testCreateResources() throws AmbariException, ResourceAlreadyExistsException, SystemException, UnsupportedPropertyException, NoSuchParentResourceException { + AmbariManagementController managementController = createMock(AmbariManagementController.class); Request request = createMock(Request.class); + Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>(); Map<String, ServiceInfo> services = new HashMap<String, ServiceInfo>(); ServiceInfo service = new ServiceInfo(); @@ -120,6 +125,8 @@ public class BlueprintResourceProviderTest { Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>(); // set expectations + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn( + Collections.<StackServiceResponse>emptySet()); expect(request.getProperties()).andReturn(setProperties); expect(dao.findByName(BLUEPRINT_NAME)).andReturn(null); expect(metaInfo.getServices("test-stack-name", "test-stack-version")).andReturn(services).anyTimes(); @@ -133,10 +140,15 @@ public class BlueprintResourceProviderTest { Collections.<String, org.apache.ambari.server.state.PropertyInfo>emptyMap()).anyTimes(); dao.create(capture(entityCapture)); - replay(dao, metaInfo, request); + replay(dao, metaInfo, request, managementController); // end expectations - ResourceProvider provider = createProvider(); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( + Resource.Type.Blueprint, + PropertyHelper.getPropertyIds(Resource.Type.Blueprint), + PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint), + managementController); + AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver(); ((ObservableResourceProvider)provider).addObserver(observer); @@ -151,7 +163,7 @@ public class BlueprintResourceProviderTest { validateEntity(entityCapture.getValue(), false); - verify(dao, metaInfo, request); + verify(dao, metaInfo, request, managementController); } @Test @@ -160,6 +172,8 @@ public class BlueprintResourceProviderTest { Set<Map<String, Object>> setProperties = getTestProperties(); setConfigurationProperties(setProperties); + AmbariManagementController managementController = createMock(AmbariManagementController.class); + Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>(); Request request = createMock(Request.class); Map<String, ServiceInfo> services = new HashMap<String, ServiceInfo>(); @@ -178,6 +192,8 @@ public class BlueprintResourceProviderTest { Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>(); // set expectations + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn( + Collections.<StackServiceResponse>emptySet()); expect(request.getProperties()).andReturn(setProperties); expect(dao.findByName(BLUEPRINT_NAME)).andReturn(null); expect(metaInfo.getServices("test-stack-name", "test-stack-version")).andReturn(services).anyTimes(); @@ -191,10 +207,15 @@ public class BlueprintResourceProviderTest { Collections.<String, org.apache.ambari.server.state.PropertyInfo>emptyMap()).anyTimes(); dao.create(capture(entityCapture)); - replay(dao, metaInfo, request); + replay(dao, metaInfo, request, managementController); // end expectations - ResourceProvider provider = createProvider(); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( + Resource.Type.Blueprint, + PropertyHelper.getPropertyIds(Resource.Type.Blueprint), + PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint), + managementController); + AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver(); ((ObservableResourceProvider)provider).addObserver(observer); @@ -209,7 +230,7 @@ public class BlueprintResourceProviderTest { validateEntity(entityCapture.getValue(), true); - verify(dao, metaInfo, request); + verify(dao, metaInfo, request, managementController); } @Test @@ -490,6 +511,8 @@ public class BlueprintResourceProviderTest { SystemException, UnsupportedPropertyException, NoSuchParentResourceException { Request request = createMock(Request.class); + AmbariManagementController managementController = createMock(AmbariManagementController.class); + Capture<Set<StackServiceRequest>> stackServiceRequestCapture = new Capture<Set<StackServiceRequest>>(); Map<String, ServiceInfo> services = new HashMap<String, ServiceInfo>(); ServiceInfo service = new ServiceInfo(); @@ -512,6 +535,8 @@ public class BlueprintResourceProviderTest { Capture<BlueprintEntity> entityCapture = new Capture<BlueprintEntity>(); // set expectations + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn( + Collections.<StackServiceResponse>emptySet()); expect(request.getProperties()).andReturn(setProperties); expect(dao.findByName(BLUEPRINT_NAME)).andReturn(null); expect(metaInfo.getServices("test-stack-name", "test-stack-version")).andReturn(services).anyTimes(); @@ -524,10 +549,15 @@ public class BlueprintResourceProviderTest { dao.create(capture(entityCapture)); - replay(dao, metaInfo, request); + replay(dao, metaInfo, request, managementController); // end expectations - ResourceProvider provider = createProvider(); + ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider( + Resource.Type.Blueprint, + PropertyHelper.getPropertyIds(Resource.Type.Blueprint), + PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint), + managementController); + AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver(); ((ObservableResourceProvider)provider).addObserver(observer); @@ -540,7 +570,7 @@ public class BlueprintResourceProviderTest { assertEquals(request, lastEvent.getRequest()); assertNull(lastEvent.getPredicate()); - verify(dao, metaInfo, request); + verify(dao, metaInfo, request, managementController); } private Set<Map<String, Object>> getTestProperties() { @@ -715,7 +745,8 @@ public class BlueprintResourceProviderTest { private BlueprintResourceProvider createProvider() { return new BlueprintResourceProvider( PropertyHelper.getPropertyIds(Resource.Type.Blueprint), - PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint)); + PropertyHelper.getKeyPropertyIds(Resource.Type.Blueprint), + null); } private BlueprintEntity createEntity(Map<String, Object> properties) { http://git-wip-us.apache.org/repos/asf/ambari/blob/ac8641fb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java index 9f51ac7..913abac 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java @@ -59,7 +59,6 @@ import org.apache.ambari.server.controller.StackServiceComponentRequest; import org.apache.ambari.server.controller.StackServiceComponentResponse; import org.apache.ambari.server.controller.StackServiceRequest; import org.apache.ambari.server.controller.StackServiceResponse; -import org.apache.ambari.server.controller.internal.ClusterResourceProvider.HostGroup; import org.apache.ambari.server.controller.internal.ClusterResourceProvider.PropertyUpdater; import org.apache.ambari.server.controller.spi.Predicate; import org.apache.ambari.server.controller.spi.Request; @@ -68,12 +67,14 @@ 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.apache.ambari.server.controller.internal.BaseBlueprintProcessor.HostGroup; import org.apache.ambari.server.orm.dao.BlueprintDAO; import org.apache.ambari.server.orm.entities.BlueprintConfigEntity; import org.apache.ambari.server.orm.entities.BlueprintEntity; import org.apache.ambari.server.orm.entities.HostGroupComponentEntity; import org.apache.ambari.server.orm.entities.HostGroupConfigEntity; import org.apache.ambari.server.orm.entities.HostGroupEntity; +import org.apache.ambari.server.state.DependencyInfo; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.State; import org.apache.commons.collections.CollectionUtils; @@ -279,6 +280,13 @@ public class ClusterResourceProviderTest { expect(blueprint.validateConfigurations(metaInfo, PropertyInfo.PropertyType.PASSWORD)).andReturn( Collections.<String, Map<String, Collection<String>>>emptyMap()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -623,6 +631,13 @@ public class ClusterResourceProviderTest { expect(blueprint.getConfigurations()).andReturn(Collections.<BlueprintConfigEntity>singletonList(blueprintConfig)); expect(blueprint.validateConfigurations(metaInfo, PropertyInfo.PropertyType.PASSWORD)).andReturn(allMissingPasswords); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -796,6 +811,13 @@ public class ClusterResourceProviderTest { expect(blueprint.getStackName()).andReturn(stackName); expect(blueprint.getStackVersion()).andReturn(stackVersion); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -971,6 +993,13 @@ public class ClusterResourceProviderTest { expect(blueprint.getStackName()).andReturn(stackName); expect(blueprint.getStackVersion()).andReturn(stackVersion); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -1146,6 +1175,13 @@ public class ClusterResourceProviderTest { expect(blueprint.getStackName()).andReturn(stackName); expect(blueprint.getStackVersion()).andReturn(stackVersion); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -1348,6 +1384,13 @@ public class ClusterResourceProviderTest { expect(blueprint.getConfigurations()).andReturn(Collections.<BlueprintConfigEntity>singletonList(blueprintConfig)); expect(blueprint.validateConfigurations(metaInfo, PropertyInfo.PropertyType.PASSWORD)).andReturn(allMissingPasswords); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); expect(stackServiceResponse2.getServiceName()).andReturn("service2"); @@ -1586,6 +1629,7 @@ public class ClusterResourceProviderTest { String clusterName = "c1"; BlueprintDAO blueprintDAO = createStrictMock(BlueprintDAO.class); + AmbariMetaInfo metaInfo = createMock(AmbariMetaInfo.class); AmbariManagementController managementController = createStrictMock(AmbariManagementController.class); Request request = createNiceMock(Request.class); RequestStatusResponse response = createNiceMock(RequestStatusResponse.class); @@ -1702,6 +1746,15 @@ public class ClusterResourceProviderTest { expect(blueprint.getStackName()).andReturn(stackName); expect(blueprint.getStackVersion()).andReturn(stackVersion); expect(blueprint.getConfigurations()).andReturn(Collections.<BlueprintConfigEntity>singletonList(blueprintConfig)); + expect(blueprint.validateConfigurations(metaInfo, PropertyInfo.PropertyType.PASSWORD)).andReturn( + Collections.<String, Map<String, Collection<String>>>emptyMap()); + + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component1")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service1", "component2")). + andReturn(Collections.<DependencyInfo>emptyList()); + expect(metaInfo.getComponentDependencies("test", "1.23", "service2", "component3")). + andReturn(Collections.<DependencyInfo>emptyList()); expect(managementController.getStackServices(capture(stackServiceRequestCapture))).andReturn(stackServiceResponses); expect(stackServiceResponse1.getServiceName()).andReturn("service1"); @@ -1776,10 +1829,10 @@ public class ClusterResourceProviderTest { stackConfigurationResponse1, stackConfigurationResponse2, stackConfigurationResponse3, stackConfigurationResponse4, blueprintConfig, hostGroup, hostGroupComponent1, hostGroupComponent2, hostGroupComponent3, hostGroupConfig, serviceResourceProvider, componentResourceProvider, hostResourceProvider, hostComponentResourceProvider, - configGroupResourceProvider); + configGroupResourceProvider, metaInfo); // test - ClusterResourceProvider.init(blueprintDAO, null); + ClusterResourceProvider.init(blueprintDAO, metaInfo); ResourceProvider provider = new TestClusterResourceProvider( managementController, serviceResourceProvider, componentResourceProvider, hostResourceProvider, hostComponentResourceProvider, configGroupResourceProvider);
