From 9ef4186f69ef694e6251161622a33d7bc1400f39 Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Mon, 1 Jul 2019 14:50:01 +0000 Subject: Remove topic.properties and incorporate into overall config file 1) The properties in the topic.properties file is moved into overall config json file and the topic.properties file is removed. 2) Common parameters such as RestServer and Topic related parameters from policy-common is used. Change-Id: I390bbe3cda101a69e7ce614404ecdfbf98598dd2 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar --- .../simulatorsetup/config/pdp/OnapPfConfig.json | 12 ++++++++++++ .../simulatorsetup/config/pdp/topic.properties | 22 ---------------------- 2 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 testsuites/stability/src/main/resources/simulatorsetup/config/pdp/topic.properties (limited to 'testsuites/stability/src') diff --git a/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/OnapPfConfig.json b/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/OnapPfConfig.json index cbb4978b..de31d50f 100644 --- a/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/OnapPfConfig.json +++ b/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/OnapPfConfig.json @@ -5,5 +5,17 @@ "pdpType":"apex", "description":"Pdp Heartbeat", "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}] + }, + "topicParameterGroup": { + "topicSources" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "message-router" ], + "topicCommInfrastructure" : "dmaap" + }], + "topicSinks" : [{ + "topic" : "POLICY-PDP-PAP", + "servers" : [ "message-router" ], + "topicCommInfrastructure" : "dmaap" + }] } } diff --git a/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/topic.properties b/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/topic.properties deleted file mode 100644 index f659a4dd..00000000 --- a/testsuites/stability/src/main/resources/simulatorsetup/config/pdp/topic.properties +++ /dev/null @@ -1,22 +0,0 @@ -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -dmaap.source.topics=POLICY-PDP-PAP -dmaap.sink.topics=POLICY-PDP-PAP -dmaap.source.topics.POLICY-PDP-PAP.servers= 10.2.0.41:3904 -dmaap.sink.topics.POLICY-PDP-PAP.servers= 10.2.0.41:3904 -- cgit 1.2.3-korg