http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_tools.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_tools.json b/ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_tools.json index 535b9d9..62562f8 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_tools.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/properties/stack_tools.json @@ -1,4 +1,14 @@ { - "stack_selector": ["distro-select", "/usr/bin/distro-select", "distro-select"], - "conf_selector": ["conf-select", "/usr/bin/conf-select", "conf-select"] -} \ No newline at end of file + "PERF": { + "stack_selector": [ + "distro-select", + "/usr/bin/distro-select", + "distro-select" + ], + "conf_selector": [ + "conf-select", + "/usr/bin/conf-select", + "conf-select" + ] + } +}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java index ca579ea..bade238 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java @@ -46,9 +46,11 @@ import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.controller.StackConfigurationResponse; 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.PropertyDependencyInfo; import org.apache.ambari.server.state.PropertyInfo; import org.apache.ambari.server.state.ServiceInfo; +import org.apache.ambari.server.state.StackId; import org.apache.ambari.server.state.ValueAttributesInfo; import org.apache.ambari.server.state.kerberos.KerberosDescriptor; import org.apache.ambari.server.topology.AdvisedConfiguration; @@ -66,6 +68,7 @@ import org.apache.ambari.server.topology.HostGroupInfo; import org.apache.ambari.server.topology.InvalidTopologyException; import org.apache.ambari.server.topology.TopologyRequest; import org.apache.commons.lang.StringUtils; +import org.easymock.EasyMock; import org.easymock.EasyMockRule; import org.easymock.EasyMockSupport; import org.easymock.Mock; @@ -95,6 +98,10 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { private static final Configuration EMPTY_CONFIG = new Configuration(Collections.<String, Map<String, String>>emptyMap(), Collections.<String, Map<String, Map<String, String>>>emptyMap()); private final Map<String, Collection<String>> serviceComponents = new HashMap<>(); + private final Map<String, Map<String, String>> stackProperties = new HashMap<>(); + + private final String STACK_NAME = "testStack"; + private final String STACK_VERSION = "1"; @Rule public EasyMockRule mocks = new EasyMockRule(this); @@ -129,13 +136,16 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { @Mock private TopologyRequest topologyRequestMock; + @Mock(type = MockType.NICE) + private ConfigHelper configHelper; + @Before public void init() throws Exception { expect(bp.getStack()).andReturn(stack).anyTimes(); expect(bp.getName()).andReturn("test-bp").anyTimes(); - expect(stack.getName()).andReturn("testStack").anyTimes(); - expect(stack.getVersion()).andReturn("1").anyTimes(); + expect(stack.getName()).andReturn(STACK_NAME).atLeastOnce(); + expect(stack.getVersion()).andReturn(STACK_VERSION).atLeastOnce(); // return false for all components since for this test we don't care about the value expect(stack.isMasterComponent((String) anyObject())).andReturn(false).anyTimes(); expect(stack.getConfigurationPropertiesWithMetadata(anyObject(String.class), anyObject(String.class))).andReturn(Collections.<String, Stack.ConfigProperty>emptyMap()).anyTimes(); @@ -225,6 +235,11 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { Set<String> emptySet = Collections.emptySet(); expect(stack.getExcludedConfigurationTypes(anyObject(String.class))).andReturn(emptySet).anyTimes(); + + expect(ambariContext.getConfigHelper()).andReturn(configHelper).anyTimes(); + expect(configHelper.getDefaultStackProperties( + EasyMock.eq(new StackId(STACK_NAME, STACK_VERSION)))).andReturn(stackProperties).anyTimes(); + expect(ambariContext.isClusterKerberosEnabled(1)).andReturn(true).once(); expect(ambariContext.getClusterName(1L)).andReturn("clusterName").anyTimes(); PowerMock.mockStatic(AmbariServer.class); @@ -234,14 +249,14 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { expect(controller.getKerberosHelper()).andReturn(kerberosHelper).anyTimes(); expect(controller.getClusters()).andReturn(clusters).anyTimes(); expect(kerberosHelper.getKerberosDescriptor(cluster)).andReturn(kerberosDescriptor).anyTimes(); - Set<String> properties = new HashSet<String>(); + Set<String> properties = new HashSet<>(); properties.add("core-site/hadoop.security.auth_to_local"); expect(kerberosDescriptor.getAllAuthToLocalProperties()).andReturn(properties).anyTimes(); } @After public void tearDown() { - reset(bp, serviceInfo, stack, ambariContext); + reset(bp, serviceInfo, stack, ambariContext, configHelper); } @Test @@ -6322,13 +6337,16 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { topology.getAdvisedConfigurations().putAll(createAdvisedConfigMap()); topology.setConfigRecommendationStrategy(ConfigRecommendationStrategy.ONLY_STACK_DEFAULTS_APPLY); BlueprintConfigurationProcessor configProcessor = new BlueprintConfigurationProcessor(topology); + reset(stack); + expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); + expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); expect(stack.getConfiguration(bp.getServices())).andReturn(createStackDefaults()).anyTimes(); Set<String> emptySet = Collections.emptySet(); expect(stack.getExcludedConfigurationTypes(anyObject(String.class))).andReturn(emptySet).anyTimes(); - replay(stack); + // WHEN Set<String> configTypeUpdated = configProcessor.doUpdateForClusterCreate(); // THEN @@ -6379,13 +6397,17 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { topology.getAdvisedConfigurations().putAll(createAdvisedConfigMap()); topology.setConfigRecommendationStrategy(ConfigRecommendationStrategy.ONLY_STACK_DEFAULTS_APPLY); BlueprintConfigurationProcessor configProcessor = new BlueprintConfigurationProcessor(topology); + reset(stack); + expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); + expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); expect(stack.getConfiguration(bp.getServices())).andReturn(createStackDefaults()).anyTimes(); Set<String> emptySet = Collections.emptySet(); expect(stack.getExcludedConfigurationTypes(anyObject(String.class))).andReturn(emptySet).anyTimes(); replay(stack); + // WHEN configProcessor.doUpdateForClusterCreate(); // THEN @@ -8050,6 +8072,10 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { @Test public void testValuesTrimming() throws Exception { reset(stack); + + expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); + expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); + Map<String, Map<String, String>> properties = new HashMap<>(); Map<String, String> hdfsSite = new HashMap<>(); @@ -8073,6 +8099,7 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { new StackConfigurationResponse(null, null, null, null, "hdfs-site", null, Collections.singleton(PropertyInfo.PropertyType.PASSWORD), null, null, null))); propertyConfigs.put("test.host", new Stack.ConfigProperty( new StackConfigurationResponse(null, null, null, null, "hdfs-site", null, null, null, valueAttributesInfoHost, null))); + expect(stack.getServiceForConfigType("hdfs-site")).andReturn("HDFS").anyTimes(); expect(stack.getConfigurationPropertiesWithMetadata("HDFS", "hdfs-site")).andReturn(propertyConfigs).anyTimes(); @@ -8144,7 +8171,7 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { throws InvalidTopologyException { - replay(stack, serviceInfo, ambariContext, controller, kerberosHelper, kerberosDescriptor, clusters, cluster); + replay(stack, serviceInfo, ambariContext, configHelper, controller, kerberosHelper, kerberosDescriptor, clusters, cluster); Map<String, HostGroupInfo> hostGroupInfo = new HashMap<>(); Collection<String> allServices = new HashSet<>(); @@ -8207,7 +8234,7 @@ public class BlueprintConfigurationProcessorTest extends EasyMockSupport { this.name = name; this.components = components; this.hosts = hosts; - this.configuration = new Configuration(Collections.<String, Map<String, String>>emptyMap(), + configuration = new Configuration(Collections.<String, Map<String, String>>emptyMap(), Collections.<String, Map<String, Map<String, String>>>emptyMap()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java index 32a5358..39aee82 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java @@ -1414,8 +1414,8 @@ public class ClusterStackVersionResourceProviderTest { expect(cluster.getClusterId()).andReturn(1L).anyTimes(); expect(cluster.getHosts()).andReturn(hostsForCluster.values()).atLeastOnce(); expect(cluster.getServices()).andReturn(serviceMap).anyTimes(); - expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn( - serviceComponentHosts).anyTimes(); + expect(cluster.getServiceComponentHosts(anyObject(String.class))).andReturn(serviceComponentHosts).anyTimes(); + expect(cluster.getCurrentStackVersion()).andReturn(stackId).atLeastOnce(); expect(repositoryVersionDAOMock.findByStackAndVersion(anyObject(StackId.class), anyObject(String.class))).andReturn(repoVersionEntity); http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java index 8b08dc4..5535256 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/topology/ClusterConfigurationRequestTest.java @@ -50,6 +50,8 @@ import org.apache.ambari.server.controller.internal.Stack; import org.apache.ambari.server.serveraction.kerberos.KerberosInvalidConfigurationException; 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.StackId; import org.easymock.Capture; import org.easymock.CaptureType; import org.easymock.EasyMock; @@ -103,6 +105,13 @@ public class ClusterConfigurationRequestTest { @Mock(type = MockType.NICE) private KerberosHelper kerberosHelper; + @Mock(type = MockType.NICE) + private ConfigHelper configHelper; + + private final String STACK_NAME = "testStack"; + private final String STACK_VERSION = "1"; + private final Map<String, Map<String, String>> stackProperties = new HashMap<>(); + /** * testConfigType config type should be in updatedConfigTypes, as no custom property in Blueprint * ==> Kerberos config property should be updated @@ -221,6 +230,8 @@ public class ClusterConfigurationRequestTest { expect(clusters.getCluster("testCluster")).andReturn(cluster).anyTimes(); expect(blueprint.getStack()).andReturn(stack).anyTimes(); + expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); + expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); expect(stack.getServiceForConfigType("testConfigType")).andReturn("KERBEROS").anyTimes(); expect(stack.getAllConfigurationTypes(anyString())).andReturn(Collections.singletonList("testConfigType") ).anyTimes(); @@ -246,6 +257,7 @@ public class ClusterConfigurationRequestTest { expect(blueprint.getComponents("KERBEROS")).andReturn(kerberosComponents).anyTimes(); expect(blueprint.getComponents("ZOOKEPER")).andReturn(zookeeperComponents).anyTimes(); + expect(topology.getAmbariContext()).andReturn(ambariContext).anyTimes(); expect(topology.getConfigRecommendationStrategy()).andReturn(ConfigRecommendationStrategy.NEVER_APPLY).anyTimes(); expect(topology.getBlueprint()).andReturn(blueprint).anyTimes(); expect(blueprint.isValidConfigType("testConfigType")).andReturn(true).anyTimes(); @@ -256,10 +268,14 @@ public class ClusterConfigurationRequestTest { expect(topology.getHostGroupsForComponent(anyString())).andReturn(Collections.<String>emptyList()) .anyTimes(); - expect(ambariContext.getClusterName(Long.valueOf(1))).andReturn("testCluster").anyTimes(); + expect(ambariContext.getConfigHelper()).andReturn(configHelper).anyTimes(); + expect(ambariContext.getClusterName(Long.valueOf(1))).andReturn("testCluster").anyTimes(); expect(ambariContext.createConfigurationRequests(EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections .<ConfigurationRequest>emptyList()).anyTimes(); + expect(configHelper.getDefaultStackProperties( + EasyMock.eq(new StackId(STACK_NAME, STACK_VERSION)))).andReturn(stackProperties).anyTimes(); + if (kerberosConfig == null) { kerberosConfig = new HashMap<>(); Map<String, String> properties = new HashMap<>(); @@ -277,15 +293,14 @@ public class ClusterConfigurationRequestTest { (captureUpdatedConfigTypes)); expectLastCall(); - PowerMock.replay(stack, blueprint, topology, controller, clusters, kerberosHelper, ambariContext, - AmbariContext - .class); + PowerMock.replay(stack, blueprint, topology, controller, clusters, kerberosHelper, + ambariContext, AmbariContext.class, configHelper); ClusterConfigurationRequest clusterConfigurationRequest = new ClusterConfigurationRequest( ambariContext, topology, false, stackAdvisorBlueprintProcessor, true); clusterConfigurationRequest.process(); - verify(blueprint, topology, ambariContext, controller, kerberosHelper); + verify(blueprint, topology, ambariContext, controller, kerberosHelper, configHelper); String clusterName = captureClusterName.getValue(); @@ -308,8 +323,9 @@ public class ClusterConfigurationRequestTest { expect(clusters.getCluster("testCluster")).andReturn(cluster).anyTimes(); expect(blueprint.getStack()).andReturn(stack).anyTimes(); - expect(stack.getAllConfigurationTypes(anyString())).andReturn(Collections.singletonList("testConfigType") - ).anyTimes(); + expect(stack.getName()).andReturn(STACK_NAME).anyTimes(); + expect(stack.getVersion()).andReturn(STACK_VERSION).anyTimes(); + expect(stack.getAllConfigurationTypes(anyString())).andReturn(Collections.<String>singletonList("testConfigType")).anyTimes(); expect(stack.getExcludedConfigurationTypes(anyString())).andReturn(Collections.<String>emptySet()).anyTimes(); expect(stack.getConfigurationPropertiesWithMetadata(anyString(), anyString())).andReturn(Collections.<String, Stack.ConfigProperty>emptyMap()).anyTimes(); @@ -331,25 +347,29 @@ public class ClusterConfigurationRequestTest { expect(blueprint.getComponents("KERBEROS")).andReturn(kerberosComponents).anyTimes(); expect(blueprint.getComponents("ZOOKEPER")).andReturn(zookeeperComponents).anyTimes(); + expect(topology.getAmbariContext()).andReturn(ambariContext).anyTimes(); expect(topology.getConfigRecommendationStrategy()).andReturn(ConfigRecommendationStrategy.NEVER_APPLY).anyTimes(); expect(topology.getBlueprint()).andReturn(blueprint).anyTimes(); expect(topology.getConfiguration()).andReturn(stackConfig).anyTimes(); expect(topology.getHostGroupInfo()).andReturn(Collections.<String, HostGroupInfo>emptyMap()).anyTimes(); expect(topology.getClusterId()).andReturn(Long.valueOf(1)).anyTimes(); + + expect(ambariContext.getConfigHelper()).andReturn(configHelper).anyTimes(); expect(ambariContext.getClusterName(Long.valueOf(1))).andReturn("testCluster").anyTimes(); expect(ambariContext.createConfigurationRequests(EasyMock.<Map<String, Object>>anyObject())).andReturn(Collections .<ConfigurationRequest>emptyList()).anyTimes(); + expect(configHelper.getDefaultStackProperties( + EasyMock.eq(new StackId(STACK_NAME, STACK_VERSION)))).andReturn(stackProperties).anyTimes(); PowerMock.replay(stack, blueprint, topology, controller, clusters, ambariContext, - AmbariContext - .class); + AmbariContext.class, configHelper); ClusterConfigurationRequest clusterConfigurationRequest = new ClusterConfigurationRequest( ambariContext, topology, false, stackAdvisorBlueprintProcessor); clusterConfigurationRequest.process(); - verify(blueprint, topology, ambariContext, controller); + verify(blueprint, topology, ambariContext, controller, configHelper); } @@ -365,6 +385,7 @@ public class ClusterConfigurationRequestTest { hg1.setConfiguration(createConfigurationsForHostGroup()); hostGroupInfoMap.put("hg1", hg1); + expect(topology.getAmbariContext()).andReturn(ambariContext).anyTimes(); expect(topology.getConfiguration()).andReturn(configuration).anyTimes(); expect(topology.getBlueprint()).andReturn(blueprint).anyTimes(); expect(topology.getHostGroupInfo()).andReturn(hostGroupInfoMap); @@ -377,7 +398,12 @@ public class ClusterConfigurationRequestTest { expect(blueprint.isValidConfigType("cluster-env")).andReturn(true).anyTimes(); expect(blueprint.isValidConfigType("global")).andReturn(true).anyTimes(); - EasyMock.replay(stack, blueprint, topology); + expect(ambariContext.getConfigHelper()).andReturn(configHelper).anyTimes(); + + expect(configHelper.getDefaultStackProperties( + EasyMock.eq(new StackId(STACK_NAME, STACK_VERSION)))).andReturn(stackProperties).anyTimes(); + + EasyMock.replay(stack, blueprint, topology, ambariContext, configHelper); // WHEN new ClusterConfigurationRequest(ambariContext, topology, false, stackAdvisorBlueprintProcessor); // THEN @@ -388,7 +414,7 @@ public class ClusterConfigurationRequestTest { assertFalse("SPARK service not present in topology host group config thus 'spark-env' config type should be removed from config.", hg1.getConfiguration().getFullAttributes().containsKey("spark-env")); assertTrue("HDFS service is present in topology host group config thus 'hdfs-site' config type should be left in the config.", hg1.getConfiguration().getFullAttributes().containsKey("hdfs-site")); - verify(stack, blueprint, topology); + verify(stack, blueprint, topology, ambariContext, configHelper); } @Test @@ -409,6 +435,7 @@ public class ClusterConfigurationRequestTest { hg1.setConfiguration(createConfigurationsForHostGroup()); hostGroupInfoMap.put("hg1", hg1); + expect(topology.getAmbariContext()).andReturn(ambariContext).anyTimes(); expect(topology.getConfiguration()).andReturn(configuration).anyTimes(); expect(topology.getBlueprint()).andReturn(blueprint).anyTimes(); expect(topology.getHostGroupInfo()).andReturn(hostGroupInfoMap); @@ -419,7 +446,12 @@ public class ClusterConfigurationRequestTest { expect(blueprint.isValidConfigType("cluster-env")).andReturn(true).anyTimes(); expect(blueprint.isValidConfigType("global")).andReturn(true).anyTimes(); - EasyMock.replay(stack, blueprint, topology); + expect(ambariContext.getConfigHelper()).andReturn(configHelper).anyTimes(); + + expect(configHelper.getDefaultStackProperties( + EasyMock.eq(new StackId(STACK_NAME, STACK_VERSION)))).andReturn(stackProperties).anyTimes(); + + EasyMock.replay(stack, blueprint, topology, ambariContext, configHelper); // When @@ -431,7 +463,7 @@ public class ClusterConfigurationRequestTest { assertFalse("SPARK service not present in topology host group config thus 'spark-env' config type should be removed from config.", hg1.getConfiguration().getFullAttributes().containsKey("spark-env")); assertTrue("HDFS service is present in topology host group config thus 'hdfs-site' config type should be left in the config.", hg1.getConfiguration().getFullAttributes().containsKey("hdfs-site")); - verify(stack, blueprint, topology); + verify(stack, blueprint, topology, ambariContext, configHelper); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/python/common-services/configs/hawq_default.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/common-services/configs/hawq_default.json b/ambari-server/src/test/python/common-services/configs/hawq_default.json index 79864a9..1b6fafb 100644 --- a/ambari-server/src/test/python/common-services/configs/hawq_default.json +++ b/ambari-server/src/test/python/common-services/configs/hawq_default.json @@ -73,7 +73,11 @@ "cluster-env": { "managed_hdfs_resource_property_names": "", "security_enabled": "false", - "user_group": "hadoop" + "user_group": "hadoop", + "stack_name": "PHD", + "stack_root": "{\"PHD\": \"/usr/phd\"}", + "stack_tools": "{\n \"PHD\": { \"stack_selector\": [\"phd-select\", \"/usr/bin/phd-select\", \"phd-select\"],\n \"conf_selector\": [\"conf-select\", \"/usr/bin/conf-select\", \"conf-select\"]\n}\n}", + "stack_features": "{\"PHD\":{\"stack_features\":[{\"name\":\"express_upgrade\",\"description\":\"Express upgrade support\",\"min_version\":\"3.0.0.0\"},{\"name\":\"rolling_upgrade\",\"description\":\"Rolling upgrade support\",\"min_version\":\"3.0.0.0\"},{\"name\":\"config_versioning\",\"description\":\"Configurable versions support\",\"min_version\":\"3.0.0.0\"}]\n}\n}" } }, "clusterHostInfo": { http://git-wip-us.apache.org/repos/asf/ambari/blob/f33a250c/ambari-server/src/test/python/host_scripts/TestAlertDiskSpace.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/host_scripts/TestAlertDiskSpace.py b/ambari-server/src/test/python/host_scripts/TestAlertDiskSpace.py index 0d47061..e6cce98 100644 --- a/ambari-server/src/test/python/host_scripts/TestAlertDiskSpace.py +++ b/ambari-server/src/test/python/host_scripts/TestAlertDiskSpace.py @@ -41,7 +41,11 @@ class TestAlertDiskSpace(RMFTestCase): total = 21673930752L, used = 5695861760L, free = 15978068992L, path="/") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + configurations = {'{{cluster-env/stack_name}}': 'HDP', + '{{cluster-env/stack_root}}': '{"HDP":"/usr/hdp"}'} + + res = alert_disk_space.execute(configurations=configurations) + self.assertEqual(res, ('OK', ['Capacity Used: [26.28%, 5.7 GB], Capacity Total: [21.7 GB], path=/'])) @@ -50,7 +54,7 @@ class TestAlertDiskSpace(RMFTestCase): total = 21673930752L, used = 14521533603L, free = 7152397149L, path="/") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + res = alert_disk_space.execute(configurations = configurations) self.assertEqual(res, ( 'WARNING', ['Capacity Used: [67.00%, 14.5 GB], Capacity Total: [21.7 GB], path=/'])) @@ -60,7 +64,7 @@ class TestAlertDiskSpace(RMFTestCase): total = 21673930752L, used = 20590234214L, free = 1083696538, path="/") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + res = alert_disk_space.execute(configurations = configurations) self.assertEqual(res, ('CRITICAL', ['Capacity Used: [95.00%, 20.6 GB], Capacity Total: [21.7 GB], path=/'])) @@ -69,7 +73,7 @@ class TestAlertDiskSpace(RMFTestCase): total = 5418482688L, used = 1625544806L, free = 3792937882L, path="/") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + res = alert_disk_space.execute(configurations = configurations) self.assertEqual(res, ('WARNING', [ 'Capacity Used: [30.00%, 1.6 GB], Capacity Total: [5.4 GB], path=/. Total free space is less than 5.0 GB'])) @@ -81,7 +85,7 @@ class TestAlertDiskSpace(RMFTestCase): total = 21673930752L, used = 5695861760L, free = 15978068992L, path="/usr/hdp") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + res = alert_disk_space.execute(configurations = configurations) self.assertEqual(res, ('OK', ['Capacity Used: [26.28%, 5.7 GB], Capacity Total: [21.7 GB], path=/usr/hdp'])) @@ -90,6 +94,6 @@ class TestAlertDiskSpace(RMFTestCase): total = 5418482688L, used = 1625544806L, free = 3792937882L, path="/usr/hdp") - res = alert_disk_space.execute(configurations={'{{cluster-env/stack_root}}': '/usr/hdp'}) + res = alert_disk_space.execute(configurations = configurations) self.assertEqual(res, ( 'WARNING', ["Capacity Used: [30.00%, 1.6 GB], Capacity Total: [5.4 GB], path=/usr/hdp. Total free space is less than 5.0 GB"]))
