X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfigParserTest.java;h=5a6b0232a3e27a16fa952c0ca3674bbd9237bd49;hb=f45eedd18774bf9856800b43387bee3fa2e6152d;hp=531f1e8e700aee72e0b964781a2a7de73978402e;hpb=1b8d76de3262675c5afe45351929b0d5d2c0bab1;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java index 531f1e8e..5a6b0232 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java @@ -2,7 +2,7 @@ * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2019 Nordix Foundation + * Copyright (C) 2020 Nordix Foundation * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,11 +20,12 @@ package org.oransc.policyagent.configuration; -import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.base.Charsets; import com.google.common.io.Resources; +import com.google.gson.Gson; import com.google.gson.JsonIOException; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -36,51 +37,38 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; -import java.util.Properties; +import java.util.Map; import org.junit.jupiter.api.Test; -import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants; -import org.springframework.http.MediaType; +import org.oransc.policyagent.exceptions.ServiceException; -public class ApplicationConfigParserTest { +class ApplicationConfigParserTest { + + ApplicationConfigParser parserUnderTest = new ApplicationConfigParser(); @Test - public void whenCorrectDmaapConfig() throws Exception { + void whenCorrectConfig() throws Exception { JsonObject jsonRootObject = getJsonRootObject(); - ApplicationConfigParser parserUnderTest = new ApplicationConfigParser(); - - parserUnderTest.parse(jsonRootObject); - - Properties actualPublisherConfig = parserUnderTest.getDmaapPublisherConfig(); - assertAll("publisherConfig", - () -> assertEquals("localhost:6845/events", actualPublisherConfig.get("ServiceName"), "Wrong ServiceName"), - () -> assertEquals("A1-POLICY-AGENT-WRITE", actualPublisherConfig.get("topic"), "Wrong topic"), - () -> assertEquals("localhost:6845", actualPublisherConfig.get("host"), "Wrong host"), - () -> assertEquals(MediaType.APPLICATION_JSON.toString(), actualPublisherConfig.get("contenttype"), - "Wrong contenttype"), - () -> assertEquals("admin", actualPublisherConfig.get("userName"), "Wrong userName"), - () -> assertEquals("admin", actualPublisherConfig.get("password"), "Wrong password"), - () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualPublisherConfig.get("TransportType"), - "Wrong TransportType"), - () -> assertEquals(15000, actualPublisherConfig.get("timeout"), "Wrong timeout"), - () -> assertEquals(100, actualPublisherConfig.get("limit"), "Wrong limit")); - - Properties actualConsumerConfig = parserUnderTest.getDmaapConsumerConfig(); - assertAll("consumerConfig", - () -> assertEquals("localhost:6845/events", actualConsumerConfig.get("ServiceName"), "Wrong ServiceName"), - () -> assertEquals("A1-POLICY-AGENT-READ", actualConsumerConfig.get("topic"), "Wrong topic"), - () -> assertEquals("localhost:6845", actualConsumerConfig.get("host"), "Wrong host"), - () -> assertEquals(MediaType.APPLICATION_JSON.toString(), actualConsumerConfig.get("contenttype"), - "Wrong contenttype"), - () -> assertEquals("admin", actualConsumerConfig.get("userName"), "Wrong userName"), - () -> assertEquals("admin", actualConsumerConfig.get("password"), "Wrong password"), - () -> assertEquals("users", actualConsumerConfig.get("group"), "Wrong group"), - () -> assertEquals("policy-agent", actualConsumerConfig.get("id"), "Wrong id"), - () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualConsumerConfig.get("TransportType"), - "Wrong TransportType"), - () -> assertEquals(15000, actualConsumerConfig.get("timeout"), "Wrong timeout"), - () -> assertEquals(100, actualConsumerConfig.get("limit"), "Wrong limit")); + ApplicationConfigParser.ConfigParserResult result = parserUnderTest.parse(jsonRootObject); + + String topicUrl = result.dmaapProducerTopicUrl(); + assertEquals("http://admin:admin@localhost:6845/events/A1-POLICY-AGENT-WRITE", topicUrl, "controller contents"); + + topicUrl = result.dmaapConsumerTopicUrl(); + assertEquals( + "http://admin:admin@localhost:6845/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100", + topicUrl, "controller contents"); + + Map controllers = result.controllerConfigs(); + assertEquals(1, controllers.size(), "size"); + ImmutableControllerConfig expectedControllerConfig = ImmutableControllerConfig.builder() // + .baseUrl("http://localhost:8083/") // + .name("controller1") // + .userName("user") // + .password("password") // + .build(); // + assertEquals(expectedControllerConfig, controllers.get("controller1"), "controller contents"); } private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException { @@ -95,4 +83,77 @@ public class ApplicationConfigParserTest { return new ByteArrayInputStream((string.getBytes(StandardCharsets.UTF_8))); } + @Test + void whenDmaapConfigHasSeveralStreamsPublishing() throws Exception { + JsonObject jsonRootObject = getJsonRootObject(); + JsonObject json = jsonRootObject.getAsJsonObject("config").getAsJsonObject("streams_publishes"); + JsonObject fake_info_object = new JsonObject(); + fake_info_object.addProperty("fake_info", "fake"); + json.add("fake_info_object", new Gson().toJsonTree(fake_info_object)); + DataPublishing data = new Gson().fromJson(json.toString(), DataPublishing.class); + final String expectedMessage = + "Invalid configuration. Number of streams must be one, config: " + data.toString(); + + Exception actualException = assertThrows(ServiceException.class, () -> parserUnderTest.parse(jsonRootObject)); + + assertEquals(expectedMessage, actualException.getMessage(), + "Wrong error message when the DMaaP config has several streams publishing"); + } + + class DataPublishing { + private JsonObject dmaap_publisher; + private JsonObject fake_info_object; + + @Override + public String toString() { + return String.format("[dmaap_publisher=%s, fake_info_object=%s]", dmaap_publisher.toString(), + fake_info_object.toString()); + } + } + + @Test + void whenDmaapConfigHasSeveralStreamsSubscribing() throws Exception { + JsonObject jsonRootObject = getJsonRootObject(); + JsonObject json = jsonRootObject.getAsJsonObject("config").getAsJsonObject("streams_subscribes"); + JsonObject fake_info_object = new JsonObject(); + fake_info_object.addProperty("fake_info", "fake"); + json.add("fake_info_object", new Gson().toJsonTree(fake_info_object)); + DataSubscribing data = new Gson().fromJson(json.toString(), DataSubscribing.class); + final String expectedMessage = + "Invalid configuration. Number of streams must be one, config: " + data.toString(); + + Exception actualException = assertThrows(ServiceException.class, () -> parserUnderTest.parse(jsonRootObject)); + + assertEquals(expectedMessage, actualException.getMessage(), + "Wrong error message when the DMaaP config has several streams subscribing"); + } + + private class DataSubscribing { + private JsonObject dmaap_subscriber; + private JsonObject fake_info_object; + + @Override + public String toString() { + return String.format("[dmaap_subscriber=%s, fake_info_object=%s]", dmaap_subscriber.toString(), + fake_info_object.toString()); + } + } + + @Test + void whenWrongMemberNameInObject() throws Exception { + JsonObject jsonRootObject = getJsonRootObject(); + JsonObject json = jsonRootObject.getAsJsonObject("config"); + json.remove("ric"); + final String message = "Could not find member: 'ric' in: " + json; + + Exception actualException = assertThrows(ServiceException.class, () -> parserUnderTest.parse(jsonRootObject)); + + assertEquals(message, actualException.getMessage(), "Wrong error message when wrong member name in object"); + } + + JsonObject getDmaapInfo(JsonObject jsonRootObject, String streamsPublishesOrSubscribes, + String dmaapPublisherOrSubscriber) throws Exception { + return jsonRootObject.getAsJsonObject("config").getAsJsonObject(streamsPublishesOrSubscribes) + .getAsJsonObject(dmaapPublisherOrSubscriber).getAsJsonObject("dmaap_info"); + } }