From 71be21fd5b9b52c613bb855f00a79a51e81906dd Mon Sep 17 00:00:00 2001 From: "adheli.tavares" Date: Thu, 11 Jan 2024 14:04:24 +0000 Subject: [PATCH] Fix simulator topics for lower case Issue-ID: POLICY-4402 Change-Id: I4a3122810e01988aeed0d68e3b8d7167daee4e62 Signed-off-by: adheli.tavares --- .gitignore | 1 + .../onap/policy/simulators/DmaapSimulatorTest.java | 6 +++--- .../org/onap/policy/models/simulators/Main.java | 4 ++-- .../onap/policy/models/simulators/MainTest.java | 6 +++--- .../src/test/resources/simParameters.json | 24 +++++++++++----------- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 21a4ea971..4a1ccd6e4 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ bin/ *.iml *.ipr *.iws +*.log 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 index 97ecfc2ca..5687e2197 100644 --- 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2019, 2022 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2022 Bell Canada. All rights reserved. - * Modifications Copyright (C) 2023 Nordix Foundation. + * Modifications Copyright (C) 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. @@ -44,8 +44,8 @@ import org.onap.policy.common.utils.coder.StandardCoder; public class DmaapSimulatorTest { private static final int MAX_WAIT_SEC = 10; - private static final String TOPIC = "MY-TOPIC"; - private static final String AUTH_TOPIC = "MY-AUTH-TOPIC"; + private static final String TOPIC = "my-topic"; + private static final String AUTH_TOPIC = "my-auth-topic"; private static final String AUTH_PORT = "3903"; private static final HashMap savedValuesMap = new HashMap<>(); diff --git a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java index e14beab9f..a501d5253 100644 --- a/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java +++ b/models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * Modifications Copyright (C) 2020-2021 Bell Canada. All rights reserved. - * Modifications Copyright 2023 Nordix Foundation. + * Modifications Copyright 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. @@ -269,7 +269,7 @@ public class Main extends ServiceManagerContainer { * parameters. * * @param params parameters from which to build the properties - * @return a set of properties representing the given parameters + * @return a Map of properties representing the given parameters */ private static Properties getServerProperties(String dmaapName, ClassRestServerParameters params) { final var props = new Properties(); diff --git a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java index 6326b704b..73eb69f7a 100644 --- a/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java +++ b/models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java @@ -3,7 +3,7 @@ * ONAP * ================================================================================ * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. - * Modifications Copyright (C) 2023 Nordix Foundation. + * Modifications Copyright (C) 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. @@ -120,7 +120,7 @@ public class MainTest { } /** - * Verifies that all of the simulators are brought up and that HTTPS works with at + * Verifies that all the simulators are brought up and that HTTPS works with at * least one of them. */ @Test @@ -224,7 +224,7 @@ public class MainTest { } }; - // run in another thread so we don't interrupt this thread + // run in another thread, so we don't interrupt this thread LinkedBlockingQueue queue = new LinkedBlockingQueue<>(); Thread thread = new Thread(() -> { try { diff --git a/models-sim/policy-models-simulators/src/test/resources/simParameters.json b/models-sim/policy-models-simulators/src/test/resources/simParameters.json index 0f1e6e680..325998fef 100644 --- a/models-sim/policy-models-simulators/src/test/resources/simParameters.json +++ b/models-sim/policy-models-simulators/src/test/resources/simParameters.json @@ -49,19 +49,19 @@ ], "topicSinks": [ { - "topic": "APPC-CL", + "topic": "appc-cl", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true }, { - "topic": "APPC-LCM-WRITE", + "topic": "appc-lcm-write", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true }, { - "topic": "SDNR-CL", + "topic": "sdnr-cl", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true @@ -69,19 +69,19 @@ ], "topicSources": [ { - "topic": "APPC-CL", + "topic": "appc-cl", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true }, { - "topic": "APPC-LCM-READ", + "topic": "appc-lcm-read", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true }, { - "topic": "SDNR-CL-RSP", + "topic": "sdnr-cl-rsp", "servers": ["localhost"], "topicCommInfrastructure": "DMAAP", "useHttps": true @@ -91,20 +91,20 @@ { "name": "APPC Legacy simulator", "providerClass": "org.onap.policy.simulators.AppcLegacyTopicServer", - "sink": "APPC-CL", - "source": "APPC-CL" + "sink": "appc-cl", + "source": "appc-cl" }, { "name": "APPC-LCM simulator", "providerClass": "org.onap.policy.simulators.AppcLcmTopicServer", - "sink": "APPC-LCM-WRITE", - "source": "APPC-LCM-READ" + "sink": "appc-lcm-write", + "source": "appc-lcm-read" }, { "name": "SDNR simulator", "providerClass": "org.onap.policy.simulators.SdnrTopicServer", - "sink": "SDNR-CL", - "source": "SDNR-CL-RSP" + "sink": "sdnr-cl", + "source": "sdnr-cl-rsp" } ], "grpcServer": { -- 2.16.6