From aa148d9b5bba6ad23736e939a6d0ec917e761e1e Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 31 Jul 2019 09:45:27 -0400 Subject: [PATCH] Flesh out DMaaP simulator Fleshed out the dmaap simulator with additional media types. Added more junit tests. Added buildDmaapSim() to simulators Util. Change-Id: I39acd3df8e8d0ded21228e56fa1ef919cafc3772 Issue-ID: POLICY-2144 Signed-off-by: Jim Hahn --- models-interactions/model-simulators/pom.xml | 5 + .../main/java/org/onap/policy/simulators/Util.java | 40 ++- .../policy/simulators/dmaap/DmaapParameters.json | 8 + .../onap/policy/simulators/DmaapSimulatorTest.java | 94 +++++++ .../policy/simulators/dmaap/TopicParameters.json | 21 ++ models-sim/models-sim-dmaap/pom.xml | 12 + .../dmaap/parameters/DmaapSimParameterGroup.java | 11 +- .../dmaap/parameters/DmaapSimParameterHandler.java | 5 +- .../sim/dmaap/parameters/RestServerParameters.java | 6 +- .../sim/dmaap/provider/ConsumerGroupData.java | 190 +++++++++++++ .../sim/dmaap/provider/DmaapSimProvider.java | 215 +++++++-------- .../models/sim/dmaap/provider/TopicData.java | 201 ++++++++++++++ .../sim/dmaap/rest/CambriaMessageBodyHandler.java | 170 ++++++++++-- .../sim/dmaap/rest/DmaapSimRestControllerV1.java | 76 ++--- .../models/sim/dmaap/rest/DmaapSimRestServer.java | 100 ++----- .../sim/dmaap/rest/JsonMessageBodyHandler.java | 63 ----- .../sim/dmaap/rest/TextMessageBodyHandler.java | 66 +++++ .../sim/dmaap/startstop/DmaapSimActivator.java | 25 +- .../startstop/DmaapSimCommandLineArguments.java | 40 +-- .../policy/models/sim/dmaap/startstop/Main.java | 13 +- .../src/main/resources/etc/DefaultConfig.json | 1 + .../models/sim/dmaap/DmaapSimXxxExceptionTest.java | 39 +++ .../sim/dmaap/provider/ConsumerGroupDataTest.java | 305 +++++++++++++++++++++ .../sim/dmaap/provider/DmaapSimProviderTest.java | 287 +++++++++++++++++++ .../models/sim/dmaap/provider/TopicDataTest.java | 213 ++++++++++++++ .../sim/dmaap/rest/BaseRestControllerV1Test.java | 63 +++++ .../dmaap/rest/CambriaMessageBodyHandlerTest.java | 145 ++++++++++ .../models/sim/dmaap/rest/CommonRestServer.java | 181 ++++++++++++ .../dmaap/rest/DmaapSimRestControllerV1Test.java | 94 +++++++ .../sim/dmaap/rest/TextMessageBodyHandlerTest.java | 81 ++++++ .../onap/policy/sim/dmaap/e2e/EndToEndTest.java | 199 ++++++++++++++ .../sim/dmaap/parameters/CommonTestData.java | 89 ++++++ .../parameters/DmaapSimParameterGroupTest.java} | 24 +- .../parameters/DmaapSimParameterHandlerTest.java | 70 +++++ .../sim/dmaap/startstop/DmaapSimActivatorTest.java | 95 +++++++ .../onap/policy/sim/dmaap/startstop/MainTest.java | 100 +++++++ .../resources/parameters/EmptyParameterFile.json | 0 .../resources/parameters/MinimumParameters.json | 3 +- .../resources/parameters/NormalParameters.json | 1 + .../parameters/Parameters_InvalidName.json | 1 + .../test/resources/parameters/TopicParameters.json | 36 +++ 41 files changed, 2972 insertions(+), 416 deletions(-) create mode 100644 models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json create mode 100644 models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/DmaapSimulatorTest.java create mode 100644 models-interactions/model-simulators/src/test/resources/org/onap/policy/simulators/dmaap/TopicParameters.json create mode 100644 models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/ConsumerGroupData.java create mode 100644 models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/TopicData.java delete mode 100644 models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/JsonMessageBodyHandler.java create mode 100644 models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/rest/TextMessageBodyHandler.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/DmaapSimXxxExceptionTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/ConsumerGroupDataTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProviderTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/TopicDataTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/rest/BaseRestControllerV1Test.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/rest/CambriaMessageBodyHandlerTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/rest/CommonRestServer.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/rest/DmaapSimRestControllerV1Test.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/rest/TextMessageBodyHandlerTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/sim/dmaap/e2e/EndToEndTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/sim/dmaap/parameters/CommonTestData.java rename models-sim/models-sim-dmaap/src/{main/java/org/onap/policy/models/sim/dmaap/DmaapSimConstants.java => test/java/org/onap/policy/sim/dmaap/parameters/DmaapSimParameterGroupTest.java} (60%) create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/sim/dmaap/parameters/DmaapSimParameterHandlerTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/sim/dmaap/startstop/DmaapSimActivatorTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/java/org/onap/policy/sim/dmaap/startstop/MainTest.java create mode 100644 models-sim/models-sim-dmaap/src/test/resources/parameters/EmptyParameterFile.json create mode 100644 models-sim/models-sim-dmaap/src/test/resources/parameters/TopicParameters.json diff --git a/models-interactions/model-simulators/pom.xml b/models-interactions/model-simulators/pom.xml index b0c48ebda..7d64200e9 100644 --- a/models-interactions/model-simulators/pom.xml +++ b/models-interactions/model-simulators/pom.xml @@ -73,5 +73,10 @@ policy-models-decisions ${project.version} + + org.onap.policy.models.sim + policy-models-sim-dmaap + ${project.version} + diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java index a1d28ba23..6c1a05753 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/Util.java @@ -22,11 +22,18 @@ package org.onap.policy.simulators; import java.io.IOException; - +import java.util.Properties; import org.onap.policy.common.endpoints.http.server.HttpServletServer; import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; +import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties; import org.onap.policy.common.gson.GsonMessageBodyHandler; +import org.onap.policy.common.utils.coder.CoderException; +import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.network.NetworkUtil; +import org.onap.policy.common.utils.resources.ResourceUtils; +import org.onap.policy.models.sim.dmaap.parameters.DmaapSimParameterGroup; +import org.onap.policy.models.sim.dmaap.provider.DmaapSimProvider; +import org.onap.policy.models.sim.dmaap.rest.DmaapSimRestServer; public class Util { public static final String AAISIM_SERVER_NAME = "aaiSim"; @@ -40,6 +47,7 @@ public class Util { public static final int VFCSIM_SERVER_PORT = 6668; public static final int GUARDSIM_SERVER_PORT = 6669; public static final int SDNCSIM_SERVER_PORT = 6670; + public static final int DMAAPSIM_SERVER_PORT = 3904; private static final String CANNOT_CONNECT = "cannot connect to port "; private static final String LOCALHOST = "localhost"; @@ -139,4 +147,34 @@ public class Util { } return testServer; } + + /** + * Build a DMaaP simulator. + * + * @return the simulator + * @throws InterruptedException if a thread is interrupted + * @throws IOException if an IO errror occurs + * @throws CoderException if the server parameters cannot be loaded + */ + public static HttpServletServer buildDmaapSim() throws InterruptedException, IOException, CoderException { + String json = ResourceUtils.getResourceAsString("org/onap/policy/simulators/dmaap/DmaapParameters.json"); + DmaapSimParameterGroup params = new StandardCoder().decode(json, DmaapSimParameterGroup.class); + + DmaapSimProvider.setInstance(new DmaapSimProvider(params)); + + Properties props = DmaapSimRestServer.getServerProperties(params.getRestServerParameters()); + + final String svcpfx = PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + + params.getRestServerParameters().getName(); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX, + Integer.toString(DMAAPSIM_SERVER_PORT)); + props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true"); + + HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(props).get(0); + testServer.waitedStart(5000); + if (!NetworkUtil.isTcpPortOpen(LOCALHOST, testServer.getPort(), 50, 1000L)) { + throw new IllegalStateException(CANNOT_CONNECT + testServer.getPort()); + } + return testServer; + } } diff --git a/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json b/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json new file mode 100644 index 000000000..b704f6f14 --- /dev/null +++ b/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json @@ -0,0 +1,8 @@ +{ + "name": "DMaapSim", + "topicSweepSec": 300, + "restServerParameters": { + "host": "0.0.0.0", + "port": 3904 + } +} diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/DmaapSimulatorTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/DmaapSimulatorTest.java new file mode 100644 index 000000000..50e9bad5b --- /dev/null +++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/DmaapSimulatorTest.java @@ -0,0 +1,94 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.simulators; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager; +import org.onap.policy.common.endpoints.event.comm.bus.DmaapTopicSink; +import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance; +import org.onap.policy.common.endpoints.parameters.TopicParameterGroup; +import org.onap.policy.common.utils.coder.StandardCoder; + +public class DmaapSimulatorTest { + private static final int MAX_WAIT_SEC = 2; + private static final String TOPIC = "MY-TOPIC"; + + /** + * Messages from the topic are placed here by the endpoint. + */ + private BlockingQueue queue; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + TopicEndpointManager.getManager().shutdown(); + } + + /** + * Starts the simulator and the topic. + * + * @throws Exception if an error occurs + */ + @Before + public void setUp() throws Exception { + assertNotNull(Util.buildDmaapSim()); + + String topicJson = new String(Files.readAllBytes( + new File("src/test/resources/org/onap/policy/simulators/dmaap/TopicParameters.json").toPath()), + StandardCharsets.UTF_8); + topicJson = topicJson.replace("${port}", String.valueOf(Util.DMAAPSIM_SERVER_PORT)); + + TopicParameterGroup topicConfig = new StandardCoder().decode(topicJson, TopicParameterGroup.class); + + TopicEndpointManager.getManager().addTopics(topicConfig); + TopicEndpointManager.getManager().start(); + + queue = new LinkedBlockingQueue<>(); + } + + @After + public void tearDown() { + TopicEndpointManager.getManager().shutdown(); + HttpServletServerFactoryInstance.getServerFactory().destroy(); + } + + @Test + public void test() throws InterruptedException { + TopicEndpointManager.getManager().getDmaapTopicSource(TOPIC) + .register((infra, topic, event) -> queue.add(event)); + + DmaapTopicSink sink = TopicEndpointManager.getManager().getDmaapTopicSink(TOPIC); + sink.send("hello"); + sink.send("world"); + + assertEquals("hello", queue.poll(MAX_WAIT_SEC, TimeUnit.SECONDS)); + assertEquals("world", queue.poll(MAX_WAIT_SEC, TimeUnit.SECONDS)); + } +} diff --git a/models-interactions/model-simulators/src/test/resources/org/onap/policy/simulators/dmaap/TopicParameters.json b/models-interactions/model-simulators/src/test/resources/org/onap/policy/simulators/dmaap/TopicParameters.json new file mode 100644 index 000000000..ba1f4806f --- /dev/null +++ b/models-interactions/model-simulators/src/test/resources/org/onap/policy/simulators/dmaap/TopicParameters.json @@ -0,0 +1,21 @@ +{ + "topicSources": [ + { + "topic": "MY-TOPIC", + "servers": [ + "localhost:${port}" + ], + "topicCommInfrastructure": "dmaap", + "fetchTimeout": 100 + } + ], + "topicSinks": [ + { + "topic": "MY-TOPIC", + "servers": [ + "localhost:${port}" + ], + "topicCommInfrastructure": "dmaap" + } + ] +} \ No newline at end of file diff --git a/models-sim/models-sim-dmaap/pom.xml b/models-sim/models-sim-dmaap/pom.xml index c1981e6be..e3f0f0b27 100644 --- a/models-sim/models-sim-dmaap/pom.xml +++ b/models-sim/models-sim-dmaap/pom.xml @@ -1,6 +1,7 @@