summaryrefslogtreecommitdiffstats
path: root/models-sim/policy-models-sim-pdp/src/main/package/docker
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@est.tech>2019-07-05 13:00:35 +0000
committera.sreekumar <ajith.sreekumar@est.tech>2019-07-05 13:00:35 +0000
commitc5231f939d724dd59cb385d8521924a1bff19cee (patch)
treebed6d13d5986b0cd5f3b8d0fcea8b7010d951340 /models-sim/policy-models-sim-pdp/src/main/package/docker
parentb359a4b56b4527b3215b89e7d637da9fbcb022af (diff)
Remove topic.properties and incorporate into overall config file for pdp-simulator
Change-Id: Iac882c7ffb28a80ef474d15a90307cd68b78d417 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
Diffstat (limited to 'models-sim/policy-models-sim-pdp/src/main/package/docker')
-rw-r--r--models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh13
1 files changed, 3 insertions, 10 deletions
diff --git a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
index b0e3ba0e5..2316ccecf 100644
--- a/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
+++ b/models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh
@@ -30,13 +30,11 @@ KEYSTORE_PASSWD="Pol1cy_0nap"
TRUSTSTORE="${PDP_SIM_HOME}/etc/ssl/policy-truststore"
TRUSTSTORE_PASSWD="Pol1cy_0nap"
-if [ "$#" -eq 2 ]
+if [ "$#" -eq 1 ]
then
CONFIG_FILE=$1
- PROPERTIES_FILE=$2
else
CONFIG_FILE=${CONFIG_FILE}
- PROPERTIES_FILE=${PROPERTIES_FILE}
fi
if [ -z "$CONFIG_FILE" ]
@@ -44,12 +42,7 @@ then
CONFIG_FILE="$PDP_SIM_HOME/etc/config/OnapPfConfig.json"
fi
-if [ -z "$PROPERTIES_FILE" ]
-then
- PROPERTIES_FILE="$PDP_SIM_HOME/etc/config/topic.properties"
-fi
-
-echo "PDP simulatior configuration file: $CONFIG_FILE and properties file: $PROPERTIES_FILE"
+echo "PDP simulatior configuration file: $CONFIG_FILE
$JAVA_HOME/bin/java \
-cp "$PDP_SIM_HOME/etc:$PDP_SIM_HOME/lib/*" \
@@ -59,4 +52,4 @@ $JAVA_HOME/bin/java \
-Djavax.net.ssl.trustStorePassword="$TRUSTSTORE_PASSWD" \
-Dlogback.configurationFile=$PDP_SIM_HOME/etc/logback.xml \
org.onap.policy.models.sim.pdp.PdpSimulatorMain \
- -c $CONFIG_FILE -p $PROPERTIES_FILE
+ -c $CONFIG_FILE