Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-14714 481175d12 -> 0b1ce86bb
http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java index 6c95c53..9ad233f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProviderTest.java @@ -68,11 +68,12 @@ import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.Host; +import org.apache.ambari.server.state.OsSpecific; import org.apache.ambari.server.state.RepositoryVersionState; import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackId; +import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.cluster.ClusterImpl; import org.apache.ambari.server.topology.TopologyManager; import org.apache.ambari.server.utils.StageUtils; @@ -215,12 +216,12 @@ public class HostStackVersionResourceProviderTest { - final ServiceOsSpecific.Package hivePackage = new ServiceOsSpecific.Package(); + final OsSpecific.Package hivePackage = new OsSpecific.Package(); hivePackage.setName("hive"); - final ServiceOsSpecific.Package mysqlPackage = new ServiceOsSpecific.Package(); + final OsSpecific.Package mysqlPackage = new OsSpecific.Package(); mysqlPackage.setName("mysql"); mysqlPackage.setSkipUpgrade(Boolean.TRUE); - List<ServiceOsSpecific.Package> packages = Arrays.asList(hivePackage, mysqlPackage); + List<OsSpecific.Package> packages = Arrays.asList(hivePackage, mysqlPackage); AbstractControllerResourceProvider.init(resourceProviderFactory); @@ -231,7 +232,7 @@ public class HostStackVersionResourceProviderTest { expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); - expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), + expect(managementController.getPackagesForStackServiceHost(anyObject(StackInfo.class),anyObject(ServiceInfo.class), EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), @@ -241,10 +242,12 @@ public class HostStackVersionResourceProviderTest { expect(clusters.getHost(anyObject(String.class))).andReturn(host1); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); + expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes(); expect(sch.getServiceName()).andReturn("HIVE").anyTimes(); + expect(sch.getServiceType()).andReturn("HIVE").anyTimes(); expect( repositoryVersionDAOMock.findByStackAndVersion( @@ -311,12 +314,12 @@ public class HostStackVersionResourceProviderTest { ServiceComponentHost sch = createMock(ServiceComponentHost.class); - final ServiceOsSpecific.Package hivePackage = new ServiceOsSpecific.Package(); + final OsSpecific.Package hivePackage = new OsSpecific.Package(); hivePackage.setName("hive"); - final ServiceOsSpecific.Package mysqlPackage = new ServiceOsSpecific.Package(); + final OsSpecific.Package mysqlPackage = new OsSpecific.Package(); mysqlPackage.setName("mysql"); mysqlPackage.setSkipUpgrade(Boolean.TRUE); - List<ServiceOsSpecific.Package> packages = Arrays.asList(hivePackage, mysqlPackage); + List<OsSpecific.Package> packages = Arrays.asList(hivePackage, mysqlPackage); AbstractControllerResourceProvider.init(resourceProviderFactory); @@ -327,7 +330,7 @@ public class HostStackVersionResourceProviderTest { expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); - expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), + expect(managementController.getPackagesForStackServiceHost(anyObject(StackInfo.class),anyObject(ServiceInfo.class), anyObject(Map.class), anyObject(String.class))).andReturn(packages).anyTimes(); expect(resourceProviderFactory.getHostResourceProvider(anyObject(Set.class), anyObject(Map.class), @@ -337,6 +340,7 @@ public class HostStackVersionResourceProviderTest { expect(clusters.getHost(anyObject(String.class))).andReturn(host1); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); + expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); expect( @@ -412,9 +416,9 @@ public class HostStackVersionResourceProviderTest { ServiceComponentHost sch = createMock(ServiceComponentHost.class); List<ServiceComponentHost> schs = Collections.singletonList(sch); - ServiceOsSpecific.Package hivePackage = new ServiceOsSpecific.Package(); + OsSpecific.Package hivePackage = new OsSpecific.Package(); hivePackage.setName("hive"); - List<ServiceOsSpecific.Package> packages = Collections.singletonList(hivePackage); + List<OsSpecific.Package> packages = Collections.singletonList(hivePackage); AbstractControllerResourceProvider.init(resourceProviderFactory); @@ -425,7 +429,7 @@ public class HostStackVersionResourceProviderTest { expect(managementController.getAmbariMetaInfo()).andReturn(ambariMetaInfo).anyTimes(); expect(managementController.getActionManager()).andReturn(actionManager).anyTimes(); expect(managementController.getJdkResourceUrl()).andReturn("/JdkResourceUrl").anyTimes(); - expect(managementController.getPackagesForServiceHost(anyObject(ServiceInfo.class), + expect(managementController.getPackagesForStackServiceHost(anyObject(StackInfo.class),anyObject(ServiceInfo.class), EasyMock.anyObject(), anyObject(String.class))).andReturn(packages).anyTimes(); expect(resourceProviderFactory.getHostResourceProvider(EasyMock.anyObject(), EasyMock.anyObject(), @@ -436,9 +440,11 @@ public class HostStackVersionResourceProviderTest { expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); expect(cluster.getServices()).andReturn(new HashMap<>()).anyTimes(); expect(cluster.getCurrentStackVersion()).andReturn(stackId); + expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(schs).anyTimes(); expect(sch.getServiceName()).andReturn("HIVE").anyTimes(); + expect(sch.getServiceType()).andReturn("HIVE").anyTimes(); expect( repositoryVersionDAOMock.findByStackAndVersion( http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java index 13c32cf..4ce3742 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/ServiceModuleTest.java @@ -44,9 +44,9 @@ import org.apache.ambari.server.state.CommandScriptDefinition; import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.CredentialStoreInfo; import org.apache.ambari.server.state.CustomCommandDefinition; +import org.apache.ambari.server.state.OsSpecific; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.ServicePropertyInfo; import org.junit.Test; @@ -231,8 +231,8 @@ public class ServiceModuleTest { @Test public void testResolve_OsSpecifics() throws Exception { - Map<String, ServiceOsSpecific> osSpecifics = new HashMap<>(); - osSpecifics.put("foo", new ServiceOsSpecific()); + Map<String, OsSpecific> osSpecifics = new HashMap<>(); + osSpecifics.put("foo", new OsSpecific()); // specified in child only ServiceInfo info = new ServiceInfo(); @@ -250,8 +250,8 @@ public class ServiceModuleTest { assertEquals(osSpecifics, service.getModuleInfo().getOsSpecifics()); // specified in both - Map<String, ServiceOsSpecific> osSpecifics2 = new HashMap<>(); - osSpecifics.put("bar", new ServiceOsSpecific()); + Map<String, OsSpecific> osSpecifics2 = new HashMap<>(); + osSpecifics.put("bar", new OsSpecific()); info.setOsSpecifics(osSpecifics); parentInfo.setOsSpecifics(osSpecifics2); http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java index 8dcb459..ee15bb5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerCommonServicesTest.java @@ -46,10 +46,10 @@ import org.apache.ambari.server.orm.entities.ExtensionLinkEntity; import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.CommandScriptDefinition; import org.apache.ambari.server.state.ComponentInfo; +import org.apache.ambari.server.state.OsSpecific; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.RepositoryInfo; import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.OsFamily; import org.apache.commons.lang.StringUtils; @@ -229,19 +229,31 @@ public class StackManagerCommonServicesTest { assertEquals("CLIENT", client.getCategory()); assertEquals("configuration", pigService.getConfigDir()); assertEquals("2.0", pigService.getSchemaVersion()); - Map<String, ServiceOsSpecific> osInfoMap = pigService.getOsSpecifics(); + Map<String, OsSpecific> osInfoMap = stack.getOsSpecifics(); assertEquals(1, osInfoMap.size()); - ServiceOsSpecific osSpecific = osInfoMap.get("centos6"); + OsSpecific osSpecific = osInfoMap.get("suse11"); + assertNotNull(osSpecific); + assertEquals("suse11", osSpecific.getOsFamily()); + List<OsSpecific.Package> packages = osSpecific.getPackages(); + assertEquals(1, packages.size()); + OsSpecific.Package pkg = packages.get(0); + assertEquals("stack_pig", pkg.getName()); + assertFalse(pkg.getSkipUpgrade()); + + + osInfoMap = pigService.getOsSpecifics(); + assertEquals(1, osInfoMap.size()); + osSpecific = osInfoMap.get("centos6"); assertNotNull(osSpecific); assertEquals("centos6", osSpecific.getOsFamily()); assertNull(osSpecific.getRepo()); - List<ServiceOsSpecific.Package> packages = osSpecific.getPackages(); + packages = osSpecific.getPackages(); assertEquals(2, packages.size()); - ServiceOsSpecific.Package pkg = packages.get(0); + pkg = packages.get(0); assertEquals("pig", pkg.getName()); assertFalse(pkg.getSkipUpgrade()); - ServiceOsSpecific.Package lzoPackage = packages.get(1); + OsSpecific.Package lzoPackage = packages.get(1); assertEquals("lzo", lzoPackage.getName()); assertTrue(lzoPackage.getSkipUpgrade()); http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java index 7598492..5ba9b80 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java @@ -55,9 +55,9 @@ import org.apache.ambari.server.orm.entities.ExtensionLinkEntity; import org.apache.ambari.server.state.ClientConfigFileDefinition; import org.apache.ambari.server.state.CommandScriptDefinition; import org.apache.ambari.server.state.ComponentInfo; +import org.apache.ambari.server.state.OsSpecific; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.ServiceInfo; -import org.apache.ambari.server.state.ServiceOsSpecific; import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.ConfigUpgradePack; import org.apache.ambari.server.state.stack.MetricDefinition; @@ -258,17 +258,29 @@ public class StackManagerTest { assertEquals("CLIENT", client.getCategory()); assertEquals("configuration", pigService.getConfigDir()); assertEquals("2.0", pigService.getSchemaVersion()); - Map<String, ServiceOsSpecific> osInfoMap = pigService.getOsSpecifics(); - assertEquals(1, osInfoMap.size()); - ServiceOsSpecific osSpecific = osInfoMap.get("centos6"); + + Map<String, OsSpecific> osInfoMapService = pigService.getOsSpecifics(); + assertEquals(1, osInfoMapService.size()); + OsSpecific osSpecific = osInfoMapService.get("centos6"); assertNotNull(osSpecific); assertEquals("centos6", osSpecific.getOsFamily()); assertNull(osSpecific.getRepo()); - List<ServiceOsSpecific.Package> packages = osSpecific.getPackages(); + List<OsSpecific.Package> packages = osSpecific.getPackages(); assertEquals(1, packages.size()); - ServiceOsSpecific.Package pkg = packages.get(0); + OsSpecific.Package pkg = packages.get(0); assertEquals("pig", pkg.getName()); + Map<String, OsSpecific> osInfoMapStack = stack.getOsSpecifics(); + assertEquals(1, osInfoMapStack.size()); + osSpecific = osInfoMapStack.get("suse11"); + assertNotNull(osSpecific); + assertEquals("suse11", osSpecific.getOsFamily()); + assertNull(osSpecific.getRepo()); + packages = osSpecific.getPackages(); + assertEquals(1, packages.size()); + pkg = packages.get(0); + assertEquals("stack_pig", pkg.getName()); + assertNull(pigService.getParent()); } @@ -382,7 +394,6 @@ public class StackManagerTest { assertEquals(baseSqoopService.getMetrics(), sqoopService.getMetrics()); assertNull(baseSqoopService.getMetricsFile()); assertNull(sqoopService.getMetricsFile()); - assertEquals(baseSqoopService.getOsSpecifics(), sqoopService.getOsSpecifics()); assertEquals(baseSqoopService.getRequiredServices(), sqoopService.getRequiredServices()); assertEquals(baseSqoopService.getSchemaVersion(), sqoopService.getSchemaVersion()); @@ -423,7 +434,7 @@ public class StackManagerTest { assertNotNull(baseStormService.getMetricsFile()); assertNotNull(stormService.getMetricsFile()); assertFalse(baseStormService.getMetricsFile().equals(stormService.getMetricsFile())); - assertEquals(baseStormService.getOsSpecifics(), stormService.getOsSpecifics()); + assertEquals(baseStack.getOsSpecifics(), stack.getOsSpecifics()); assertEquals(baseStormService.getRequiredServices(), stormService.getRequiredServices()); assertEquals(baseStormService.getSchemaVersion(), stormService.getSchemaVersion()); } @@ -461,7 +472,6 @@ public class StackManagerTest { assertEquals(baseSqoopService.getMetrics(), service.getMetrics()); assertNull(baseSqoopService.getMetricsFile()); assertNull(service.getMetricsFile()); - assertEquals(baseSqoopService.getOsSpecifics(), service.getOsSpecifics()); assertEquals(baseSqoopService.getRequiredServices(), service.getRequiredServices()); assertEquals(baseSqoopService.getSchemaVersion(), service.getSchemaVersion()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/resources/stacks/HDP/0.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.1/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/0.1/metainfo.xml index 768f110..cde9640 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.1/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.1/metainfo.xml @@ -19,4 +19,14 @@ <versions> <upgrade>0.0</upgrade> </versions> + <osSpecifics> + <osSpecific> + <osFamily>suse11</osFamily> + <packages> + <package> + <name>stack_pig</name> + </package> + </packages> + </osSpecific> + </osSpecifics> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/resources/stacks/HDP/2.0.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/metainfo.xml index ca45822..6939406 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/metainfo.xml @@ -19,4 +19,22 @@ <versions> <active>true</active> </versions> + <osSpecifics> + <osSpecific> + <osFamily>any</osFamily> + <packages> + <package> + <name>stack_any_package</name> + </package> + </packages> + </osSpecific> + <osSpecific> + <osFamily>suse11</osFamily> + <packages> + <package> + <name>mysql-client</name> + </package> + </packages> + </osSpecific> + </osSpecifics> </metainfo> http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml index db6f863..b1fc6a7 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.1/services/HIVE/metainfo.xml @@ -130,14 +130,6 @@ </package> </packages> </osSpecific> - <osSpecific> - <osFamily>suse11</osFamily> - <packages> - <package> - <name>mysql-client</name> - </package> - </packages> - </osSpecific> </osSpecifics> <commandScript> http://git-wip-us.apache.org/repos/asf/ambari/blob/0b1ce86b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/metainfo.xml b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/metainfo.xml index 768f110..cde9640 100644 --- a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/metainfo.xml +++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.1/metainfo.xml @@ -19,4 +19,14 @@ <versions> <upgrade>0.0</upgrade> </versions> + <osSpecifics> + <osSpecific> + <osFamily>suse11</osFamily> + <packages> + <package> + <name>stack_pig</name> + </package> + </packages> + </osSpecific> + </osSpecifics> </metainfo>
