[DMAAP-BC] Consolidate bus controller repos

[dmaap/buscontroller.git] / dbc-client / misc / dbc-client

diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index cf6c230..461a069 100644 (file)
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@ -25,7 +25,6 @@ umask 0022
 TZ=GMT0
 COMPONENT=dbc-client
 APP_ROOT=${APP_ROOT:-/opt/app/$COMPONENT}
-USER=root
 export TZ
 PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin
 export PATH
@@ -33,11 +32,17 @@ CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config}
 CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/dbc-client.env
 REQUESTID=${REQUESTID:-dbc-client}
 DBC=${DBC:-dmaap-bc}
-PROTO=${PROTO:-http}
-PORT=${PORT:-8080}
-
-
-
+PROTO=${PROTO:-https}
+PORT=${PORT:-8443}
+WAIT_TO_EXIT=${WAIT_TO_EXIT:-N}
+PEMDIR=${PEMDIR:-/opt/app/osaaf/local}
+CAPEM=${CAPEM:-ca.pem}
+CLIENTPEM=${CLIENTPEM:-client.pem}
+KEYPEM=${KEYPEM:-key.pem}
+CERTPWD=${CERTPWD:-'2U[iOZzMHI:.#tdCwlBqc;}S'}
+AUTH_METHOD=${AUTH_METHOD:-basicAuth}
+BA_IDENTITY=${BA_IDENTITY:-dmaap-bc@dmaap-bc.onap.org}
+BA_PWD=${BA_PWD:-'demo123456!'}
 
 config() {
        echo "ENTER config"
@@ -47,6 +52,23 @@ config() {
                echo "Expected app root directory $APP_ROOT does not exist"
                exit 1
        fi
+       cd $PEMDIR
+       pwd
+       ls -l
+       echo "AUTH_METHOD=$AUTH_METHOD"
+       if [ "$AUTH_METHOD"  =  "basicAuth" ]
+       then
+               echo "-u ${BA_IDENTITY}:${BA_PWD}" > $PEMDIR/curl.cred
+               CURLCRED="-K $PEMDIR/curl.cred"
+       elif [ -f $CAPEM  -a -f $CLIENTPEM -a -f $KEYPEM ]
+       then
+               printf "key \"$PEMDIR/$KEYPEM\"\ncacert \"$PEMDIR/$CAPEM\"\ncert \"$PEMDIR/${CLIENTPEM}:${CERTPWD}\"" > $PEMDIR/curl.cred
+               CURLCRED="-K $PEMDIR/curl.cred"
+       else
+               echo "Warning: PEM files for authorization not found!"
+               CURLCRED=""
+       fi
+       echo "CURLCRED=$CURLCRED"
        cd $APP_ROOT
        find . -type f -exec ls -l {} \;
        find $CONFIGMAP_ROOT -type f -exec ls -l {} \;
@@ -57,7 +79,7 @@ config() {
                source $CONTAINER_CONFIG
        fi
 
-       if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ]
+       if [ "$WAIT_TO_EXIT" != "Y" ]
        then
                echo "Creating $APP_ROOT/ok_to_exit so no waiting..."
                > $APP_ROOT/ok_to_exit
@@ -65,18 +87,12 @@ config() {
                echo "Not creating $APP_ROOT/ok_to_exit"
        fi      
        
-       if [ ! -f $APP_ROOT/misc/cert-client-init.sh ]
-       then
-               echo "Did not find $APP_ROOT/misc/cert-client-init.sh to append to truststore"
-               exit 1
-       fi
-       $APP_ROOT/misc/cert-client-init.sh
-
        set +x
 }
 
 
 init() {
+       set -x
        echo "ENTER init"
        if [ ! -d $CONFIGMAP_ROOT ]
        then
@@ -89,18 +105,21 @@ init() {
        while [ $rc != "200" ]
        do
                sleep 10
-               rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" ${PROTO}://${DBC}:${PORT}/webapi/dmaap`
+               rc=`curl $CURLCRED -s -o /dev/null -I -w "%{http_code}" -X GET -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" ${PROTO}://${DBC}:${PORT}/webapi/dmaap`
                echo "get dmaap response=${rc}"
        done
+       set +x
 }
+
 dopost() {
+       set -x
        RETRY_TIME=60
 
        loop=true
 
-       while [ $loop ]
+       while [ $loop = true ]
        do
-               rc=`curl -v -X POST -w "%{http_code}" -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" -d @${1} ${PROTO}://${DBC}:${PORT}/webapi/${2}`
+               rc=`curl $CURLCRED -s -X POST -w "%{http_code}" -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" -d @${1} ${PROTO}://${DBC}:${PORT}/webapi/${2} -o /dev/null`
                case $rc in
                200 | 201 | 409 )
                        echo "response=$rc"
@@ -112,10 +131,13 @@ dopost() {
                        ;;
                esac
        done
+       set +x
 
 }
+
 doprov() {
 
+       set -x
        cd $CONFIGMAP_ROOT
        pwd
        # order is important in this next list
@@ -130,7 +152,9 @@ doprov() {
                        done
                fi
        done
+       set +x
 }
+
 delay() {
        echo "DELAY=$DELAY"
        if [ ! -z "$DELAY" ]
@@ -139,7 +163,6 @@ delay() {
        fi
 }
 
-set -x
 delay
 config
 init