summaryrefslogtreecommitdiffstats
path: root/models-sim/policy-models-simulators
diff options
context:
space:
mode:
Diffstat (limited to 'models-sim/policy-models-simulators')
-rw-r--r--models-sim/policy-models-simulators/src/main/java/org/onap/policy/models/simulators/Main.java4
-rw-r--r--models-sim/policy-models-simulators/src/test/java/org/onap/policy/models/simulators/MainTest.java6
-rw-r--r--models-sim/policy-models-simulators/src/test/resources/simParameters.json24
3 files changed, 17 insertions, 17 deletions
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<RuntimeException> 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": {