summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@est.tech>2019-07-03 15:55:17 +0000
committera.sreekumar <ajith.sreekumar@est.tech>2019-07-03 15:55:17 +0000
commita0cc5811862052694918a16fdd8ebfd47ce8ec7b (patch)
tree5e2ab087b36a542a14bb1818a42690e456607ef1
parent9ef4186f69ef694e6251161622a33d7bc1400f39 (diff)
Remove topic.properties and incorporate into overall config file
Changes in the scripts to accomodate the removal of topic.properties. Change-Id: I0be390a6124248a4e9d3bf38437290b89cf36170 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
-rw-r--r--packages/policy-pap-docker/src/main/docker/policy-pap.sh14
-rw-r--r--testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh14
-rw-r--r--testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json43
-rw-r--r--testsuites/stability/src/main/resources/papsetup/config/pap/etc/topic.properties23
-rw-r--r--testsuites/stability/src/main/resources/papsetup/setup_pap.sh2
5 files changed, 46 insertions, 50 deletions
diff --git a/packages/policy-pap-docker/src/main/docker/policy-pap.sh b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
index c313d6dd..c0f3b2da 100644
--- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh
+++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
@@ -33,23 +33,11 @@ else
CONFIG_FILE=${CONFIG_FILE}
fi
-if [ "$#" -ge 2 ]; then
- PROP_FILE=$2
-else
- PROP_FILE=${PROP_FILE}
-fi
-
if [ -z "$CONFIG_FILE" ]
then
CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json"
fi
-if [ -z "$PROP_FILE" ]
- then
- PROP_FILE="${POLICY_HOME}/etc/topic.properties"
-fi
-
echo "Policy pap config file: $CONFIG_FILE"
-echo "Policy pap property file: $PROP_FILE"
-$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
+$JAVA_HOME/bin/java -cp "${POLICY_HOME}/etc:${POLICY_HOME}/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh
index ff4afa1c..66f7cc01 100644
--- a/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh
+++ b/testsuites/stability/src/main/resources/papsetup/config/pap/bin/policy-pap.sh
@@ -34,24 +34,12 @@ else
CONFIG_FILE=${CONFIG_FILE}
fi
-if [ "$#" -ge 2 ]; then
- PROP_FILE=$2
-else
- PROP_FILE=${PROP_FILE}
-fi
-
if [ -z "$CONFIG_FILE" ]
then
CONFIG_FILE="$POLICY_PAP_HOME/etc/defaultConfig.json"
fi
-if [ -z "$PROP_FILE" ]
- then
- PROP_FILE="$POLICY_PAP_HOME/etc/topic.properties"
-fi
-
echo "Policy pap config file: $CONFIG_FILE"
-echo "Policy pap property file: $PROP_FILE"
-$JAVA_HOME/bin/java -cp "$POLICY_PAP_HOME/etc:$POLICY_PAP_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" -Dcom.sun.management.jmxremote.rmi.port=9090 -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=9090 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Djava.rmi.server.hostname=10.2.0.43 org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
+$JAVA_HOME/bin/java -cp "$POLICY_PAP_HOME/etc:$POLICY_PAP_HOME/lib/*" -Djavax.net.ssl.keyStore="$KEYSTORE" -Djavax.net.ssl.keyStorePassword="$KEYSTORE_PASSWD" -Djavax.net.ssl.trustStore="$TRUSTSTORE" -Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" -Dcom.sun.management.jmxremote.rmi.port=9090 -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=9090 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.local.only=false -Djava.rmi.server.hostname=10.2.0.43 org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
new file mode 100644
index 00000000..3205611f
--- /dev/null
+++ b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/defaultConfig.json
@@ -0,0 +1,43 @@
+{
+ "name": "PapGroup",
+ "restServerParameters": {
+ "host": "0.0.0.0",
+ "port": 6969,
+ "userName": "healthcheck",
+ "password": "zb!XztG34",
+ "https": true,
+ "aaf": false
+ },
+ "pdpParameters": {
+ "heartBeatMs": 120000,
+ "updateParameters": {
+ "maxRetryCount": 1,
+ "maxWaitMs": 30000
+ },
+ "stateChangeParameters": {
+ "maxRetryCount": 1,
+ "maxWaitMs": 30000
+ }
+ },
+ "databaseProviderParameters": {
+ "name": "PolicyProviderParameterGroup",
+ "implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
+ "databaseDriver": "org.mariadb.jdbc.Driver",
+ "databaseUrl": "jdbc:mariadb://mariadb:3306/policyadmin",
+ "databaseUser": "policy_user",
+ "databasePassword": "cG9saWN5X3VzZXI=",
+ "persistenceUnit": "PolicyMariaDb"
+ },
+ "topicParameterGroup": {
+ "topicSources" : [{
+ "topic" : "POLICY-PDP-PAP",
+ "servers" : [ "10.2.0.41:3904" ],
+ "topicCommInfrastructure" : "dmaap"
+ }],
+ "topicSinks" : [{
+ "topic" : "POLICY-PDP-PAP",
+ "servers" : [ "10.2.0.41:3904" ],
+ "topicCommInfrastructure" : "dmaap"
+ }]
+ }
+} \ No newline at end of file
diff --git a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/topic.properties b/testsuites/stability/src/main/resources/papsetup/config/pap/etc/topic.properties
deleted file mode 100644
index 1ecee530..00000000
--- a/testsuites/stability/src/main/resources/papsetup/config/pap/etc/topic.properties
+++ /dev/null
@@ -1,23 +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
diff --git a/testsuites/stability/src/main/resources/papsetup/setup_pap.sh b/testsuites/stability/src/main/resources/papsetup/setup_pap.sh
index 2e965a5c..07713707 100644
--- a/testsuites/stability/src/main/resources/papsetup/setup_pap.sh
+++ b/testsuites/stability/src/main/resources/papsetup/setup_pap.sh
@@ -20,4 +20,4 @@
# the directory of the script
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo ${DIR}
-docker run -p 9090:9090 -p 6969:6969 -v ${DIR}/config/pap/bin/policy-pap.sh:/opt/app/policy/pap/bin/policy-pap.sh -v ${DIR}/config/pap/etc/topic.properties:/opt/app/policy/pap/etc/topic.properties --add-host mariadb:10.2.0.41 --name policy-pap -d --rm nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest
+docker run -p 9090:9090 -p 6969:6969 -v ${DIR}/config/pap/bin/policy-pap.sh:/opt/app/policy/pap/bin/policy-pap.sh -v ${DIR}/config/pap/etc/defaultConfig.json:/opt/app/policy/pap/etc/defaultConfig.json --add-host mariadb:10.2.0.41 --name policy-pap -d --rm nexus3.onap.org:10001/onap/policy-pap:2.0.0-SNAPSHOT-latest