diff options
Diffstat (limited to 'dcae-analytics-tca/src/test/java/org/openecomp')
-rw-r--r-- | dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java | 3 | ||||
-rw-r--r-- | dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilterTest.java | 3 | ||||
-rw-r--r-- | dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilterTest.java (renamed from dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilterTest.java) | 22 | ||||
-rw-r--r-- | dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java | 3 | ||||
-rw-r--r-- | dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java | 145 |
5 files changed, 95 insertions, 81 deletions
diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java index 187ffa2..8bdeee5 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/BaseAnalyticsTCAUnitTest.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Suppliers; import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.ControlLoopEventStatus; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; @@ -123,12 +124,14 @@ public abstract class BaseAnalyticsTCAUnitTest extends BaseDCAEAnalyticsUnitTest majorThreshold.setFieldPath("$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn"); majorThreshold.setVersion("Test Version"); majorThreshold.setThresholdValue(500L); + majorThreshold.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET); majorThreshold.setDirection(Direction.LESS_OR_EQUAL); Threshold criticalThreshold = new Threshold(); criticalThreshold.setClosedLoopControlName("CL-LBAL-LOW-TRAFFIC-SIG-FB480F95-A453-6F24-B767-FD703241AB1A"); criticalThreshold.setThresholdValue(5000L); criticalThreshold.setFieldPath("$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn"); + criticalThreshold.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET); criticalThreshold.setDirection(Direction.GREATER_OR_EQUAL); return Arrays.asList(majorThreshold, criticalThreshold); } diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilterTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilterTest.java index f6925cb..f19943c 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilterTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyDomainFilterTest.java @@ -23,6 +23,7 @@ package org.openecomp.dcae.apod.analytics.tca.processor; import org.junit.Before; import org.junit.Test; import org.openecomp.dcae.apod.analytics.common.service.processor.ProcessingState; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Domain; import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; import org.openecomp.dcae.apod.analytics.tca.BaseAnalyticsTCAUnitTest; @@ -64,7 +65,7 @@ public class TCACEFPolicyDomainFilterTest extends BaseAnalyticsTCAUnitTest { @Test public void testProcessMessageWhenPolicyDomainDoesNotMatchMessageDomain() throws Exception { - cefEventListener.getEvent().getCommonEventHeader().setDomain("notPolicyDomain"); + cefEventListener.getEvent().getCommonEventHeader().setDomain(Domain.other); tcacefPolicyDomainFilter.processMessage(processorContext); assertThat("Processing must terminate early", tcacefPolicyDomainFilter.getProcessingState(), is(ProcessingState.PROCESSING_TERMINATED_EARLY)); diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilterTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilterTest.java index b9a1a65..26b7cac 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyFunctionalRoleFilterTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyEventNameFilterTest.java @@ -32,15 +32,15 @@ import static org.junit.Assert.assertThat; /** * @author Rajiv Singla . Creation Date: 12/19/2016. */ -public class TCACEFPolicyFunctionalRoleFilterTest extends BaseAnalyticsTCAUnitTest { +public class TCACEFPolicyEventNameFilterTest extends BaseAnalyticsTCAUnitTest { - private TCACEFPolicyFunctionalRoleFilter tcacefPolicyFunctionalRoleFilter; + private TCACEFPolicyEventNameFilter tcacefPolicyEventNameFilter; private TCACEFProcessorContext processorContext; private EventListener cefEventListener; @Before public void before() throws Exception { - tcacefPolicyFunctionalRoleFilter = new TCACEFPolicyFunctionalRoleFilter(); + tcacefPolicyEventNameFilter = new TCACEFPolicyEventNameFilter(); processorContext = new TCACEFProcessorContext("", getSampleTCAPolicy()); cefEventListener = getCEFEventListener(); processorContext.setCEFEventListener(cefEventListener); @@ -48,9 +48,9 @@ public class TCACEFPolicyFunctionalRoleFilterTest extends BaseAnalyticsTCAUnitTe @Test public void testProcessMessageWhenMessageIsValid() throws Exception { - tcacefPolicyFunctionalRoleFilter.processMessage(processorContext); + tcacefPolicyEventNameFilter.processMessage(processorContext); assertThat("Processing must finish successfully", - tcacefPolicyFunctionalRoleFilter.getProcessingState(), + tcacefPolicyEventNameFilter.getProcessingState(), is(ProcessingState.PROCESSING_FINISHED_SUCCESSFULLY)); } @@ -58,17 +58,17 @@ public class TCACEFPolicyFunctionalRoleFilterTest extends BaseAnalyticsTCAUnitTe public void testProcessMessageWhenCEFEventIsNull() throws Exception { cefEventListener.setEvent(null); processorContext.setCEFEventListener(cefEventListener); - tcacefPolicyFunctionalRoleFilter.processMessage(processorContext); + tcacefPolicyEventNameFilter.processMessage(processorContext); assertThat("Processing must terminate early", - tcacefPolicyFunctionalRoleFilter.getProcessingState(), is(ProcessingState.PROCESSING_TERMINATED_EARLY)); + tcacefPolicyEventNameFilter.getProcessingState(), is(ProcessingState.PROCESSING_TERMINATED_EARLY)); } @Test - public void testProcessMessageWhenPolicyFunctionalRoleDoesNotMatchMessageFunctionalRole() throws Exception { - cefEventListener.getEvent().getCommonEventHeader().setFunctionalRole("someNonPolicyFunctionalRole"); - tcacefPolicyFunctionalRoleFilter.processMessage(processorContext); + public void testProcessMessageWhenPolicyEventNameDoesNotMatchMessageEventName() throws Exception { + cefEventListener.getEvent().getCommonEventHeader().setEventName("someNonPolicyEventName"); + tcacefPolicyEventNameFilter.processMessage(processorContext); assertThat("Processing must terminate early", - tcacefPolicyFunctionalRoleFilter.getProcessingState(), is(ProcessingState.PROCESSING_TERMINATED_EARLY)); + tcacefPolicyEventNameFilter.getProcessingState(), is(ProcessingState.PROCESSING_TERMINATED_EARLY)); } diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java index fb69e95..c328d8a 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/processor/TCACEFPolicyThresholdsProcessorTest.java @@ -63,7 +63,8 @@ public class TCACEFPolicyThresholdsProcessorTest extends BaseAnalyticsTCAUnitTes final TCACEFProcessorContext tcacefProcessorContext = new TCACEFProcessorContext(cefMessageString, getSampleTCAPolicy()); - final EventListener eventListener = getCEFEventListener(); + final EventListener eventListener = ANALYTICS_MODEL_OBJECT_MAPPER.readValue(cefMessageString, + EventListener.class); tcacefProcessorContext.setCEFEventListener(eventListener); AbstractTCAECEFPolicyProcessor policyThresholdsProcessor = new TCACEFPolicyThresholdsProcessor(); diff --git a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java index 7674eb8..458f18c 100644 --- a/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java +++ b/dcae-analytics-tca/src/test/java/org/openecomp/dcae/apod/analytics/tca/utils/TCAUtilsTest.java @@ -31,11 +31,14 @@ import org.mockito.Mockito; import org.openecomp.dcae.apod.analytics.common.AnalyticsConstants; import org.openecomp.dcae.apod.analytics.common.exception.MessageProcessingException; import org.openecomp.dcae.apod.analytics.model.domain.cef.CommonEventHeader; +import org.openecomp.dcae.apod.analytics.model.domain.cef.Domain; import org.openecomp.dcae.apod.analytics.model.domain.cef.Event; import org.openecomp.dcae.apod.analytics.model.domain.cef.EventListener; import org.openecomp.dcae.apod.analytics.model.domain.cef.EventSeverity; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.ControlLoopEventStatus; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.ControlLoopSchemaType; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Direction; -import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerFunctionalRole; +import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.MetricsPerEventName; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.TCAPolicy; import org.openecomp.dcae.apod.analytics.model.domain.policy.tca.Threshold; import org.openecomp.dcae.apod.analytics.model.facade.tca.TCAVESResponse; @@ -74,23 +77,23 @@ import static org.mockito.Mockito.when; public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test - public void testGetPolicyFunctionalRoles() throws Exception { + public void testGetPolicyEventNames() throws Exception { final TCAPolicy sampleTCAPolicy = getSampleTCAPolicy(); - final List<String> policyFunctionalRoles = TCAUtils.getPolicyFunctionalRoles(sampleTCAPolicy); + final List<String> eventNames = TCAUtils.getPolicyEventNames(sampleTCAPolicy); - assertThat("Policy Functional Roles must contain vFirewall and vLoadBalancer", policyFunctionalRoles, - containsInAnyOrder("vFirewall", "vLoadBalancer")); + assertThat("Policy event names must contain vFirewall and vLoadBalancer", eventNames, + containsInAnyOrder("Mfvs_eNodeB_RANKPI", "vLoadBalancer")); } @Test - public void testGetPolicyFunctionalRoleSupplier() throws Exception { + public void testGetPolicyEventNamesSupplier() throws Exception { final TCAPolicy sampleTCAPolicy = getSampleTCAPolicy(); - final Supplier<List<String>> policyFunctionalRoleSupplier = TCAUtils.getPolicyFunctionalRoleSupplier + final Supplier<List<String>> policyEventNamesSupplier = TCAUtils.getPolicyEventNamesSupplier (sampleTCAPolicy); - final List<String> policyFunctionalRoles = policyFunctionalRoleSupplier.get(); - assertThat("Policy Functional Roles must contain vFirewall and vLoadBalancer", policyFunctionalRoles, - containsInAnyOrder("vFirewall", "vLoadBalancer")); + final List<String> eventNames = policyEventNamesSupplier.get(); + assertThat("Policy event names must contain vFirewall and vLoadBalancer", eventNames, + containsInAnyOrder("Mfvs_eNodeB_RANKPI", "vLoadBalancer")); } @Test @@ -105,47 +108,52 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test public void testGetPolicyFRThresholdsTableSupplier() throws Exception { final Table<String, String, List<Threshold>> policyFRThresholdPathTable = TCAUtils - .getPolicyFRThresholdsTableSupplier(getSampleTCAPolicy()).get(); + .getPolicyEventNameThresholdsTableSupplier(getSampleTCAPolicy()).get(); - final Map<String, List<Threshold>> vFirewall = policyFRThresholdPathTable.row("vFirewall"); + final Map<String, List<Threshold>> eNodeBRankpi = policyFRThresholdPathTable.row("Mfvs_eNodeB_RANKPI"); final Map<String, List<Threshold>> vLoadBalancer = policyFRThresholdPathTable.row("vLoadBalancer"); - final Set<String> vFirewallThresholdPaths = vFirewall.keySet(); + final Set<String> eNodeBRankpiFieldPaths = eNodeBRankpi.keySet(); final Set<String> vLoadBalancerPaths = vLoadBalancer.keySet(); - assertThat("vFirewall threshold field path size must be " + - "\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn\"", - vFirewallThresholdPaths.iterator().next(), - is("$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn")); + final String receivedBroadcastPacketsFieldPath = + "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"; + assertThat("eNodeBRankpi threshold field path size must be " + + "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*]" + + ".receivedBroadcastPacketsAccumulated", + eNodeBRankpiFieldPaths.iterator().next(), + is(receivedBroadcastPacketsFieldPath)); assertThat("vLoadBalancer threshold field path size must be " + - "\"\"$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn\"", + "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*]" + + ".receivedBroadcastPacketsAccumulated", vLoadBalancerPaths.iterator().next(), - is("$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn")); + is(receivedBroadcastPacketsFieldPath)); - final List<Threshold> firewallThresholds = policyFRThresholdPathTable.get("vFirewall", - "$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn"); + final List<Threshold> eNodeBRankpiThresholds = policyFRThresholdPathTable.get("Mfvs_eNodeB_RANKPI", + receivedBroadcastPacketsFieldPath); final List<Threshold> vLoadBalancerThresholds = policyFRThresholdPathTable.get("vLoadBalancer", - "$.event.measurementsForVfScalingFields.vNicUsageArray[*].packetsIn"); + receivedBroadcastPacketsFieldPath); - assertThat("vFirewall Threshold size must be 2", firewallThresholds.size(), is(2)); + assertThat("eNodeBRankpi Threshold size must be 3", eNodeBRankpiThresholds.size(), is(3)); assertThat("vLoadBalancer Threshold size must be 2", vLoadBalancerThresholds.size(), is(2)); } @Test public void testGetJsonPathValueWithValidMessageAndPolicy() throws Exception { final String cefMessageString = fromStream(CEF_MESSAGE_JSON_FILE_LOCATION); - final String jsonPath = "$.event.measurementsForVfScalingFields.vNicUsageArray[*].bytesIn"; + final String jsonPath = + "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated"; final ImmutableSet<String> fieldPaths = ImmutableSet.of(jsonPath); final Map<String, List<Long>> jsonPathValueMap = TCAUtils.getJsonPathValue(cefMessageString, fieldPaths); - assertThat("Json Path value must match", jsonPathValueMap.get(jsonPath).get(0), is(6086L)); + assertThat("Json Path value must match", jsonPathValueMap.get(jsonPath).get(0), is(5000L)); } @Test public void testGetJsonPathValueWithValidPath() throws Exception { final String cefMessageString = fromStream(CEF_MESSAGE_JSON_FILE_LOCATION); - final String jsonPath = "$.event.measurementsForVfScalingFields.vNicUsageArray[*].invalid"; + final String jsonPath = "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].invalid"; final ImmutableSet<String> fieldPaths = ImmutableSet.of(jsonPath); final Map<String, List<Long>> jsonPathValueMap = TCAUtils.getJsonPathValue(cefMessageString, fieldPaths); assertThat("Json path value must be empty", jsonPathValueMap.size(), is(0)); @@ -154,14 +162,15 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test - public void testCreateNewTCAVESResponseWithFunctionalRolevLoadBalancer() throws Exception { + public void testCreateNewTCAVESResponseWithVFControlLoopSchemaType() throws Exception { TCACEFProcessorContext tcacefProcessorContext = mock(TCACEFProcessorContext.class); - MetricsPerFunctionalRole metricsPerFunctionalRole = mock(MetricsPerFunctionalRole.class); - when(metricsPerFunctionalRole.getThresholds()).thenReturn(getThresholds()); - when(metricsPerFunctionalRole.getPolicyScope()).thenReturn("Test Policy scope"); - when(tcacefProcessorContext.getMetricsPerFunctionalRole()).thenReturn(metricsPerFunctionalRole); - when(metricsPerFunctionalRole.getFunctionalRole()).thenReturn("vLoadBalancer"); + MetricsPerEventName metricsPerEventName = mock(MetricsPerEventName.class); + when(metricsPerEventName.getThresholds()).thenReturn(getThresholds()); + when(metricsPerEventName.getPolicyScope()).thenReturn("Test Policy scope"); + when(tcacefProcessorContext.getMetricsPerEventName()).thenReturn(metricsPerEventName); + when(metricsPerEventName.getEventName()).thenReturn("testEventName"); + when(metricsPerEventName.getControlLoopSchemaType()).thenReturn(ControlLoopSchemaType.VM); when(tcacefProcessorContext.getCEFEventListener()).thenReturn(getCEFEventListener()); TCAVESResponse tcaVESResponse = TCAUtils.createNewTCAVESResponse(tcacefProcessorContext, "TCA_APP_NAME"); @@ -179,11 +188,11 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { public void testCreateNewTCAVESResponseWithFunctionalRolevFirewall() throws Exception { TCACEFProcessorContext tcacefProcessorContext = mock(TCACEFProcessorContext.class); - MetricsPerFunctionalRole metricsPerFunctionalRole = mock(MetricsPerFunctionalRole.class); - when(metricsPerFunctionalRole.getThresholds()).thenReturn(getThresholds()); - when(metricsPerFunctionalRole.getPolicyScope()).thenReturn("Test Policy scope"); - when(tcacefProcessorContext.getMetricsPerFunctionalRole()).thenReturn(metricsPerFunctionalRole); - when(metricsPerFunctionalRole.getFunctionalRole()).thenReturn("vFirewall"); + MetricsPerEventName metricsPerEventName = mock(MetricsPerEventName.class); + when(metricsPerEventName.getThresholds()).thenReturn(getThresholds()); + when(metricsPerEventName.getPolicyScope()).thenReturn("Test Policy scope"); + when(tcacefProcessorContext.getMetricsPerEventName()).thenReturn(metricsPerEventName); + when(metricsPerEventName.getEventName()).thenReturn("vFirewall"); when(tcacefProcessorContext.getCEFEventListener()).thenReturn(getCEFEventListener()); TCAVESResponse tcaVESResponse = TCAUtils.createNewTCAVESResponse(tcacefProcessorContext, "TCA_APP_NAME"); @@ -234,56 +243,55 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { public void testCreateViolatedMetrics() throws Exception { TCAPolicy tcaPolicy = getSampleTCAPolicy(); Threshold violatedThreshold = getCriticalThreshold(); - String functionalRole = "vFirewall"; - MetricsPerFunctionalRole result = TCAUtils.createViolatedMetrics(tcaPolicy, violatedThreshold, functionalRole); + String functionalRole = "Mfvs_eNodeB_RANKPI"; + MetricsPerEventName result = TCAUtils.createViolatedMetrics(tcaPolicy, violatedThreshold, functionalRole); assertThat(result.getPolicyScope(), is("resource=vFirewall;type=configuration")); assertThat(result.getPolicyName(), is("configuration.dcae.microservice.tca.xml")); } @Test - public void testCreateViolatedMetricsWrongFunctionalRole() throws Exception { + public void testCreateViolatedMetricsWrongEventName() throws Exception { expectedIllegalArgumentException.expect(MessageProcessingException.class); expectedIllegalArgumentException.expectCause(isA(IllegalStateException.class)); - expectedIllegalArgumentException.expectMessage("TCA Policy must contain functional Role: badFunctionRoleName"); - + String eventName = "badEventName"; + expectedIllegalArgumentException.expectMessage("TCA Policy must contain eventName: " + eventName); TCAPolicy tcaPolicy = getSampleTCAPolicy(); Threshold violatedThreshold = getCriticalThreshold(); - String functionalRole = "badFunctionRoleName"; - MetricsPerFunctionalRole result = TCAUtils.createViolatedMetrics(tcaPolicy, violatedThreshold, functionalRole); + TCAUtils.createViolatedMetrics(tcaPolicy, violatedThreshold, eventName); } @Test - public void testGetDomainAndFunctionalRole() { + public void testGetDomainAndEventName() { TCACEFProcessorContext tcacefProcessorContext = mock(TCACEFProcessorContext.class); EventListener eventListener = mock(EventListener.class); Event event = mock(Event.class); CommonEventHeader commonEventHeader = mock(CommonEventHeader.class); - Pair<String, String> result = TCAUtils.getDomainAndFunctionalRole(tcacefProcessorContext); + Pair<String, String> result = TCAUtils.getDomainAndEventName(tcacefProcessorContext); assertNull(result.getLeft()); assertNull(result.getRight()); when(tcacefProcessorContext.getCEFEventListener()).thenReturn(eventListener); - result = TCAUtils.getDomainAndFunctionalRole(tcacefProcessorContext); + result = TCAUtils.getDomainAndEventName(tcacefProcessorContext); assertNull(result.getLeft()); assertNull(result.getRight()); when(eventListener.getEvent()).thenReturn(event); - result = TCAUtils.getDomainAndFunctionalRole(tcacefProcessorContext); + result = TCAUtils.getDomainAndEventName(tcacefProcessorContext); assertNull(result.getLeft()); assertNull(result.getRight()); when(event.getCommonEventHeader()).thenReturn(commonEventHeader); - result = TCAUtils.getDomainAndFunctionalRole(tcacefProcessorContext); + result = TCAUtils.getDomainAndEventName(tcacefProcessorContext); assertNull(result.getLeft()); assertNull(result.getRight()); - when(commonEventHeader.getDomain()).thenReturn("testDomain"); - when(commonEventHeader.getFunctionalRole()).thenReturn("functionalRole"); + when(commonEventHeader.getDomain()).thenReturn(Domain.other); + when(commonEventHeader.getEventName()).thenReturn("eventName"); - result = TCAUtils.getDomainAndFunctionalRole(tcacefProcessorContext); - assertEquals(result.getLeft(), "testDomain"); - assertEquals(result.getRight(), "functionalRole"); + result = TCAUtils.getDomainAndEventName(tcacefProcessorContext); + assertEquals(result.getLeft(), "other"); + assertEquals(result.getRight(), "eventName"); } @@ -298,7 +306,7 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { TCACEFProcessorContext result = TCAUtils.computeThresholdViolations(tcacefProcessorContext); assertNotNull(result); - verify(result, times(0)).setMetricsPerFunctionalRole(Mockito.any(MetricsPerFunctionalRole.class)); + verify(result, times(0)).setMetricsPerEventName(Mockito.any(MetricsPerEventName.class)); assertEquals("Policy must not change", getSampleTCAPolicy(), result.getTCAPolicy()); } @@ -313,7 +321,7 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { when(tcacefProcessorContext.getCEFEventListener()).thenReturn(getCEFEventListener()); TCACEFProcessorContext result = TCAUtils.computeThresholdViolations(tcacefProcessorContext); - verify(result, times(1)).setMetricsPerFunctionalRole(Mockito.any(MetricsPerFunctionalRole.class)); + verify(result, times(1)).setMetricsPerEventName(Mockito.any(MetricsPerEventName.class)); assertEquals("Policy must not change", getSampleTCAPolicy(), result.getTCAPolicy()); } @@ -329,11 +337,11 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { final Map<String, Map<String, String>> functionalRolesMap = TCAUtils.extractSubTree(tcaPolicyMap, 2, 3, AnalyticsConstants.TCA_POLICY_DELIMITER); - final List<MetricsPerFunctionalRole> tcaPolicyMetricsPerFunctionalRoleList = - TCAUtils.createTCAPolicyMetricsPerFunctionalRoleList(functionalRolesMap); + final List<MetricsPerEventName> tcaPolicyMetricsPerEventNameList = + TCAUtils.createTCAPolicyMetricsPerEventNameList(functionalRolesMap); assertThat("There are two Metrics per function role", 2, - is(tcaPolicyMetricsPerFunctionalRoleList.size())); + is(tcaPolicyMetricsPerEventNameList.size())); } @@ -353,9 +361,9 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test public void testCreateTCAAlertStringWhenCEFIsEnabled() throws Exception { - final MetricsPerFunctionalRole violatedMetrics = createViolatedMetricsPerFunctionalRole(EventSeverity.CRITICAL); + final MetricsPerEventName violatedMetrics = createViolatedMetricsPerEventName(EventSeverity.CRITICAL); TCACEFProcessorContext processorContext = mock(TCACEFProcessorContext.class); - when(processorContext.getMetricsPerFunctionalRole()).thenReturn(violatedMetrics); + when(processorContext.getMetricsPerEventName()).thenReturn(violatedMetrics); when(processorContext.getCEFEventListener()).thenReturn(getCEFEventListener()); final String alertString = TCAUtils.createTCAAlertString(processorContext, "testApp", true); assertTrue(alertString.contains("thresholdCrossingAlertFields")); @@ -364,15 +372,15 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test(expected = MessageProcessingException.class) public void testCreateTCAAlertStringWhenViolatedMetricsNotPresentAndCEFIsEnabled() throws Exception { TCACEFProcessorContext processorContext = mock(TCACEFProcessorContext.class); - when(processorContext.getMetricsPerFunctionalRole()).thenReturn(null); + when(processorContext.getMetricsPerEventName()).thenReturn(null); TCAUtils.createTCAAlertString(processorContext, "testApp", true); } @Test public void testCreateTCAAlertStringWhenCEFIsDisabled() throws Exception { - final MetricsPerFunctionalRole violatedMetrics = createViolatedMetricsPerFunctionalRole(EventSeverity.MAJOR); + final MetricsPerEventName violatedMetrics = createViolatedMetricsPerEventName(EventSeverity.MAJOR); TCACEFProcessorContext processorContext = mock(TCACEFProcessorContext.class); - when(processorContext.getMetricsPerFunctionalRole()).thenReturn(violatedMetrics); + when(processorContext.getMetricsPerEventName()).thenReturn(violatedMetrics); when(processorContext.getCEFEventListener()).thenReturn(getCEFEventListener()); final String alertString = TCAUtils.createTCAAlertString(processorContext, "testApp", false); assertFalse(alertString.contains("thresholdCrossingAlertFields")); @@ -381,11 +389,11 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { @Test(expected = MessageProcessingException.class) public void testCreateTCAAlertStringWhenViolatedMetricsNotPresentAndCEFIsDisabled() throws Exception { TCACEFProcessorContext processorContext = mock(TCACEFProcessorContext.class); - when(processorContext.getMetricsPerFunctionalRole()).thenReturn(null); + when(processorContext.getMetricsPerEventName()).thenReturn(null); TCAUtils.createTCAAlertString(processorContext, "testApp", false); } - private static MetricsPerFunctionalRole createViolatedMetricsPerFunctionalRole(EventSeverity severity) { + private static MetricsPerEventName createViolatedMetricsPerEventName(EventSeverity severity) { final Threshold violatedThreshold = new Threshold(); violatedThreshold.setSeverity(severity); violatedThreshold.setDirection(Direction.GREATER); @@ -393,13 +401,14 @@ public class TCAUtilsTest extends BaseAnalyticsTCAUnitTest { violatedThreshold.setActualFieldValue(100L); violatedThreshold.setFieldPath("violatedThresholdFieldPath"); violatedThreshold.setVersion("violatedThresholdVersion"); + violatedThreshold.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET); violatedThreshold.setThresholdValue(50L); - final MetricsPerFunctionalRole violatedMetrics = new MetricsPerFunctionalRole(); + final MetricsPerEventName violatedMetrics = new MetricsPerEventName(); violatedMetrics.setPolicyName("violatePolicyName"); violatedMetrics.setPolicyVersion("violatedPolicyVersion"); violatedMetrics.setPolicyScope("violatedPolicyScope"); - violatedMetrics.setFunctionalRole("violatedFunctionalRole"); + violatedMetrics.setEventName("violatedEventName"); violatedMetrics.setThresholds(Arrays.asList(violatedThreshold)); return violatedMetrics; } |