You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/11/11 21:43:09 UTC
[06/17] ambari git commit: AMBARI-8276 - Alerts: Remove Nagios
Service From The Stack (jonathanhurley)
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index 4d08d6f..6ab35c2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -38,9 +38,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.util.Modules;
+import javax.persistence.EntityManager;
+import javax.xml.bind.JAXBException;
+
import junit.framework.Assert;
import org.apache.ambari.server.AmbariException;
@@ -70,8 +70,8 @@ import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.StackInfo;
import org.apache.ambari.server.state.alert.AlertDefinition;
-import org.apache.ambari.server.state.alert.MetricSource;
import org.apache.ambari.server.state.alert.AlertDefinitionFactory;
+import org.apache.ambari.server.state.alert.MetricSource;
import org.apache.ambari.server.state.alert.PortSource;
import org.apache.ambari.server.state.alert.Reporting;
import org.apache.ambari.server.state.alert.Source;
@@ -86,9 +86,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.inject.AbstractModule;
-
-import javax.persistence.EntityManager;
-import javax.xml.bind.JAXBException;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.util.Modules;
public class AmbariMetaInfoTest {
@@ -973,21 +973,6 @@ public class AmbariMetaInfoTest {
}
@Test
- public void testNagios134Dependencies() throws Exception {
- ServiceInfo service = metaInfo.getService(STACK_NAME_HDP, "1.3.4", "NAGIOS");
- List<ComponentInfo> componentList = service.getComponents();
- Assert.assertEquals(1, componentList.size());
- ComponentInfo component = componentList.get(0);
- Assert.assertEquals("NAGIOS_SERVER", component.getName());
- // dependencies
- Assert.assertEquals(0, component.getDependencies().size());
- // component auto deploy
- Assert.assertNull(component.getAutoDeploy());
- // cardinality
- Assert.assertEquals("1", component.getCardinality());
- }
-
- @Test
public void testOozie134Dependencies() throws Exception {
ServiceInfo service = metaInfo.getService(STACK_NAME_HDP, "1.3.4", "OOZIE");
List<ComponentInfo> componentList = service.getComponents();
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java
index d319fab..58bc47e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/configuration/ComponentSSLConfigurationTest.java
@@ -18,23 +18,23 @@
package org.apache.ambari.server.configuration;
+import java.util.Properties;
+
import org.junit.Assert;
import org.junit.Test;
-import java.util.Properties;
-
/**
* ComponentSSLConfiguration tests.
*/
public class ComponentSSLConfigurationTest {
- public static ComponentSSLConfiguration getConfiguration(String path, String pass, String type, boolean gangliaSSL, boolean nagiosSSL) {
+ public static ComponentSSLConfiguration getConfiguration(String path,
+ String pass, String type, boolean gangliaSSL) {
Properties ambariProperties = new Properties();
ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_PATH_KEY, path);
ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_PASSWORD_KEY, pass);
ambariProperties.setProperty(Configuration.SSL_TRUSTSTORE_TYPE_KEY, type);
ambariProperties.setProperty(Configuration.GANGLIA_HTTPS_KEY, Boolean.toString(gangliaSSL));
- ambariProperties.setProperty(Configuration.NAGIOS_HTTPS_KEY, Boolean.toString(nagiosSSL));
Configuration configuration = new TestConfiguration(ambariProperties);
@@ -47,34 +47,32 @@ public class ComponentSSLConfigurationTest {
@Test
public void testGetTruststorePath() throws Exception {
- ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath",
+ "tspass", "tstype", true);
Assert.assertEquals("tspath", sslConfiguration.getTruststorePath());
}
@Test
public void testGetTruststorePassword() throws Exception {
- ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath",
+ "tspass", "tstype", true);
Assert.assertEquals("tspass", sslConfiguration.getTruststorePassword());
}
@Test
public void testGetTruststoreType() throws Exception {
- ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath",
+ "tspass", "tstype", true);
Assert.assertEquals("tstype", sslConfiguration.getTruststoreType());
}
@Test
public void testIsGangliaSSL() throws Exception {
- ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath",
+ "tspass", "tstype", true);
Assert.assertTrue(sslConfiguration.isGangliaSSL());
}
- @Test
- public void testIsNagiosSSL() throws Exception {
- ComponentSSLConfiguration sslConfiguration = getConfiguration("tspath", "tspass", "tstype", true, false);
- Assert.assertFalse(sslConfiguration.isNagiosSSL());
- }
-
private static class TestConfiguration extends Configuration {
private TestConfiguration(Properties properties) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/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 2a0ebc5..e1e25e0 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
@@ -153,7 +153,7 @@ public class AmbariManagementControllerTest {
private static final String REPO_ID = "HDP-1.1.1.16";
private static final String PROPERTY_NAME = "hbase.regionserver.msginterval";
private static final String SERVICE_NAME = "HDFS";
- private static final String NAGIOS_SERVICE_NAME = "NAGIOS";
+ private static final String FAKE_SERVICE_NAME = "FAKENAGIOS";
private static final int STACK_VERSIONS_CNT = 12;
private static final int REPOS_CNT = 3;
private static final int STACKS_CNT = 3;
@@ -4071,102 +4071,6 @@ public class AmbariManagementControllerTest {
Assert.assertNull(hrc.getExecutionCommandWrapper().getExecutionCommand().getPassiveInfo());
}
- @Test
- public void testPassiveSentWithNagiosRestart() throws AmbariException {
- setupClusterWithHosts("c1", "HDP-2.0.7", Arrays.asList("h1"), "centos5");
-
- Cluster cluster = clusters.getCluster("c1");
- cluster.setDesiredStackVersion(new StackId("HDP-2.0.7"));
- cluster.setCurrentStackVersion(new StackId("HDP-2.0.7"));
-
- Service hdfs = cluster.addService("HDFS");
- hdfs.persist();
- hdfs.addServiceComponent(Role.HDFS_CLIENT.name()).persist();
- hdfs.addServiceComponent(Role.NAMENODE.name()).persist();
- hdfs.addServiceComponent(Role.DATANODE.name()).persist();
-
- hdfs.getServiceComponent(Role.HDFS_CLIENT.name()).addServiceComponentHost("h1").persist();
- hdfs.getServiceComponent(Role.NAMENODE.name()).addServiceComponentHost("h1").persist();
- hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost("h1").persist();
-
-
-
- Service nagios = cluster.addService("NAGIOS");
- nagios.persist();
- nagios.addServiceComponent(Role.NAGIOS_SERVER.name()).persist();
- nagios.getServiceComponent(Role.NAGIOS_SERVER.name()).addServiceComponentHost("h1").persist();
-
- installService("c1", "HDFS", false, false);
- installService("c1", "NAGIOS", false, false);
-
- startService("c1", "HDFS", false, false);
- startService("c1", "NAGIOS", false, false);
-
- // set this after starting - setting it before will skip it due to rules
- // around bulk starts
- hdfs.getServiceComponent(Role.DATANODE.name()).getServiceComponentHost(
- "h1").setMaintenanceState(MaintenanceState.ON);
-
- Cluster c = clusters.getCluster("c1");
- Service s = c.getService("HDFS");
-
- Assert.assertEquals(State.STARTED, s.getDesiredState());
- for (ServiceComponent sc : s.getServiceComponents().values()) {
- for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
- if (sc.isClientComponent()) {
- Assert.assertEquals(State.INSTALLED, sch.getDesiredState());
- } else {
- Assert.assertEquals(State.STARTED, sch.getDesiredState());
- }
- }
- }
-
- Map<String, String> params = new HashMap<String, String>() {{
- put("test", "test");
- }};
- RequestResourceFilter resourceFilter = new RequestResourceFilter(
- "NAGIOS",
- "NAGIOS_SERVER",
- new ArrayList<String>() {{ add("h1"); }});
- ExecuteActionRequest actionRequest = new ExecuteActionRequest("c1",
- "RESTART", params, false);
- actionRequest.getResourceFilters().add(resourceFilter);
-
- Map<String, String> requestProperties = new HashMap<String, String>();
- requestProperties.put(REQUEST_CONTEXT_PROPERTY, "Called from a test");
-
- RequestStatusResponse response = controller.createAction(actionRequest, requestProperties);
-
- List<Stage> stages = actionDB.getAllStages(response.getRequestId());
- Assert.assertNotNull(stages);
-
- HostRoleCommand hrc = null;
- for (Stage stage : stages) {
- for (HostRoleCommand cmd : stage.getOrderedHostRoleCommands()) {
- if (cmd.getRole().equals(Role.NAGIOS_SERVER)) {
- hrc = cmd;
- }
- }
- }
- Assert.assertNotNull(hrc);
- Assert.assertEquals("RESTART NAGIOS/NAGIOS_SERVER", hrc.getCommandDetail());
-
-
- Set<Map<String, String>> pi =
- hrc.getExecutionCommandWrapper().getExecutionCommand().getPassiveInfo();
-
- Assert.assertNotNull(pi);
- Assert.assertTrue(pi.size() > 0);
- Map<String, String> map = pi.iterator().next();
- Assert.assertTrue(map.containsKey("host"));
- Assert.assertTrue(map.containsKey("service"));
- Assert.assertTrue(map.containsKey("component"));
- Assert.assertEquals("h1", map.get("host"));
- Assert.assertEquals("HDFS", map.get("service"));
- Assert.assertEquals("DATANODE", map.get("component"));
- }
-
-
@SuppressWarnings("serial")
@Test
public void testCreateActionsFailures() throws Exception {
@@ -7090,7 +6994,7 @@ public class AmbariManagementControllerTest {
public void testGetStackServices() throws Exception {
StackServiceRequest request = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, null);
Set<StackServiceResponse> responses = controller.getStackServices(Collections.singleton(request));
- Assert.assertEquals(12, responses.size());
+ Assert.assertEquals(11, responses.size());
StackServiceRequest requestWithParams = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, SERVICE_NAME);
@@ -7196,8 +7100,7 @@ public class AmbariManagementControllerTest {
@Test
public void testStackServiceCheckSupported() throws Exception {
StackServiceRequest hdfsServiceRequest = new StackServiceRequest(
- STACK_NAME,
- NEW_STACK_VERSION, SERVICE_NAME);
+ STACK_NAME, "2.0.8", SERVICE_NAME);
Set<StackServiceResponse> responses = controller.getStackServices(Collections.singleton(hdfsServiceRequest));
Assert.assertEquals(1, responses.size());
@@ -7205,10 +7108,10 @@ public class AmbariManagementControllerTest {
StackServiceResponse response = responses.iterator().next();
assertTrue(response.isServiceCheckSupported());
- StackServiceRequest nagiosServiceRequest = new StackServiceRequest(
- STACK_NAME, NEW_STACK_VERSION, NAGIOS_SERVICE_NAME);
+ StackServiceRequest fakeServiceRequest = new StackServiceRequest(
+ STACK_NAME, "2.0.8", FAKE_SERVICE_NAME);
- responses = controller.getStackServices(Collections.singleton(nagiosServiceRequest));
+ responses = controller.getStackServices(Collections.singleton(fakeServiceRequest));
Assert.assertEquals(1, responses.size());
response = responses.iterator().next();
@@ -9601,24 +9504,25 @@ public class AmbariManagementControllerTest {
String clusterName = "c1";
createCluster(clusterName);
Cluster cluster = clusters.getCluster(clusterName);
- StackId stackId = new StackId("HDP-2.0.5");
+ StackId stackId = new StackId("HDP-2.0.8");
cluster.setDesiredStackVersion(stackId);
cluster.setCurrentStackVersion(stackId);
String hdfsService = "HDFS";
- String nagiosService = "NAGIOS";
+ String fakeMonitoringService = "FAKENAGIOS";
createService(clusterName, hdfsService, null);
- createService(clusterName, nagiosService, null);
+ createService(clusterName, fakeMonitoringService, null);
String namenode = "NAMENODE";
String datanode = "DATANODE";
String hdfsClient = "HDFS_CLIENT";
- String nagiosServer = "NAGIOS_SERVER";
+ String fakeServer = "FAKE_MONITORING_SERVER";
+
createServiceComponent(clusterName, hdfsService, namenode,
State.INIT);
createServiceComponent(clusterName, hdfsService, datanode,
State.INIT);
- createServiceComponent(clusterName, nagiosService, nagiosServer,
+ createServiceComponent(clusterName, fakeMonitoringService, fakeServer,
State.INIT);
String host1 = "h1";
@@ -9626,13 +9530,13 @@ public class AmbariManagementControllerTest {
addHost(host1, clusterName);
createServiceComponentHost(clusterName, hdfsService, namenode, host1, null);
createServiceComponentHost(clusterName, hdfsService, datanode, host1, null);
- createServiceComponentHost(clusterName, nagiosService, nagiosServer, host1,
+ createServiceComponentHost(clusterName, fakeMonitoringService, fakeServer, host1,
null);
ServiceComponentHost nagiosSch = null;
for (ServiceComponentHost sch : cluster.getServiceComponentHosts(host1)) {
- if (sch.getServiceComponentName().equals(nagiosServer)) {
+ if (sch.getServiceComponentName().equals(fakeServer)) {
nagiosSch = sch;
}
}
@@ -9640,6 +9544,7 @@ public class AmbariManagementControllerTest {
createServiceComponent(clusterName, hdfsService, hdfsClient,
State.INIT);
+
createServiceComponentHost(clusterName, hdfsService, hdfsClient, host1, null);
assertTrue(nagiosSch.isRestartRequired());
@@ -9703,25 +9608,19 @@ public class AmbariManagementControllerTest {
public void testMaintenanceState() throws Exception {
String clusterName = "c1";
createCluster(clusterName);
- clusters.getCluster(clusterName)
- .setDesiredStackVersion(new StackId("HDP-1.2.0"));
+ clusters.getCluster(clusterName).setDesiredStackVersion(
+ new StackId("HDP-1.2.0"));
+
String serviceName = "HDFS";
- String nagiosService = "NAGIOS";
createService(clusterName, serviceName, null);
- createService(clusterName, nagiosService, null);
String componentName1 = "NAMENODE";
String componentName2 = "DATANODE";
String componentName3 = "HDFS_CLIENT";
- String componentName4 = "NAGIOS_SERVER";
- createServiceComponent(clusterName, serviceName, componentName1,
- State.INIT);
- createServiceComponent(clusterName, serviceName, componentName2,
- State.INIT);
- createServiceComponent(clusterName, serviceName, componentName3,
- State.INIT);
- createServiceComponent(clusterName, nagiosService, componentName4,
- State.INIT);
+
+ createServiceComponent(clusterName, serviceName, componentName1, State.INIT);
+ createServiceComponent(clusterName, serviceName, componentName2, State.INIT);
+ createServiceComponent(clusterName, serviceName, componentName3, State.INIT);
String host1 = "h1";
String host2 = "h2";
@@ -9729,10 +9628,12 @@ public class AmbariManagementControllerTest {
addHost(host1, clusterName);
addHost(host2, clusterName);
- createServiceComponentHost(clusterName, serviceName, componentName1, host1, null);
- createServiceComponentHost(clusterName, serviceName, componentName2, host1, null);
- createServiceComponentHost(clusterName, serviceName, componentName2, host2, null);
- createServiceComponentHost(clusterName, nagiosService, componentName4, host1, null);
+ createServiceComponentHost(clusterName, serviceName, componentName1, host1,
+ null);
+ createServiceComponentHost(clusterName, serviceName, componentName2, host1,
+ null);
+ createServiceComponentHost(clusterName, serviceName, componentName2, host2,
+ null);
Map<String, String> requestProperties = new HashMap<String, String>();
requestProperties.put("context", "Called from a test");
@@ -9741,14 +9642,14 @@ public class AmbariManagementControllerTest {
Service service = cluster.getService(serviceName);
Map<String, Host> hosts = clusters.getHostsForCluster(clusterName);
- MaintenanceStateHelper maintenanceStateHelper =
- MaintenanceStateHelperTest.getMaintenanceStateHelperInstance(clusters);
+ MaintenanceStateHelper maintenanceStateHelper = MaintenanceStateHelperTest.getMaintenanceStateHelperInstance(clusters);
// test updating a service
ServiceRequest sr = new ServiceRequest(clusterName, serviceName, null);
sr.setMaintenanceState(MaintenanceState.ON.name());
- ServiceResourceProviderTest.updateServices(controller, Collections.singleton(sr),
- requestProperties, false, false, maintenanceStateHelper);
+ ServiceResourceProviderTest.updateServices(controller,
+ Collections.singleton(sr), requestProperties, false, false,
+ maintenanceStateHelper);
Assert.assertEquals(MaintenanceState.ON, service.getMaintenanceState());
// check the host components implied state vs desired state
@@ -9762,8 +9663,9 @@ public class AmbariManagementControllerTest {
// reset
sr.setMaintenanceState(MaintenanceState.OFF.name());
- ServiceResourceProviderTest.updateServices(controller, Collections.singleton(sr),
- requestProperties, false, false, maintenanceStateHelper);
+ ServiceResourceProviderTest.updateServices(controller,
+ Collections.singleton(sr), requestProperties, false, false,
+ maintenanceStateHelper);
Assert.assertEquals(MaintenanceState.OFF, service.getMaintenanceState());
// check the host components implied state vs desired state
@@ -9782,9 +9684,11 @@ public class AmbariManagementControllerTest {
new HashMap<String, String>());
Host host = hosts.get(host1);
- Assert.assertEquals(MaintenanceState.ON, host.getMaintenanceState(cluster.getClusterId()));
+ Assert.assertEquals(MaintenanceState.ON,
+ host.getMaintenanceState(cluster.getClusterId()));
- // check the host components implied state vs desired state, only for affected hosts
+ // check the host components implied state vs desired state, only for
+ // affected hosts
for (ServiceComponent sc : service.getServiceComponents().values()) {
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
MaintenanceState implied = controller.getEffectiveMaintenanceState(sch);
@@ -9803,7 +9707,8 @@ public class AmbariManagementControllerTest {
new HashMap<String, String>());
host = hosts.get(host1);
- Assert.assertEquals(MaintenanceState.OFF, host.getMaintenanceState(cluster.getClusterId()));
+ Assert.assertEquals(MaintenanceState.OFF,
+ host.getMaintenanceState(cluster.getClusterId()));
// check the host components active state vs desired state
for (ServiceComponent sc : service.getServiceComponents().values()) {
@@ -9822,12 +9727,15 @@ public class AmbariManagementControllerTest {
Set<HostRequest> set = new HashSet<HostRequest>();
set.add(hr1);
set.add(hr2);
- HostResourceProviderTest.updateHosts(controller, set, new HashMap<String, String>());
+ HostResourceProviderTest.updateHosts(controller, set,
+ new HashMap<String, String>());
host = hosts.get(host1);
- Assert.assertEquals(MaintenanceState.ON, host.getMaintenanceState(cluster.getClusterId()));
+ Assert.assertEquals(MaintenanceState.ON,
+ host.getMaintenanceState(cluster.getClusterId()));
host = hosts.get(host2);
- Assert.assertEquals(MaintenanceState.ON, host.getMaintenanceState(cluster.getClusterId()));
+ Assert.assertEquals(MaintenanceState.ON,
+ host.getMaintenanceState(cluster.getClusterId()));
// reset
hr1 = new HostRequest(host1, clusterName, requestProperties);
@@ -9838,43 +9746,49 @@ public class AmbariManagementControllerTest {
set.add(hr1);
set.add(hr2);
- HostResourceProviderTest.updateHosts(controller, set, new HashMap<String, String>());
+ HostResourceProviderTest.updateHosts(controller, set,
+ new HashMap<String, String>());
host = hosts.get(host1);
- Assert.assertEquals(MaintenanceState.OFF, host.getMaintenanceState(cluster.getClusterId()));
+ Assert.assertEquals(MaintenanceState.OFF,
+ host.getMaintenanceState(cluster.getClusterId()));
host = hosts.get(host2);
- Assert.assertEquals(MaintenanceState.OFF, host.getMaintenanceState(cluster.getClusterId()));
-
+ Assert.assertEquals(MaintenanceState.OFF,
+ host.getMaintenanceState(cluster.getClusterId()));
// only do one SCH
- ServiceComponentHost targetSch = service.getServiceComponent(
- componentName2).getServiceComponentHosts().get(host2);
+ ServiceComponentHost targetSch = service.getServiceComponent(componentName2).getServiceComponentHosts().get(
+ host2);
Assert.assertNotNull(targetSch);
targetSch.setMaintenanceState(MaintenanceState.ON);
// check the host components active state vs desired state
- Assert.assertEquals(MaintenanceState.ON, controller.getEffectiveMaintenanceState(targetSch));
+ Assert.assertEquals(MaintenanceState.ON,
+ controller.getEffectiveMaintenanceState(targetSch));
// update the service
service.setMaintenanceState(MaintenanceState.ON);
- Assert.assertEquals(MaintenanceState.ON, controller.getEffectiveMaintenanceState(targetSch));
+ Assert.assertEquals(MaintenanceState.ON,
+ controller.getEffectiveMaintenanceState(targetSch));
// make SCH active
targetSch.setMaintenanceState(MaintenanceState.OFF);
Assert.assertEquals(MaintenanceState.IMPLIED_FROM_SERVICE,
- controller.getEffectiveMaintenanceState(targetSch));
+ controller.getEffectiveMaintenanceState(targetSch));
// update the service
service.setMaintenanceState(MaintenanceState.OFF);
- Assert.assertEquals(MaintenanceState.OFF, controller.getEffectiveMaintenanceState(targetSch));
+ Assert.assertEquals(MaintenanceState.OFF,
+ controller.getEffectiveMaintenanceState(targetSch));
host = hosts.get(host2);
// update host
host.setMaintenanceState(cluster.getClusterId(), MaintenanceState.ON);
Assert.assertEquals(MaintenanceState.IMPLIED_FROM_HOST,
- controller.getEffectiveMaintenanceState(targetSch));
+ controller.getEffectiveMaintenanceState(targetSch));
targetSch.setMaintenanceState(MaintenanceState.ON);
- Assert.assertEquals(MaintenanceState.ON, controller.getEffectiveMaintenanceState(targetSch));
+ Assert.assertEquals(MaintenanceState.ON,
+ controller.getEffectiveMaintenanceState(targetSch));
// check the host components active state vs desired state
for (ServiceComponent sc : service.getServiceComponents().values()) {
@@ -9883,17 +9797,13 @@ public class AmbariManagementControllerTest {
}
}
- long id1 = installService(clusterName, serviceName, false, false, maintenanceStateHelper);
- long id2 = installService(clusterName, nagiosService, false, false, maintenanceStateHelper);
+ long id1 = installService(clusterName, serviceName, false, false,
+ maintenanceStateHelper);
List<HostRoleCommand> hdfsCmds = actionDB.getRequestTasks(id1);
- List<HostRoleCommand> nagiosCmds = actionDB.getRequestTasks(id2);
-
Assert.assertNotNull(hdfsCmds);
- Assert.assertNotNull(nagiosCmds);
HostRoleCommand datanodeCmd = null;
- HostRoleCommand nagiosCmd = null;
for (HostRoleCommand cmd : hdfsCmds) {
if (cmd.getRole().equals(Role.DATANODE)) {
@@ -9901,19 +9811,7 @@ public class AmbariManagementControllerTest {
}
}
- for (HostRoleCommand cmd : nagiosCmds) {
- if (cmd.getRole().equals(Role.NAGIOS_SERVER)) {
- nagiosCmd = cmd;
- }
- }
-
Assert.assertNotNull(datanodeCmd);
- Assert.assertNotNull(nagiosCmd);
- Assert.assertNotNull(nagiosCmd.getExecutionCommandWrapper()
- .getExecutionCommand().getPassiveInfo());
- Assert.assertEquals(Integer.valueOf(1),
- Integer.valueOf(nagiosCmd.getExecutionCommandWrapper()
- .getExecutionCommand().getPassiveInfo().size()));
// verify passive sch was skipped
for (ServiceComponent sc : service.getServiceComponents().values()) {
@@ -9922,10 +9820,10 @@ public class AmbariManagementControllerTest {
}
for (ServiceComponentHost sch : sc.getServiceComponentHosts().values()) {
- Assert.assertEquals(sch == targetSch ? State.INIT : State.INSTALLED, sch.getState());
+ Assert.assertEquals(sch == targetSch ? State.INIT : State.INSTALLED,
+ sch.getState());
}
}
-
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
index dcb793e..c9b7bdd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
@@ -17,6 +17,19 @@
*/
package org.apache.ambari.server.controller.ganglia;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expect;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.configuration.ComponentSSLConfigurationTest;
import org.apache.ambari.server.controller.internal.PropertyInfo;
@@ -38,19 +51,6 @@ import org.junit.runners.Parameterized;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.expect;
-
/**
* Test the Ganglia property provider.
*/
@@ -68,21 +68,21 @@ public class GangliaPropertyProviderTest {
private static final String CLUSTER_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles", "cluster_name");
private static final String HOST_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles", "host_name");
private static final String COMPONENT_NAME_PROPERTY_ID = PropertyHelper.getPropertyId("HostRoles", "component_name");
-
-
+
+
private ComponentSSLConfiguration configuration;
@Parameterized.Parameters
public static Collection<Object[]> configs() {
- ComponentSSLConfiguration configuration1 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, false);
+ ComponentSSLConfiguration configuration1 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
- ComponentSSLConfiguration configuration2 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration configuration2 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", true);
- ComponentSSLConfiguration configuration3 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, true);
+ ComponentSSLConfiguration configuration3 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
return Arrays.asList(new Object[][]{
{configuration1},
@@ -159,17 +159,17 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
-
+
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/mapred/shuffleOutput/shuffle_exceptions_caught");
metricsRegexes.add("metrics/mapred/shuffleOutput/shuffle_failed_outputs");
metricsRegexes.add("metrics/mapred/shuffleOutput/shuffle_output_bytes");
metricsRegexes.add("metrics/mapred/shuffleOutput/shuffle_success_outputs");
-
-
+
+
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "TASKTRACKER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -181,14 +181,14 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
+
Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
Assert.assertEquals(6, PropertyHelper.getProperties(resource).size());
@@ -207,7 +207,7 @@ public class GangliaPropertyProviderTest {
Assert.assertNotNull(resource.getPropertyValue(shuffle_output_bytes));
Assert.assertNotNull(resource.getPropertyValue(shuffle_success_outputs));
}
-
+
@Test
public void testPopulateResources_checkHostComponent() throws Exception {
TestStreamProvider streamProvider = new TestStreamProvider("temporal_ganglia_data.txt");
@@ -233,20 +233,20 @@ public class GangliaPropertyProviderTest {
Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
temporalInfoMap.put(PROPERTY_ID, new TemporalInfoImpl(10L, 20L, 1L));
Request request = PropertyHelper.getReadRequest(Collections.singleton(PROPERTY_ID), temporalInfoMap);
-
+
expect(hostProvider.getGangliaCollectorHostName(anyObject(String.class))).andReturn("ganglia-host");
expect(hostProvider.isGangliaCollectorComponentLive(anyObject(String.class))).andReturn(true).once();
expect(hostProvider.isGangliaCollectorHostLive(anyObject(String.class))).andReturn(true).once();
-
-
+
+
PowerMock.replay(hostProvider);
-
+
Set<Resource> populateResources = propertyProvider.populateResources(Collections.singleton(resource), request, null);
-
+
PowerMock.verify(hostProvider);
-
+
Assert.assertEquals(1, populateResources.size());
-
+
}
@Test
@@ -317,7 +317,7 @@ public class GangliaPropertyProviderTest {
Request request = PropertyHelper.getReadRequest(Collections.singleton(PROPERTY_ID), temporalInfoMap);
Assert.assertEquals(3, propertyProvider.populateResources(resources, request, null).size());
-
+
URIBuilder uriBuilder = new URIBuilder();
uriBuilder.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -331,7 +331,7 @@ public class GangliaPropertyProviderTest {
uriBuilder.setParameter("r", "1");
String expected = uriBuilder.toString();
-
+
Assert.assertEquals(expected, streamProvider.getLastSpec());
for (Resource res : resources) {
@@ -357,16 +357,17 @@ public class GangliaPropertyProviderTest {
Set<Resource> resources = new HashSet<Resource>();
StringBuilder hostsList = new StringBuilder();
-
+
for (int i = 0; i < 150; ++i) {
Resource resource = new ResourceImpl(Resource.Type.Host);
resource.setProperty(HOST_NAME_PROPERTY_ID, "host" + i);
resources.add(resource);
-
- if (hostsList.length() != 0)
+
+ if (hostsList.length() != 0) {
hostsList.append("," + "host" + i );
- else
- hostsList.append("host" + i);
+ } else {
+ hostsList.append("host" + i);
+ }
}
// only ask for one property
@@ -376,29 +377,29 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(150, propertyProvider.populateResources(resources, request, null).size());
-
+
URIBuilder expectedUri = new URIBuilder();
-
+
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
expectedUri.setPath("/cgi-bin/rrd.py");
expectedUri.setParameter("c", "HDPJobTracker,HDPHBaseMaster,HDPKafka,HDPResourceManager,HDPFlumeServer,HDPSlaves,HDPHistoryServer,HDPJournalNode,HDPTaskTracker,HDPHBaseRegionServer,HDPNameNode");
-
+
expectedUri.setParameter("h", hostsList.toString());
expectedUri.setParameter("m", "jvm.metrics.gcCount");
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
-
+
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
+
Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
}
-
+
@Test
public void testPopulateResources_params() throws Exception {
TestStreamProvider streamProvider = new TestStreamProvider("flume_ganglia_data.txt");
@@ -428,13 +429,13 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add(FLUME_CHANNEL_CAPACITY_PROPERTY);
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
-
+
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
expectedUri.setHost("domU-12-31-39-0E-34-E1.compute-1.internal");
expectedUri.setPath("/cgi-bin/rrd.py");
@@ -444,15 +445,15 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
- Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
-
+
+ Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
+
Assert.assertEquals(3, PropertyHelper.getProperties(resource).size());
Assert.assertNotNull(resource.getPropertyValue(FLUME_CHANNEL_CAPACITY_PROPERTY));
}
@@ -471,7 +472,7 @@ public class GangliaPropertyProviderTest {
CLUSTER_NAME_PROPERTY_ID,
HOST_NAME_PROPERTY_ID,
COMPONENT_NAME_PROPERTY_ID);
-
+
// flume
Resource resource = new ResourceImpl(Resource.Type.HostComponent);
@@ -490,12 +491,12 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/flume");
metricsRegexes.add("metrics/cpu/cpu_wio");
-
+
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -506,15 +507,15 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("m", metricsList);
expectedUri.setParameter("e", "now");
expectedUri.setParameter("pt", "true");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
+
Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
-
+
Assert.assertEquals(22, PropertyHelper.getProperties(resource).size());
Assert.assertNotNull(resource.getPropertyValue(PROPERTY_ID2));
Assert.assertNotNull(resource.getPropertyValue(FLUME_CHANNEL_CAPACITY_PROPERTY));
@@ -547,7 +548,7 @@ public class GangliaPropertyProviderTest {
String expected = (configuration.isGangliaSSL() ? "https" : "http") +
"://domU-12-31-39-0E-34-E1.compute-1.internal/cgi-bin/rrd.py?c=HDPFlumeServer%2CHDPSlaves&h=ip-10-39-113-33.ec2.internal&m=";
-
+
Assert.assertTrue(streamProvider.getLastSpec().startsWith(expected));
Assert.assertEquals(33, PropertyHelper.getProperties(resource).size());
@@ -583,11 +584,11 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/flume");
-
+
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -599,14 +600,14 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
- Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
+
+ Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
Assert.assertEquals(21, PropertyHelper.getProperties(resource).size());
Assert.assertNotNull(resource.getPropertyValue(FLUME_CHANNEL_CAPACITY_PROPERTY));
@@ -641,11 +642,11 @@ public class GangliaPropertyProviderTest {
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/flume/");
-
+
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -657,13 +658,13 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
+
Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
Assert.assertEquals(21, PropertyHelper.getProperties(resource).size());
@@ -697,14 +698,14 @@ public class GangliaPropertyProviderTest {
Request request = PropertyHelper.getReadRequest(Collections.singleton(FLUME_CATEGORY3), temporalInfoMap);
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
-
+
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/flume/$1/CHANNEL/$2/");
metricsRegexes.add(FLUME_CHANNEL_CAPACITY_PROPERTY);
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -716,14 +717,14 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
- Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
+
+ Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
Assert.assertEquals(11, PropertyHelper.getProperties(resource).size());
Assert.assertNotNull(resource.getPropertyValue(FLUME_CHANNEL_CAPACITY_PROPERTY));
@@ -756,14 +757,14 @@ public class GangliaPropertyProviderTest {
Request request = PropertyHelper.getReadRequest(Collections.singleton(FLUME_CATEGORY4), temporalInfoMap);
Assert.assertEquals(1, propertyProvider.populateResources(Collections.singleton(resource), request, null).size());
-
+
List<String> metricsRegexes = new ArrayList<String>();
-
+
metricsRegexes.add("metrics/flume/$1/CHANNEL/$2");
metricsRegexes.add(FLUME_CHANNEL_CAPACITY_PROPERTY);
String metricsList = getMetricsRegexes(metricsRegexes, gangliaPropertyIds, "FLUME_HANDLER");
-
+
URIBuilder expectedUri = new URIBuilder();
expectedUri.setScheme((configuration.isGangliaSSL() ? "https" : "http"));
@@ -775,57 +776,59 @@ public class GangliaPropertyProviderTest {
expectedUri.setParameter("s", "10");
expectedUri.setParameter("e", "20");
expectedUri.setParameter("r", "1");
-
+
URIBuilder actualUri = new URIBuilder(streamProvider.getLastSpec());
Assert.assertEquals(expectedUri.getScheme(), actualUri.getScheme());
Assert.assertEquals(expectedUri.getHost(), actualUri.getHost());
Assert.assertEquals(expectedUri.getPath(), actualUri.getPath());
-
- Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
-
+
+ Assert.assertTrue(isUrlParamsEquals(actualUri, expectedUri));
+
Assert.assertEquals(11, PropertyHelper.getProperties(resource).size());
Assert.assertNotNull(resource.getPropertyValue(FLUME_CHANNEL_CAPACITY_PROPERTY));
}
-
-
+
+
private boolean isUrlParamsEquals(URIBuilder actualUri, URIBuilder expectedUri) {
for (final NameValuePair expectedParam : expectedUri.getQueryParams()) {
NameValuePair actualParam = (NameValuePair) CollectionUtils.find(actualUri.getQueryParams(), new Predicate() {
-
+
@Override
public boolean evaluate(Object arg0) {
- if (!(arg0 instanceof NameValuePair))
+ if (!(arg0 instanceof NameValuePair)) {
return false;
-
+ }
+
NameValuePair otherObj = (NameValuePair) arg0;
return otherObj.getName().equals(expectedParam.getName());
}
});
-
+
List<String> actualParamList = new ArrayList<String>(Arrays.asList(actualParam.getValue().split(",")));
List<String> expectedParamList = new ArrayList<String>(Arrays.asList(expectedParam.getValue().split(",")));
-
+
Collections.sort(actualParamList);
Collections.sort(expectedParamList);
-
- if (!actualParamList.equals(expectedParamList))
+
+ if (!actualParamList.equals(expectedParamList)) {
return false;
+ }
}
-
+
return true;
}
-
+
private String getMetricsRegexes(List<String> metricsRegexes,
Map<String, Map<String, PropertyInfo>> gangliaPropertyIds,
String componentName) {
-
+
StringBuilder metricsBuilder = new StringBuilder();
-
+
for (Map.Entry<String, PropertyInfo> entry : gangliaPropertyIds.get(componentName).entrySet())
{
for (String metricRegex: metricsRegexes)
@@ -842,7 +845,7 @@ public class GangliaPropertyProviderTest {
private boolean isHostLive;
private boolean isComponentLive;
-
+
public TestGangliaHostProvider() {
this(true, true);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
index 1ae17b3..b8609c2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
@@ -17,6 +17,12 @@
*/
package org.apache.ambari.server.controller.ganglia;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.configuration.ComponentSSLConfigurationTest;
import org.apache.ambari.server.controller.internal.ResourceImpl;
@@ -31,12 +37,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* Test the Ganglia report property provider.
*/
@@ -50,14 +50,14 @@ public class GangliaReportPropertyProviderTest {
@Parameterized.Parameters
public static Collection<Object[]> configs() {
- ComponentSSLConfiguration configuration1 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, false);
+ ComponentSSLConfiguration configuration1 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
- ComponentSSLConfiguration configuration2 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration configuration2 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", true);
- ComponentSSLConfiguration configuration3 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, true);
+ ComponentSSLConfiguration configuration3 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
return Arrays.asList(new Object[][]{
{configuration1},
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
index 9053167..07ff7fe 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
@@ -18,16 +18,17 @@
package org.apache.ambari.server.controller.gsinstaller;
+import java.util.HashMap;
+import java.util.Set;
+
import junit.framework.Assert;
+
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Set;
-
/**
* Tests for GSInstallerComponentProvider.
*/
@@ -38,7 +39,7 @@ public class GSInstallerComponentProviderTest {
ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
GSInstallerResourceProvider provider = new GSInstallerComponentProvider(clusterDefinition);
Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
- Assert.assertEquals(25, resources.size());
+ Assert.assertEquals(24, resources.size());
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
index a4f04e9..c9878f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
@@ -18,16 +18,17 @@
package org.apache.ambari.server.controller.gsinstaller;
+import java.util.HashMap;
+import java.util.Set;
+
import junit.framework.Assert;
+
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Set;
-
/**
*
*/
@@ -38,7 +39,7 @@ public class GSInstallerHostComponentProviderTest {
ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
GSInstallerResourceProvider provider = new GSInstallerHostComponentProvider(clusterDefinition);
Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
- Assert.assertEquals(33, resources.size());
+ Assert.assertEquals(32, resources.size());
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
index e871eba..3fd4bd7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
@@ -18,16 +18,17 @@
package org.apache.ambari.server.controller.gsinstaller;
+import java.util.HashMap;
+import java.util.Set;
+
import junit.framework.Assert;
+
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Set;
-
/**
*
*/
@@ -38,24 +39,38 @@ public class GSInstallerServiceProviderTest {
ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
GSInstallerResourceProvider provider = new GSInstallerServiceProvider(clusterDefinition);
Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
- Assert.assertEquals(12, resources.size());
+ Assert.assertEquals(11, resources.size());
}
@Test
public void testGetResourcesWithPredicate() throws Exception {
- ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
- GSInstallerResourceProvider provider = new GSInstallerServiceProvider(clusterDefinition);
- Predicate predicate = new PredicateBuilder().property(GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("MAPREDUCE").toPredicate();
- Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
+ ClusterDefinition clusterDefinition = new ClusterDefinition(
+ new TestGSInstallerStateProvider());
+ GSInstallerResourceProvider provider = new GSInstallerServiceProvider(
+ clusterDefinition);
+ Predicate predicate = new PredicateBuilder().property(
+ GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(
+ "MAPREDUCE").toPredicate();
+ Set<Resource> resources = provider.getResources(
+ PropertyHelper.getReadRequest(), predicate);
Assert.assertEquals(1, resources.size());
- predicate = new PredicateBuilder().property(GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("GANGLIA").or().
- property(GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("NAGIOS").toPredicate();
- resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
+ predicate = new PredicateBuilder().property(
+ GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(
+ "HDFS").or().property(
+ GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(
+ "GANGLIA").toPredicate();
+
+ resources = provider.getResources(PropertyHelper.getReadRequest(),
+ predicate);
+
Assert.assertEquals(2, resources.size());
- predicate = new PredicateBuilder().property(GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals("NO SERVICE").toPredicate();
- resources = provider.getResources(PropertyHelper.getReadRequest(), predicate);
+ predicate = new PredicateBuilder().property(
+ GSInstallerServiceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(
+ "NO SERVICE").toPredicate();
+ resources = provider.getResources(PropertyHelper.getReadRequest(),
+ predicate);
Assert.assertTrue(resources.isEmpty());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java
index 2cc788a..154d125 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HttpPropertyProviderTest.java
@@ -53,27 +53,25 @@ public class HttpPropertyProviderTest {
private static final String PROPERTY_ID_CLUSTER_NAME = PropertyHelper.getPropertyId("HostRoles", "cluster_name");
private static final String PROPERTY_ID_HOST_NAME = PropertyHelper.getPropertyId("HostRoles", "host_name");
private static final String PROPERTY_ID_COMPONENT_NAME = PropertyHelper.getPropertyId("HostRoles", "component_name");
-
- private static final String PROPERTY_ID_NAGIOS_ALERTS = PropertyHelper.getPropertyId("HostRoles", "nagios_alerts");
+
+ private static final String PROPERTY_ID_STALE_CONFIGS = PropertyHelper.getPropertyId(
+ "HostRoles", "stale_configs");
private ComponentSSLConfiguration configuration;
@Parameterized.Parameters
public static Collection<Object[]> configs() {
- ComponentSSLConfiguration configuration1 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, false);
+ ComponentSSLConfiguration configuration1 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
- ComponentSSLConfiguration configuration2 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", true, false);
+ ComponentSSLConfiguration configuration2 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", true);
- ComponentSSLConfiguration configuration3 =
- ComponentSSLConfigurationTest.getConfiguration("tspath", "tspass", "tstype", false, true);
+ ComponentSSLConfiguration configuration3 = ComponentSSLConfigurationTest.getConfiguration(
+ "tspath", "tspass", "tstype", false);
- return Arrays.asList(new Object[][]{
- {configuration1},
- {configuration2},
- {configuration3}
- });
+ return Arrays.asList(new Object[][] { { configuration1 },
+ { configuration2 }, { configuration3 } });
}
@@ -127,15 +125,13 @@ public class HttpPropertyProviderTest {
@Test
public void testReadGangliaServer() throws Exception {
-
- Resource resource = doPopulate("GANGLIA_SERVER", Collections.<String>emptySet(), new TestStreamProvider(false));
+ Resource resource = doPopulate("GANGLIA_SERVER",
+ Collections.<String> emptySet(), new TestStreamProvider(false));
// !!! GANGLIA_SERVER has no current http lookup
- Assert.assertNull("Expected null, was: " +
- resource.getPropertyValue(PROPERTY_ID_NAGIOS_ALERTS),
- resource.getPropertyValue(PROPERTY_ID_NAGIOS_ALERTS));
+ Assert.assertNull(resource.getPropertyValue(PROPERTY_ID_STALE_CONFIGS));
}
-
+
private Resource doPopulate(String componentName,
Set<String> requestProperties, StreamProvider streamProvider) throws Exception {
Injector injector = createNiceMock(Injector.class);
@@ -151,9 +147,9 @@ public class HttpPropertyProviderTest {
resource.setProperty(PROPERTY_ID_HOST_NAME, "ec2-54-234-33-50.compute-1.amazonaws.com");
resource.setProperty(PROPERTY_ID_CLUSTER_NAME, "testCluster");
resource.setProperty(PROPERTY_ID_COMPONENT_NAME, componentName);
-
+
Request request = PropertyHelper.getReadRequest(requestProperties);
-
+
propProvider.populateResources(Collections.singleton(resource), request, null);
return resource;
@@ -167,18 +163,19 @@ public class HttpPropertyProviderTest {
private TestStreamProvider(boolean throwErr) {
throwError = throwErr;
}
-
+
@Override
public InputStream readFrom(String spec) throws IOException {
- if (!isLastSpecUpdated)
+ if (!isLastSpecUpdated) {
lastSpec = spec;
-
+ }
+
isLastSpecUpdated = false;
if (throwError) {
throw new IOException("Fake error");
}
-
+
String responseStr = "{\"alerts\": [{\"Alert Body\": \"Body\"}],\"clusterInfo\": {\"haState\": \"ACTIVE\"},"
+ " \"hostcounts\": {\"up_hosts\":\"1\", \"down_hosts\":\"0\"}}";
return new ByteArrayInputStream(responseStr.getBytes("UTF-8"));
@@ -195,5 +192,5 @@ public class HttpPropertyProviderTest {
return readFrom(spec);
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
index 91adc9b..d69d48e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
@@ -18,15 +18,16 @@
package org.apache.ambari.server.controller.internal;
+import java.util.HashSet;
+import java.util.Set;
+
import junit.framework.Assert;
+
+import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.controller.spi.Request;
import org.junit.Test;
-import java.util.HashSet;
-import java.util.Set;
-
/**
*
*/
@@ -55,7 +56,6 @@ public class RequestImplTest {
//HostComponent resource properties
Assert.assertFalse(validPropertyIds.contains("HostRoles/unsupported_property_id"));
- Assert.assertTrue(validPropertyIds.contains("HostRoles/nagios_alerts"));
Assert.assertTrue(validPropertyIds.contains("params/run_smoke_test"));
Assert.assertTrue(validPropertyIds.contains("HostRoles/actual_configs"));
Assert.assertTrue(validPropertyIds.contains("HostRoles/desired_stack_id"));
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
deleted file mode 100644
index 8037451..0000000
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.ambari.server.controller.nagios;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reset;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.configuration.Configuration;
-import org.apache.ambari.server.controller.ganglia.TestStreamProvider;
-import org.apache.ambari.server.controller.internal.ResourceImpl;
-import org.apache.ambari.server.controller.spi.Request;
-import org.apache.ambari.server.controller.spi.Resource;
-import org.apache.ambari.server.controller.spi.TemporalInfo;
-import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.state.Alert;
-import org.apache.ambari.server.state.Cluster;
-import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Service;
-import org.apache.ambari.server.state.ServiceComponent;
-import org.apache.ambari.server.state.ServiceComponentHost;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.inject.Binder;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Module;
-import java.util.Collection;
-import java.util.LinkedList;
-
-/**
- * Tests the nagios property provider
- */
-public class NagiosPropertyProviderTest {
-
- private static final String HOST = "c6401.ambari.apache.org";
-
- private GuiceModule module = null;
- private Clusters clusters = null;
- private Injector injector = null;
-
- @Before
- public void setup() throws Exception {
- module = new GuiceModule();
- injector = Guice.createInjector(module);
- NagiosPropertyProvider.init(injector);
-
- clusters = injector.getInstance(Clusters.class);
- Cluster cluster = createMock(Cluster.class);
-
- expect(cluster.getAlerts()).andReturn(Collections.<Alert>emptySet()).anyTimes();
-
- expect(clusters.getCluster("c1")).andReturn(cluster).anyTimes();
-
-
- Service nagiosService = createMock(Service.class);
- expect(cluster.getService("NAGIOS")).andReturn(nagiosService).anyTimes();
-
- ServiceComponent nagiosServiceComponent = createMock(ServiceComponent.class);
- expect(nagiosService.getServiceComponent("NAGIOS_SERVER")).andReturn(
- nagiosServiceComponent).anyTimes();
-
- ServiceComponentHost nagiosScHost = createMock(ServiceComponentHost.class);
- Map<String, ServiceComponentHost> map1 = new HashMap<String, ServiceComponentHost>();
- map1.put(HOST, nagiosScHost);
- expect(nagiosServiceComponent.getServiceComponentHosts()).andReturn(
- map1).anyTimes();
-
- replay(clusters, cluster, nagiosService, nagiosServiceComponent);
- }
-
- @Test
- public void testNoNagiosService() throws Exception {
- Cluster cluster = clusters.getCluster("c1");
- reset(cluster); // simulate an error that NAGIOS not with the cluster
- expect(cluster.getService("NAGIOS")).andThrow(new AmbariException("No Service"));
- replay(cluster);
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", "c1");
- resource.setProperty("ServiceInfo/service_name", "HBASE");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertFalse("Expected no alerts", values.containsKey("legacy_alerts"));
- }
-
-
- @Test
- public void testClusterDoesNotExistNPE() throws Exception {
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", null);
- resource.setProperty("ServiceInfo/service_name", "HBASE");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(),
- new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- }
-
- @Test
- public void testNagiosClusterAlerts() throws Exception {
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Cluster,
- streamProvider,
- "Clusters/cluster_name",
- "Clusters/version");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Cluster);
- resource.setProperty("Clusters/cluster_name", "c1");
- resource.setProperty("Clusters/version", "HDP-2.0.6");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertEquals(4L, summary.size());
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
- Assert.assertFalse(summary.containsKey("detail"));
-
- //Totally 4 hosts, no hosts with no alerts
- Assert.assertTrue(summary.get("OK").equals(Integer.valueOf(0)));
- Assert.assertTrue(summary.get("WARNING").equals(Integer.valueOf(1)));
- Assert.assertTrue(summary.get("CRITICAL").equals(Integer.valueOf(2)));
- Assert.assertTrue(summary.get("PASSIVE").equals(Integer.valueOf(1)));
-
- }
-
- @Test
- public void testNoNagiosServerComponent() throws Exception {
-
- Cluster cluster = clusters.getCluster("c1");
- reset(cluster);
-
- Service nagiosService = createMock(Service.class);
- expect(cluster.getService("NAGIOS")).andReturn(nagiosService);
-
- ServiceComponent nagiosServiceComponent = createMock(ServiceComponent.class);
- expect(nagiosService.getServiceComponent("NAGIOS_SERVER")).andThrow(new AmbariException("No Component"));
-
- replay(cluster, nagiosService);
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", "c1");
- resource.setProperty("ServiceInfo/service_name", "HBASE");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertFalse("Expected no alerts", values.containsKey("legacy_alerts"));
- }
-
- @Test
- public void testNagiosServiceAlerts() throws Exception {
- module.properties.remove(Configuration.NAGIOS_IGNORE_FOR_SERVICES_KEY); // make sure NAGIOS_IGNORE_FOR_SERVICES_KEY is not set, which could be set by testNagiosServiceAlertsAddIgnore
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
- NagiosPropertyProvider.init(injector);
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", "c1");
- resource.setProperty("ServiceInfo/service_name", "HBASE");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- Assert.assertEquals(Integer.valueOf(3), Integer.valueOf(list.size()));
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("service_name"));
- String serviceName = map.get("service_name").toString();
- Assert.assertTrue("expected HBASE", serviceName.equals("HBASE"));
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertTrue(summary.get("OK").equals(Integer.valueOf(1)));
- Assert.assertTrue(summary.get("WARNING").equals(Integer.valueOf(0)));
- Assert.assertTrue(summary.get("CRITICAL").equals(Integer.valueOf(2)));
- }
-
-
- @Test
- public void testNagiosHostAlerts() throws Exception {
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Host,
- streamProvider,
- "Hosts/cluster_name",
- "Hosts/host_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("Hosts/cluster_name", "c1");
- resource.setProperty("Hosts/host_name", "c6403.ambari.apache.org");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- Assert.assertTrue(7 == list.size());
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("host_name"));
- String host = map.get("host_name").toString();
- Assert.assertTrue("expected c6403.ambari.apache.org", host.equals("c6403.ambari.apache.org"));
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertTrue(summary.get("OK").equals(Integer.valueOf(6)));
- Assert.assertTrue(summary.get("WARNING").equals(Integer.valueOf(0)));
- Assert.assertTrue(summary.get("CRITICAL").equals(Integer.valueOf(1)));
- }
-
- @Test
- public void testNagiosHostAlertsWithIgnore() throws Exception {
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Host,
- streamProvider,
- "Hosts/cluster_name",
- "Hosts/host_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("Hosts/cluster_name", "c1");
- resource.setProperty("Hosts/host_name", "c6401.ambari.apache.org");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- Assert.assertEquals(Integer.valueOf(16), Integer.valueOf(list.size()));
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("host_name"));
- String host = map.get("host_name").toString();
- Assert.assertEquals("c6401.ambari.apache.org", host);
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertEquals(summary.get("OK"), Integer.valueOf(14));
- Assert.assertEquals(summary.get("WARNING"), Integer.valueOf(0));
- Assert.assertEquals(summary.get("CRITICAL"), Integer.valueOf(1));
- Assert.assertEquals(Integer.valueOf(1), summary.get("PASSIVE"));
- }
-
- @Test
- public void testNagiosServiceAlertsAddIgnore() throws Exception {
- module.properties.setProperty(Configuration.NAGIOS_IGNORE_FOR_SERVICES_KEY,
- "HBase Master process on c6401.ambari.apache.org");
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
- NagiosPropertyProvider.init(injector);
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", "c1");
- resource.setProperty("ServiceInfo/service_name", "HBASE");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- // removed an additional one
- Assert.assertEquals(Integer.valueOf(2), Integer.valueOf(list.size()));
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("service_name"));
- String serviceName = map.get("service_name").toString();
- Assert.assertTrue("expected HBASE", serviceName.equals("HBASE"));
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertTrue(summary.get("OK").equals(Integer.valueOf(1)));
- Assert.assertTrue(summary.get("WARNING").equals(Integer.valueOf(0)));
- Assert.assertTrue(summary.get("CRITICAL").equals(Integer.valueOf(1)));
- }
-
- @Test
- public void testNagiosServiceAlertsWithPassive() throws Exception {
- Injector inj = Guice.createInjector(new GuiceModule());
-
- Clusters clusters = inj.getInstance(Clusters.class);
- Cluster cluster = createMock(Cluster.class);
- expect(cluster.getAlerts()).andReturn(Collections.<Alert>emptySet()).anyTimes();
- expect(clusters.getCluster("c1")).andReturn(cluster);
-
- Service nagiosService = createMock(Service.class);
- expect(cluster.getService("NAGIOS")).andReturn(nagiosService);
-
- ServiceComponent nagiosServiceComponent = createMock(ServiceComponent.class);
- expect(nagiosService.getServiceComponent("NAGIOS_SERVER")).andReturn(nagiosServiceComponent);
-
- ServiceComponentHost nagiosScHost = createMock(ServiceComponentHost.class);
- Map<String, ServiceComponentHost> map1 = new HashMap<String, ServiceComponentHost>();
- map1.put(HOST, nagiosScHost);
- expect(nagiosServiceComponent.getServiceComponentHosts()).andReturn(map1);
-
- replay(clusters, cluster, nagiosService, nagiosServiceComponent);
-
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Service,
- streamProvider,
- "ServiceInfo/cluster_name",
- "ServiceInfo/service_name");
- npp.forceReset();
- NagiosPropertyProvider.init(inj);
-
- Resource resource = new ResourceImpl(Resource.Type.Service);
- resource.setProperty("ServiceInfo/cluster_name", "c1");
- resource.setProperty("ServiceInfo/service_name", "GANGLIA");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- // removed an additional one
- Assert.assertEquals(Integer.valueOf(4), Integer.valueOf(list.size()));
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("service_name"));
- String serviceName = map.get("service_name").toString();
- Assert.assertEquals(serviceName, "GANGLIA");
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertEquals(Integer.valueOf(3), summary.get("OK"));
- Assert.assertEquals(Integer.valueOf(0), summary.get("WARNING"));
- Assert.assertEquals(Integer.valueOf(0), summary.get("CRITICAL"));
- Assert.assertEquals(Integer.valueOf(1), summary.get("PASSIVE"));
- }
-
- @Test
- public void testNagiosHostAlertsSubstringPassiveMarker() throws Exception {
-
- TestStreamProvider streamProvider = new TestStreamProvider("nagios_alerts.txt");
-
- NagiosPropertyProvider npp = new NagiosPropertyProvider(Resource.Type.Host,
- streamProvider,
- "Hosts/cluster_name",
- "Hosts/host_name");
- npp.forceReset();
-
- Resource resource = new ResourceImpl(Resource.Type.Host);
- resource.setProperty("Hosts/cluster_name", "c1");
- resource.setProperty("Hosts/host_name", "c6404.ambari.apache.org");
-
- // request with an empty set should get all supported properties
- Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
-
- Set<Resource> set = npp.populateResources(Collections.singleton(resource), request, null);
- Assert.assertEquals(1, set.size());
-
- Resource res = set.iterator().next();
-
- Map<String, Map<String, Object>> values = res.getPropertiesMap();
-
- Assert.assertTrue(values.containsKey("legacy_alerts"));
- Assert.assertTrue(values.containsKey("legacy_alerts/summary"));
- Assert.assertTrue(values.get("legacy_alerts").containsKey("detail"));
- Assert.assertTrue(List.class.isInstance(values.get("legacy_alerts").get("detail")));
-
- List<?> list = (List<?>) values.get("legacy_alerts").get("detail");
- Assert.assertEquals(Integer.valueOf(1), Integer.valueOf(list.size()));
- for (Object o : list) {
- Assert.assertTrue(Map.class.isInstance(o));
- Map<?, ?> map = (Map<?, ?>) o;
- Assert.assertTrue(map.containsKey("host_name"));
- String host = map.get("host_name").toString();
- Assert.assertEquals("c6404.ambari.apache.org", host);
- }
-
- Map<String, Object> summary = values.get("legacy_alerts/summary");
- Assert.assertTrue(summary.containsKey("OK"));
- Assert.assertTrue(summary.containsKey("WARNING"));
- Assert.assertTrue(summary.containsKey("CRITICAL"));
- Assert.assertTrue(summary.containsKey("PASSIVE"));
-
- Assert.assertEquals(Integer.valueOf(0), summary.get("OK"));
- Assert.assertEquals(Integer.valueOf(0), summary.get("WARNING"));
- Assert.assertEquals(Integer.valueOf(0), summary.get("CRITICAL"));
- Assert.assertEquals(Integer.valueOf(1), summary.get("PASSIVE"));
- }
-
- private static class GuiceModule implements Module {
-
- private Properties properties = new Properties();
-
- @Override
- public void configure(Binder binder) {
- binder.bind(Clusters.class).toInstance(createMock(Clusters.class));
- binder.bind(Configuration.class).toInstance(new Configuration(properties));
- }
- }
-
-}