From f95fc5f7ae9cf1832eae2451be883477bbd08f16 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 21 Nov 2018 16:06:17 -0600 Subject: Batch upgrades for ONAP Issue-ID: AAF-641 Change-Id: I7b5e8b97d8c6c484418c995b6e51507af78fc765 Signed-off-by: Instrumental --- auth/auth-cass/cass_init/authBatch.props | 26 ++++++++++++++++ auth/auth-cass/cass_init/restore.sh | 52 ++++++++++++++++++++++++++++++++ auth/auth-cass/docker/Dockerfile.cass | 2 ++ auth/auth-cass/docker/dbuild.sh | 2 ++ 4 files changed, 82 insertions(+) create mode 100644 auth/auth-cass/cass_init/authBatch.props create mode 100644 auth/auth-cass/cass_init/restore.sh (limited to 'auth/auth-cass') diff --git a/auth/auth-cass/cass_init/authBatch.props b/auth/auth-cass/cass_init/authBatch.props new file mode 100644 index 00000000..90de4195 --- /dev/null +++ b/auth/auth-cass/cass_init/authBatch.props @@ -0,0 +1,26 @@ +aaf_data_dir=/opt/app/aaf/data +aaf_root_ns=org.osaaf.aaf +cadi_latitude=38.0 +cadi_longitude=-72.0 + +## Supported Plugin Organizational Units +Organization.att.com=org.onap.aaf.org.DefaultOrg + +DRY_RUN=false +CASS_ENV=DOCKER + +UNKNOWN.LOG_DIR=logs/DOCKER + +## Cassandra Configurations, when commented out, uses LocalHost (non authenticated) and default ports +DOCKER.cassandra.clusters=127.0.0.1 +DOCKER.cassandra.clusters.port=9042 +DOCKER.cassandra.clusters.user=cassandra +DOCKER.cassandra.clusters.password=cassandra +DOCKER.VERSION=3.1.0 +DOCKER.GUI_URL=https://mithrilcsp.sbc.com:8095/gui +DOCKER.punt=1 +DOCKER. +DOCKER.MAX_EMAILS=3 +DOCKER.SPECIAL_NAMES=aaf@aaf.osaaf.org + +cadi_loglevel=AUDIT diff --git a/auth/auth-cass/cass_init/restore.sh b/auth/auth-cass/cass_init/restore.sh new file mode 100644 index 00000000..768cf4c7 --- /dev/null +++ b/auth/auth-cass/cass_init/restore.sh @@ -0,0 +1,52 @@ +# echo -n "Password:" +# read -s PWD +# echo +echo `date` +ENV=DOCKER + +CQLSH="/usr/bin/cqlsh -k authz" + +cd dats +if [ "$*" = "" ]; then + DATA="" + for Tdat in `ls *.dat`; do + if [ -s "${Tdat}" ]; then + DATA="$DATA ${Tdat%.dat}" + fi + done +else + DATA="$*" +fi +cd - + +echo "You are about to REPLACE the data in the $ENV DB for the following tables:" +echo "$DATA" +echo -n 'If you are VERY sure, type "YES": ' +read YES + +if [ ! "$YES" = "YES" ]; then + echo 'Exiting ...' + exit +fi + +UPLOAD="" +for T in $DATA; do + if [ -s "dats/${T}.dat" ]; then + echo $T + case "$T" in + # 2.1.14 still has NULL problems for COPY. Fixed in 2.1.15+ + "approval"|"artifact"|"cred"|"ns"|"x509"|"role") + $CQLSH -e "truncate $T" + UPLOAD="$UPLOAD dats/"$T + ;; + *) + $CQLSH -e "truncate $T; COPY authz.${T} FROM 'dats/${T}.dat' WITH DELIMITER='|'" + ;; + esac + fi +done + +if [ ! "$UPLOAD" = "" ]; then + java -DCASS_ENV=$ENV -jar aaf-auth-batch-*-full.jar Upload $UPLOAD +fi +echo `date` diff --git a/auth/auth-cass/docker/Dockerfile.cass b/auth/auth-cass/docker/Dockerfile.cass index a540fb78..e79b33fc 100644 --- a/auth/auth-cass/docker/Dockerfile.cass +++ b/auth/auth-cass/docker/Dockerfile.cass @@ -26,6 +26,8 @@ LABEL version=${AAF_VERSION} COPY cass_init/*.cql /opt/app/aaf/cass_init/ COPY cass_init/*.sh /opt/app/aaf/cass_init/ +COPY cass_init/*.props /opt/app/aaf/cass_init/ +COPY aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf/cass_init/ COPY cass_data/*.dat /opt/app/aaf/cass_init/dats/ ENTRYPOINT ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh"] diff --git a/auth/auth-cass/docker/dbuild.sh b/auth/auth-cass/docker/dbuild.sh index 92f3e87c..100b8cb9 100644 --- a/auth/auth-cass/docker/dbuild.sh +++ b/auth/auth-cass/docker/dbuild.sh @@ -34,6 +34,7 @@ sed -e 's/${AAF_VERSION}/'${VERSION}'/g' $DIR/Dockerfile.cass > Dockerfile cd .. cp -Rf sample/cass_data auth-cass/cass_data cp sample/data/sample.identities.dat auth-cass +cp auth-batch/target/aaf-auth-batch-$VERSION-full.jar auth-cass echo $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass $DOCKER build -t ${ORG}/${PROJECT}/aaf_cass:${VERSION} auth-cass @@ -44,5 +45,6 @@ cd - rm Dockerfile rm -Rf cass_data rm sample.identities.dat +rm aaf-auth-batch-$VERSION-full.jar cd $DIR -- cgit 1.2.3-korg