From 4a3cfdff6285a516f1e05d4cebd748ea623177e5 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Tue, 12 Mar 2019 11:53:22 -0400
Subject: Add PDP Group Deploy and Delete REST API stubs

Note: this will not build until the models-pap code has been added.

Added PDP group Delete methods, with and without version.

Added checks for OK status codes.

Added topic configuration.
Still does not have the "simplified" PDP Group deploy/undeploy.
Still won't build without "Move PDP Group classes to concepts subdirectory".

Will add junit tests for code changes in another review.
Updated comments about unlocking after updates.
Made ServiceManager final.
Included topic start/stop actions.
Fixed parameter comment.
Removed unneeded parameters from json files.
Fixed argument test in shell script.
Updated licenses.

Change-Id: I6176d51918ae758e04fb68562dc9ca70534137d4
Issue-ID: POLICY-1542
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../src/main/docker/policy-pap.sh                  | 17 +++++++++++++--
 .../src/main/package/tarball/assembly.xml          |  2 ++
 .../src/main/resources/etc/topic.properties        | 25 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 packages/policy-pap-tarball/src/main/resources/etc/topic.properties

(limited to 'packages')

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 6bd53780..f72a5b50 100644
--- a/packages/policy-pap-docker/src/main/docker/policy-pap.sh
+++ b/packages/policy-pap-docker/src/main/docker/policy-pap.sh
@@ -2,6 +2,7 @@
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2019 Nordix Foundation.
+#  Modifications Copyright (C) 2019 AT&T Intellectual Property.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,17 +28,29 @@ TRUSTSTORE="${POLICY_HOME}/etc/ssl/policy-truststore"
 TRUSTSTORE_PASSWD="Pol1cy_0nap"
 
 
-if [ "$#" -eq 1 ]; then
+if [ "$#" -ge 1 ]; then
     CONFIG_FILE=$1
 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" org.onap.policy.pap.main.startstop.Main -c $CONFIG_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" org.onap.policy.pap.main.startstop.Main -c $CONFIG_FILE -p $PROP_FILE
diff --git a/packages/policy-pap-tarball/src/main/package/tarball/assembly.xml b/packages/policy-pap-tarball/src/main/package/tarball/assembly.xml
index c315a4ba..1bad6c90 100644
--- a/packages/policy-pap-tarball/src/main/package/tarball/assembly.xml
+++ b/packages/policy-pap-tarball/src/main/package/tarball/assembly.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2019 Nordix Foundation.
+   Modifications Copyright (C) 2019 AT&T Intellectual Property.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,6 +42,7 @@
             </directory>
             <includes>
                 <include>*.json</include>
+                <include>*.properties</include>
                 <include>*.xml</include>
             </includes>
             <outputDirectory>/etc</outputDirectory>
diff --git a/packages/policy-pap-tarball/src/main/resources/etc/topic.properties b/packages/policy-pap-tarball/src/main/resources/etc/topic.properties
new file mode 100644
index 00000000..2f3c711b
--- /dev/null
+++ b/packages/policy-pap-tarball/src/main/resources/etc/topic.properties
@@ -0,0 +1,25 @@
+# ============LICENSE_START=======================================================
+# ONAP PAP
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# 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.
+# ============LICENSE_END=========================================================
+
+
+# These will be filled with real values later
+
+noop.sink.topics=POLICY-PDP-PAP
+noop.sink.topics.POLICY-PDP-PAP.servers=anyserver
+noop.source.topics=POLICY-PDP-PAP
+noop.source.topics.POLICY-PDP-PAP.servers=anyserver
-- 
cgit 1.2.3-korg