From 49f07db935d114b72a44e446867b16262dd552aa Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Mon, 29 Jan 2024 09:23:58 +0000 Subject: Remove dmaap from models Issue-ID: POLICY-4402 Change-Id: Icead1601984f463e557b969f2792f0f0aa05f060 Signed-off-by: rameshiyer27 --- .../onap/policy/simulators/AppcLcmTopicServer.java | 9 ++-- .../main/java/org/onap/policy/simulators/Util.java | 51 +--------------------- .../simulators/dmaap/AuthDmaapParameters.json | 12 ----- .../policy/simulators/dmaap/DmaapParameters.json | 8 ---- 4 files changed, 6 insertions(+), 74 deletions(-) delete mode 100644 models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/AuthDmaapParameters.json delete mode 100644 models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json (limited to 'models-interactions/model-simulators/src/main') diff --git a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java index a8ec6e5e9..62e1acc9c 100644 --- a/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java +++ b/models-interactions/model-simulators/src/main/java/org/onap/policy/simulators/AppcLcmTopicServer.java @@ -3,6 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2024 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,7 +21,7 @@ package org.onap.policy.simulators; -import org.onap.policy.appclcm.AppcLcmDmaapWrapper; +import org.onap.policy.appclcm.AppcLcmMessageWrapper; import org.onap.policy.common.endpoints.event.comm.TopicSink; import org.onap.policy.common.endpoints.event.comm.TopicSource; import org.onap.policy.common.utils.coder.StandardCoder; @@ -29,14 +30,14 @@ import org.onap.policy.common.utils.resources.ResourceUtils; /** * APPC-LCM topic server. */ -public class AppcLcmTopicServer extends TopicServer { +public class AppcLcmTopicServer extends TopicServer { public AppcLcmTopicServer(TopicSink sink, TopicSource source) { - super(sink, source, new StandardCoder(), AppcLcmDmaapWrapper.class); + super(sink, source, new StandardCoder(), AppcLcmMessageWrapper.class); } @Override - protected String process(AppcLcmDmaapWrapper request) { + protected String process(AppcLcmMessageWrapper request) { /* * In case the request and response are on the same topic, this may be invoked * with a request or with a response object. If the "output" is not null, then we 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 bbe1a3604..37c1b0c2c 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 @@ -3,7 +3,7 @@ * simulators * ================================================================================ * Copyright (C) 2017-2019, 2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2019, 2023 Nordix Foundation. + * Modifications Copyright (C) 2019, 2023-2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,14 +26,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; 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.parameters.ParameterRuntimeException; -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; @NoArgsConstructor(access = AccessLevel.PRIVATE) public final class Util { @@ -49,7 +42,6 @@ public final class Util { public static final int XACMLSIM_SERVER_PORT = 6669; public static final int SDNCSIM_SERVER_PORT = 6670; public static final int CDSSIM_SERVER_PORT = 6671; - public static final int DMAAPSIM_SERVER_PORT = 3904; private static final String CANNOT_PROCESS_PARAMETERS = "cannot parse parameters "; private static final String CANNOT_CONNECT = "cannot connect to port "; @@ -155,47 +147,6 @@ public final class Util { return testServer; } - /** - * Builds an unauthenticated HTTP DMaaP simulator. - * - * @return the simulator - * @throws InterruptedException if a thread is interrupted - */ - public static HttpServletServer buildDmaapSim() throws InterruptedException { - return buildDmaapSim("org/onap/policy/simulators/dmaap/DmaapParameters.json"); - } - - /** - * Build a DMaaP simulator from a properties file. - * - * @param resourceName the name of the properties file - * @return the simulator - * @throws InterruptedException if a thread is interrupted - */ - public static HttpServletServer buildDmaapSim(String resourceName) throws InterruptedException { - var json = ResourceUtils.getResourceAsString(resourceName); - DmaapSimParameterGroup params; - try { - params = new StandardCoder().decode(json, DmaapSimParameterGroup.class); - } catch (CoderException ce) { - throw new ParameterRuntimeException( - CANNOT_PROCESS_PARAMETERS + resourceName, ce); - } - - DmaapSimProvider.setInstance(new DmaapSimProvider(params)); - - var props = params.getRestServerParameters().getServerProperties(); - - final String svcpfx = PolicyEndPointProperties.PROPERTY_HTTP_SERVER_SERVICES + "." - + params.getRestServerParameters().getName(); - props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true"); - - HttpServletServer testServer = HttpServletServerFactoryInstance.getServerFactory().build(props).get(0); - testServer.waitedStart(5000); - waitForServerToListen(testServer.getPort()); - return testServer; - } - private static void waitForServerToListen(int port) throws InterruptedException { if (!NetworkUtil.isTcpPortOpen(LOCALHOST, port, 200, 250L)) { throw new IllegalStateException(CANNOT_CONNECT + port); diff --git a/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/AuthDmaapParameters.json b/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/AuthDmaapParameters.json deleted file mode 100644 index cd84faf1e..000000000 --- a/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/AuthDmaapParameters.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "AuthDMaapSim", - "topicSweepSec": 300, - "restServerParameters": { - "host": "0.0.0.0", - "port": 3903, - "sniHostCheck": false, - "useHttps": true, - "userName": "my-username", - "password": "my-password" - } -} 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 deleted file mode 100644 index b704f6f14..000000000 --- a/models-interactions/model-simulators/src/main/resources/org/onap/policy/simulators/dmaap/DmaapParameters.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "DMaapSim", - "topicSweepSec": 300, - "restServerParameters": { - "host": "0.0.0.0", - "port": 3904 - } -} -- cgit 1.2.3-korg