summaryrefslogtreecommitdiffstats
path: root/models-sim/policy-models-sim-pdp/src
diff options
context:
space:
mode:
authorrameshiyer27 <ramesh.murugan.iyer@est.tech>2024-01-29 09:23:58 +0000
committerRamesh Murugan Iyer <ramesh.murugan.iyer@est.tech>2024-02-08 14:29:41 +0000
commit49f07db935d114b72a44e446867b16262dd552aa (patch)
treef6867985541acb76f1e5279ed4104c86dc7adffb /models-sim/policy-models-sim-pdp/src
parent71be21fd5b9b52c613bb855f00a79a51e81906dd (diff)
Remove dmaap from models
Issue-ID: POLICY-4402 Change-Id: Icead1601984f463e557b969f2792f0f0aa05f060 Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Diffstat (limited to 'models-sim/policy-models-sim-pdp/src')
-rw-r--r--models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json10
-rw-r--r--models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/CommonTestData.java13
-rw-r--r--models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters.json8
-rw-r--r--models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters_sim.json8
-rw-r--r--models-sim/policy-models-sim-pdp/src/test/resources/TestConfigParameters.json8
5 files changed, 23 insertions, 24 deletions
diff --git a/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json b/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json
index 4b05fd985..2c6a33266 100644
--- a/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json
+++ b/models-sim/policy-models-sim-pdp/src/main/resources/config/OnapPfConfig.json
@@ -10,13 +10,15 @@
"topicParameterGroup": {
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",
- "servers" : [ "message-router:3904" ],
- "topicCommInfrastructure" : "dmaap"
+ "servers" : [ "localhost" ],
+ "topicCommInfrastructure" : "noop",
+ "fetchTimeout": 15000
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
- "servers" : [ "message-router:3904" ],
- "topicCommInfrastructure" : "dmaap"
+ "servers" : [ "localhost" ],
+ "topicCommInfrastructure" : "noop",
+ "fetchTimeout": 15000
}]
}
} \ No newline at end of file
diff --git a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/CommonTestData.java b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/CommonTestData.java
index 7c740c4b2..a6b136b98 100644
--- a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/CommonTestData.java
+++ b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/parameters/CommonTestData.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2020 Nordix Foundation.
+ * Copyright (C) 2019-2020, 2024 Nordix Foundation.
* Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,6 @@
package org.onap.policy.models.sim.pdp.parameters;
-import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
@@ -48,14 +47,13 @@ public class CommonTestData {
public static final String POLICY_NAME = "onap.controllloop.operational.apex.BBS";
public static final String POLICY_VERSION = "0.0.1";
protected static final List<ToscaPolicyTypeIdentifierParameters> SUPPORTED_POLICY_TYPES =
- Arrays.asList(getSupportedPolicyTypes(POLICY_NAME, POLICY_VERSION));
- public static final List<TopicParameters> TOPIC_PARAMS = Arrays.asList(getTopicParams());
+ List.of(getSupportedPolicyTypes(POLICY_NAME, POLICY_VERSION));
+ public static final List<TopicParameters> TOPIC_PARAMS = List.of(getTopicParams());
private static final String REST_SERVER_PASS = "zb!XztG34";
private static final String REST_SERVER_USER = "healthcheck";
private static final int REST_SERVER_PORT = 6969;
private static final String REST_SERVER_HOST = "0.0.0.0";
private static final boolean REST_SERVER_HTTPS = true;
- private static final boolean REST_SERVER_AAF = false;
public static final Coder coder = new StandardCoder();
@@ -79,8 +77,8 @@ public class CommonTestData {
public static TopicParameters getTopicParams() {
final TopicParameters topicParams = new TopicParameters();
topicParams.setTopic("POLICY-PDP-PAP");
- topicParams.setTopicCommInfrastructure("dmaap");
- topicParams.setServers(Arrays.asList("message-router"));
+ topicParams.setTopicCommInfrastructure("kafka");
+ topicParams.setServers(List.of("localhost:9092"));
return topicParams;
}
@@ -126,7 +124,6 @@ public class CommonTestData {
public Map<String, Object> getRestServerParametersMap(final boolean isEmpty) {
final Map<String, Object> map = new TreeMap<>();
map.put("https", REST_SERVER_HTTPS);
- map.put("aaf", REST_SERVER_AAF);
if (!isEmpty) {
map.put("host", REST_SERVER_HOST);
diff --git a/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters.json b/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters.json
index c30b91b4a..6c6068dd3 100644
--- a/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters.json
+++ b/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters.json
@@ -15,11 +15,11 @@
},{
"topic" : "POLICY-PDP-PAP1",
"servers" : [ "message-router1, message-router2" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
},{
"topic" : "POLICY-PDP-PAP2",
"servers" : [ "message-router2, message-router3" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
}],
"topicSinks" : [ {
"topic" : "ueb-sink",
@@ -28,11 +28,11 @@
},{
"topic" : "POLICY-PDP-PAP2",
"servers" : [ "message-router1, message-router2" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
},{
"topic" : "POLICY-PDP-PAP3",
"servers" : [ "message-router2, message-router3" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
}]
}
} \ No newline at end of file
diff --git a/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters_sim.json b/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters_sim.json
index 689486728..d9b0ec6a2 100644
--- a/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters_sim.json
+++ b/models-sim/policy-models-sim-pdp/src/test/resources/PdpSimulatorConfigParameters_sim.json
@@ -10,13 +10,13 @@
"topicParameterGroup": {
"topicSources" : [{
"topic" : "POLICY-PDP-PAP",
- "servers" : [ "localhost:6845" ],
- "topicCommInfrastructure" : "dmaap"
+ "servers" : [ "localhost" ],
+ "topicCommInfrastructure" : "noop"
}],
"topicSinks" : [{
"topic" : "POLICY-PDP-PAP",
- "servers" : [ "localhost:6845" ],
- "topicCommInfrastructure" : "dmaap"
+ "servers" : [ "localhost" ],
+ "topicCommInfrastructure" : "noop"
}]
}
}
diff --git a/models-sim/policy-models-sim-pdp/src/test/resources/TestConfigParameters.json b/models-sim/policy-models-sim-pdp/src/test/resources/TestConfigParameters.json
index 7ddc45cf6..b114dd1fd 100644
--- a/models-sim/policy-models-sim-pdp/src/test/resources/TestConfigParameters.json
+++ b/models-sim/policy-models-sim-pdp/src/test/resources/TestConfigParameters.json
@@ -15,11 +15,11 @@
},{
"topic" : "POLICY-PDP-PAP1",
"servers" : [ "message-router1, message-router2" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
},{
"topic" : "POLICY-PDP-PAP2",
"servers" : [ "message-router2, message-router3" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
}],
"topicSinks" : [ {
"topic" : "ueb-sink",
@@ -28,11 +28,11 @@
},{
"topic" : "POLICY-PDP-PAP2",
"servers" : [ "message-router1, message-router2" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
},{
"topic" : "POLICY-PDP-PAP3",
"servers" : [ "message-router2, message-router3" ],
- "topicCommInfrastructure" : "dmaap"
+ "topicCommInfrastructure" : "NOOP"
}]
}
} \ No newline at end of file