diff options
| author |   a.sreekumar <ajith.sreekumar@est.tech> | 2019-07-05 13:00:35 +0000 |
|---|---|---|
| committer | a.sreekumar <ajith.sreekumar@est.tech> | 2019-07-05 13:00:35 +0000 |
| commit | c5231f939d724dd59cb385d8521924a1bff19cee (patch) | |
| tree | bed6d13d5986b0cd5f3b8d0fcea8b7010d951340 /models-sim/policy-models-sim-pdp/src/main/package | |
| parent | b359a4b56b4527b3215b89e7d637da9fbcb022af (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')
| -rw-r--r-- | models-sim/policy-models-sim-pdp/src/main/package/docker/pdp-sim.sh | 13 | ||||
| -rw-r--r-- | models-sim/policy-models-sim-pdp/src/main/package/tarball/assembly.xml | 1 |
2 files changed, 3 insertions, 11 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 diff --git a/models-sim/policy-models-sim-pdp/src/main/package/tarball/assembly.xml b/models-sim/policy-models-sim-pdp/src/main/package/tarball/assembly.xml index 25ffc65a9..2fc66d12b 100644 --- a/models-sim/policy-models-sim-pdp/src/main/package/tarball/assembly.xml +++ b/models-sim/policy-models-sim-pdp/src/main/package/tarball/assembly.xml @@ -50,7 +50,6 @@ </directory> <includes> <include>OnapPfConfig.json</include> - <include>topic.properties</include> </includes> <outputDirectory>etc/config</outputDirectory> <lineEnding>unix</lineEnding> |