From f6260a26de44a9338ca998626a93c0d0fa56abc3 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Wed, 22 Jul 2020 08:19:51 +0200 Subject: StndDefined event routing Route stndDefined events to streams defined in namespace event field. Change-Id: I3963e220095665f8ca3fd1b21c5c20b44057cf76 Issue-ID: DCAEGEN2-1771 Signed-off-by: Zebek Bogumil --- .../org/onap/dcae/restapi/EventValidatorTest.java | 113 +++++++----- .../onap/dcae/restapi/VesRestControllerTest.java | 201 ++++++++++++++++++--- 2 files changed, 245 insertions(+), 69 deletions(-) (limited to 'src/test/java/org/onap/dcae/restapi') diff --git a/src/test/java/org/onap/dcae/restapi/EventValidatorTest.java b/src/test/java/org/onap/dcae/restapi/EventValidatorTest.java index 0d38fdac..0ca5c424 100644 --- a/src/test/java/org/onap/dcae/restapi/EventValidatorTest.java +++ b/src/test/java/org/onap/dcae/restapi/EventValidatorTest.java @@ -20,28 +20,29 @@ package org.onap.dcae.restapi; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.when; - import com.networknt.schema.JsonSchema; import com.networknt.schema.JsonSchemaFactory; - -import java.util.Optional; - import org.json.JSONObject; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.onap.dcae.ApplicationSettings; import org.onap.dcae.FileReader; -import org.springframework.http.ResponseEntity; +import org.onap.dcae.common.model.VesEvent; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) -public class EventValidatorTest { +class EventValidatorTest { private static final String DUMMY_SCHEMA_VERSION = "v5"; private static final String DUMMY_TYPE = "type"; private final String newSchemaV7 = FileReader.readFileAsString("etc/CommonEventFormat_30.2_ONAP.json"); @@ -51,10 +52,11 @@ public class EventValidatorTest { private static final String EVENT_TYPE = "event"; @Mock - private static ApplicationSettings settings; + private ApplicationSettings settings; + + private SchemaValidator schemaValidator = spy( new SchemaValidator()); - @InjectMocks - private static EventValidator sut; + private EventValidator sut; @BeforeAll @@ -62,57 +64,70 @@ public class EventValidatorTest { jsonObject = new JSONObject("{" + DUMMY_TYPE + ":dummy}"); } + @BeforeEach + public void setUp(){ + this.sut = new EventValidator(settings, schemaValidator); + } + @Test - public void shouldReturnEmptyOptionalOnJsonSchemaValidationDisabled() { + void shouldNotValidateEventWhenJsonSchemaValidationDisabled() throws EventValidatorException { //given when(settings.eventSchemaValidationEnabled()).thenReturn(false); //when - Optional> result = sut.validate(jsonObject, DUMMY_TYPE, DUMMY_SCHEMA_VERSION); + this.sut.validate(new VesEvent(jsonObject), DUMMY_TYPE, DUMMY_SCHEMA_VERSION); //then - assertEquals(Optional.empty(), result); + verify(schemaValidator, never()).conformsToSchema(any(), any()); } @Test - public void shouldReturnInvalidJsonErrorOnWrongType() { + void shouldReturnInvalidJsonErrorOnWrongType() { //given when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(jsonObject, "wrongType", DUMMY_SCHEMA_VERSION); + try { + sut.validate(new VesEvent(jsonObject), "wrongType", DUMMY_SCHEMA_VERSION); + } catch (EventValidatorException e) { + //then + assertEquals(ApiException.INVALID_JSON_INPUT, e.getApiException()); + } + - //then - assertEquals(generateResponseOptional(ApiException.INVALID_JSON_INPUT), result); } @Test - public void shouldReturnSchemaValidationFailedErrorOnInvalidJsonObjectSchema() { + void shouldReturnSchemaValidationFailedErrorOnInvalidJsonObjectSchema() { //given String schemaRejectingEverything = "{\"not\":{}}"; mockJsonSchema(schemaRejectingEverything); when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(jsonObject, DUMMY_TYPE, DUMMY_SCHEMA_VERSION); + try { + sut.validate(new VesEvent(jsonObject), DUMMY_TYPE, DUMMY_SCHEMA_VERSION); + } catch (EventValidatorException e) { + //then + assertEquals(ApiException.SCHEMA_VALIDATION_FAILED, e.getApiException()); + } - //then - assertEquals(generateResponseOptional(ApiException.SCHEMA_VALIDATION_FAILED), result); } @Test - public void shouldReturnEmptyOptionalOnValidJsonObjectSchema() { + void shouldReturnEmptyOptionalOnValidJsonObjectSchema() { //given String schemaAcceptingEverything = "{}"; mockJsonSchema(schemaAcceptingEverything); when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(jsonObject, DUMMY_TYPE, DUMMY_SCHEMA_VERSION); - - //then - assertEquals(Optional.empty(), result); + try { + sut.validate(new VesEvent(jsonObject), DUMMY_TYPE, DUMMY_SCHEMA_VERSION); + } catch (EventValidatorException e) { + failWithError(); + } } @Test @@ -124,14 +139,15 @@ public class EventValidatorTest { when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(sentEvent, EVENT_TYPE, V7_VERSION); - - //then - assertEquals(Optional.empty(), result); + try { + sut.validate(new VesEvent(sentEvent), EVENT_TYPE, V7_VERSION); + } catch (EventValidatorException e) { + failWithError(); + } } @Test - public void shouldReturnNoErrorsWhenValidatingValidEventWithStndDefinedFields() { + void shouldReturnNoErrorsWhenValidatingValidEventWithStndDefinedFields() { //given sentEvent = new JSONObject(FileReader.readFileAsString("src/test/resources/ves7_valid_eventWithStndDefinedFields.json")); @@ -139,14 +155,15 @@ public class EventValidatorTest { when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(sentEvent, EVENT_TYPE, V7_VERSION); - - //then - assertEquals(Optional.empty(), result); + try { + sut.validate(new VesEvent(sentEvent), EVENT_TYPE, V7_VERSION); + } catch (EventValidatorException e) { + failWithError(); + } } @Test - public void shouldReturnSchemaValidationFailedWhenValidating30_1_1InvalidEvent() { + void shouldReturnSchemaValidationFailedWhenValidating30_1_1InvalidEvent() { //given sentEvent = new JSONObject(FileReader.readFileAsString("src/test/resources/ves7_invalid_30_1_1_event.json")); @@ -154,12 +171,19 @@ public class EventValidatorTest { when(settings.eventSchemaValidationEnabled()).thenReturn(true); //when - Optional> result = sut.validate(this.sentEvent, EVENT_TYPE, V7_VERSION); + try { + sut.validate(new VesEvent(this.sentEvent), EVENT_TYPE, V7_VERSION); + } catch (EventValidatorException e) { + //then + assertEquals(ApiException.SCHEMA_VALIDATION_FAILED, e.getApiException()); + } + - //then - assertEquals(generateResponseOptional(ApiException.SCHEMA_VALIDATION_FAILED), result); } + private void failWithError() { + fail("Validation should not report any error!"); + } private void mockJsonSchema(String jsonSchemaContent) { JsonSchemaFactory factory = JsonSchemaFactory.getInstance(); @@ -167,9 +191,4 @@ public class EventValidatorTest { JsonSchema schema = factory.getSchema(jsonSchemaContent); when(settings.jsonSchema(any())).thenReturn(schema); } - - private Optional> generateResponseOptional(ApiException schemaValidationFailed) { - return Optional.of(ResponseEntity.status(schemaValidationFailed.httpStatusCode) - .body(schemaValidationFailed.toJSON().toString())); - } } diff --git a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java index 6b89a356..e5e7239c 100644 --- a/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java +++ b/src/test/java/org/onap/dcae/restapi/VesRestControllerTest.java @@ -20,20 +20,27 @@ package org.onap.dcae.restapi; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; +import com.networknt.schema.JsonSchema; +import io.vavr.collection.HashMap; +import org.apache.http.HttpStatus; import org.jetbrains.annotations.NotNull; -import org.json.JSONArray; +import org.json.JSONObject; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; -import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.onap.dcae.ApplicationSettings; +import org.onap.dcae.JSonSchemasSupplier; import org.onap.dcae.common.EventSender; import org.onap.dcae.common.EventTransformation; import org.onap.dcae.common.HeaderUtils; +import org.onap.dcae.common.JsonDataLoader; +import org.onap.dcae.common.publishing.EventPublisher; import org.slf4j.Logger; import org.springframework.http.ResponseEntity; import org.springframework.mock.web.MockHttpServletRequest; @@ -43,14 +50,15 @@ import org.springframework.web.context.request.ServletRequestAttributes; import java.io.FileReader; import java.io.IOException; import java.lang.reflect.Type; -import java.nio.file.Files; -import java.nio.file.Paths; import java.util.List; +import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -58,21 +66,36 @@ import static org.mockito.Mockito.when; public class VesRestControllerTest { private static final String EVENT_TRANSFORM_FILE_PATH = "/eventTransform.json"; + private static final String ACCEPTED = "Accepted"; + private static final String VERSION_V7 = "v7"; + public static final String VES_FAULT_TOPIC = "ves-fault"; + public static final String VES_3_GPP_FAULT_SUPERVISION_TOPIC = "ves-3gpp-fault-supervision"; - @InjectMocks - VesRestController vesRestController; + private VesRestController vesRestController; @Mock - ApplicationSettings applicationSettings; + private ApplicationSettings applicationSettings; @Mock - Logger logger; + private Logger logger; @Mock - EventSender eventSender; + private HeaderUtils headerUtils; @Mock - HeaderUtils headerUtils; + private EventPublisher eventPublisher; + + @Before + public void setUp(){ + + final HashMap streamIds = HashMap.of( + "fault", new String[]{VES_FAULT_TOPIC}, + "3GPP-FaultSupervision", new String[]{VES_3_GPP_FAULT_SUPERVISION_TOPIC} + ); + this.vesRestController = new VesRestController( + applicationSettings, logger, new EventSender(eventPublisher, streamIds),headerUtils + ); + } @Test public void shouldReportThatApiVersionIsNotSupported() { @@ -84,9 +107,9 @@ public class VesRestControllerTest { final ResponseEntity event = vesRestController.event("", "v20", request); // then - assertThat(event.getStatusCodeValue()).isEqualTo(400); + assertThat(event.getStatusCodeValue()).isEqualTo(HttpStatus.SC_BAD_REQUEST); assertThat(event.getBody()).isEqualTo("API version v20 is not supported"); - verify(eventSender, never()).send(any(JSONArray.class)); + verifyThatEventWasNotSend(); } @Test @@ -97,22 +120,153 @@ public class VesRestControllerTest { MockHttpServletRequest request = givenMockHttpServletRequest(); - String validEvent = new String( - Files.readAllBytes(Paths.get(this.getClass().getResource("/ves7_valid_30_1_1_event.json").getPath())) + String validEvent = JsonDataLoader.loadContent("/ves7_valid_30_1_1_event.json"); + + //when + final ResponseEntity response = vesRestController.event(validEvent, VERSION_V7, request); + + //then + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_ACCEPTED); + assertThat(response.getBody()).isEqualTo(ACCEPTED); + verifyThatTransformedEventWasSend(eventPublisher, validEvent); + } + + + @Test + public void shouldSendBatchOfEvents() throws IOException { + //given + configureEventTransformations(); + configureHeadersForEventListener(); + + MockHttpServletRequest request = givenMockHttpServletRequest(); + + String validEvent = JsonDataLoader.loadContent("/ves7_batch_valid.json"); + + //when + final ResponseEntity response = vesRestController.events(validEvent, VERSION_V7, request); + + //then + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_ACCEPTED); + assertThat(response.getBody()).isEqualTo(ACCEPTED); + verify(eventPublisher, times(2)).sendEvent(any(),any()); + } + + @Test + public void shouldSendStndDomainEventIntoDomainStream() throws IOException { + //given + configureEventTransformations(); + configureHeadersForEventListener(); + + MockHttpServletRequest request = givenMockHttpServletRequest(); + configureSchemasSupplierForStndDefineEvent(); + + String validEvent = JsonDataLoader.loadContent("/ves_stdnDefined_valid.json"); + + //when + final ResponseEntity response = vesRestController.event(validEvent, VERSION_V7, request); + + //then + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_ACCEPTED); + assertThat(response.getBody()).isEqualTo(ACCEPTED); + verify(eventPublisher).sendEvent(any(),eq(VES_3_GPP_FAULT_SUPERVISION_TOPIC)); + } + + + @Test + public void shouldReportThatStndDomainEventHasntGotNamespaceParameter() throws IOException { + //given + configureEventTransformations(); + configureHeadersForEventListener(); + + MockHttpServletRequest request = givenMockHttpServletRequest(); + configureSchemasSupplierForStndDefineEvent(); + + String validEvent = JsonDataLoader.loadContent("/ves_stdnDefined_missing_namespace_invalid.json"); + + //when + final ResponseEntity response = vesRestController.event(validEvent, VERSION_V7, request); + + //then + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_BAD_REQUEST); + verifyErrorResponse( + response, + "SVC2006", + "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is missing from request" ); + verifyThatEventWasNotSend(); + } + + @Test + public void shouldReportThatStndDomainEventNamespaceParameterIsEmpty() throws IOException { + //given + configureEventTransformations(); + configureHeadersForEventListener(); + + MockHttpServletRequest request = givenMockHttpServletRequest(); + configureSchemasSupplierForStndDefineEvent(); + + String validEvent = JsonDataLoader.loadContent("/ves_stdnDefined_empty_namespace_invalid.json"); //when - final ResponseEntity response = vesRestController.event(validEvent, "v7", request); + final ResponseEntity response = vesRestController.event(validEvent, VERSION_V7, request); //then - assertThat(response.getStatusCodeValue()).isEqualTo(202); - assertThat(response.getBody()).isEqualTo("Accepted"); - verifyThatTransformedEventWasSend(eventSender, validEvent); + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_BAD_REQUEST); + verifyErrorResponse( + response, + "SVC2006", + "Mandatory input attribute event.commonEventHeader.stndDefinedNamespace is empty in request" + ); + verifyThatEventWasNotSend(); + } + + @Test + public void shouldNotSendStndDomainEventWhenTopicCannotBeFoundInConfiguration() throws IOException { + //given + configureEventTransformations(); + configureHeadersForEventListener(); + + MockHttpServletRequest request = givenMockHttpServletRequest(); + + String validEvent = JsonDataLoader.loadContent("/ves_stdnDefined_valid_unknown_topic.json"); + + //when + final ResponseEntity response = vesRestController.event(validEvent, VERSION_V7, request); + + //then + assertThat(response.getStatusCodeValue()).isEqualTo(HttpStatus.SC_ACCEPTED); + assertThat(response.getBody()).isEqualTo(ACCEPTED); + verifyThatEventWasNotSend(); + } + + private void verifyThatEventWasNotSend() { + verify(eventPublisher, never()).sendEvent(any(), any()); + } + + private void configureSchemasSupplierForStndDefineEvent() { + String collectorSchemaFile = "{\"v7\":\"./etc/CommonEventFormat_30.2_ONAP.json\"}"; + final io.vavr.collection.Map loadedJsonSchemas = new JSonSchemasSupplier().loadJsonSchemas(collectorSchemaFile); + + when(applicationSettings.eventSchemaValidationEnabled()).thenReturn(true); + when(applicationSettings.jsonSchema(eq(VERSION_V7))).thenReturn(loadedJsonSchemas.get(VERSION_V7).get()); + } + + private void verifyErrorResponse(ResponseEntity response, String messageId, String messageText) throws com.fasterxml.jackson.core.JsonProcessingException { + final Map errorDetails = fetchErrorDetails(response); + assertThat(errorDetails).containsEntry("messageId", messageId); + assertThat(errorDetails).containsEntry("text", messageText); + } + + private Map fetchErrorDetails(ResponseEntity response) throws com.fasterxml.jackson.core.JsonProcessingException { + final String body = response.getBody(); + ObjectMapper mapper = new ObjectMapper(); + Map>> map = mapper.readValue(body, Map.class); + return map.get("requestError").get("ServiceException"); } private void configureEventTransformations() throws IOException { final List eventTransformations = loadEventTransformations(); - when(applicationSettings.isVersionSupported("v7")).thenReturn(true); + when(applicationSettings.isVersionSupported(VERSION_V7)).thenReturn(true); when(applicationSettings.eventTransformingEnabled()).thenReturn(true); when(applicationSettings.getEventTransformations()).thenReturn(eventTransformations); } @@ -124,19 +278,22 @@ public class VesRestControllerTest { ); } - private void verifyThatTransformedEventWasSend(EventSender eventSender, String eventBeforeTransformation) { + private void verifyThatTransformedEventWasSend(EventPublisher eventPublisher, String eventBeforeTransformation) { // event before transformation assertThat(eventBeforeTransformation).contains("\"version\": \"4.0.1\""); assertThat(eventBeforeTransformation).contains("\"faultFieldsVersion\": \"4.0\""); - ArgumentCaptor argument = ArgumentCaptor.forClass(JSONArray.class); - verify(eventSender).send(argument.capture()); + ArgumentCaptor argument = ArgumentCaptor.forClass(JSONObject.class); + ArgumentCaptor domain = ArgumentCaptor.forClass(String.class); + verify(eventPublisher).sendEvent(argument.capture(), domain.capture()); final String transformedEvent = argument.getValue().toString(); + final String eventSentAtTopic = domain.getValue(); // event after transformation assertThat(transformedEvent).contains("\"priority\":\"High\",\"version\":3,"); assertThat(transformedEvent).contains(",\"faultFieldsVersion\":3,\"specificProblem"); + assertThat(eventSentAtTopic).isEqualTo(VES_FAULT_TOPIC); } @NotNull -- cgit 1.2.3-korg