From 6be3c1abaf5c3eea0b353675835b6d2ce4584fe7 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 12 Jul 2021 15:25:53 -0400 Subject: Delete extra simulator docker images The policy-models-simulator docker image, built from models-sim/packages, subsumes the functionality of the other simulator images. Deleted the other images. This simulator still needs some of the code from the dmaap-sim modules, so only deleted the code from the latter that is not needed by this simulator. Also modified the simulator launch script to use sh instead of bash. Issue-ID: POLICY-3474 Change-Id: Ie7f69b327a18c3e07f154124ae38975d5e6924f0 Signed-off-by: Jim Hahn --- .../src/main/java/org/onap/policy/simulators/Util.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'models-interactions/model-simulators') 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 8b8526259..29d665416 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 @@ -34,7 +34,6 @@ 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; @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class Util { @@ -164,7 +163,7 @@ public final class Util { DmaapSimProvider.setInstance(new DmaapSimProvider(params)); - var props = DmaapSimRestServer.getServerProperties(params.getRestServerParameters()); + var props = params.getRestServerParameters().getServerProperties(); final String svcpfx = PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." + params.getRestServerParameters().getName(); -- cgit 1.2.3-korg