From d0a915d10c00314ecc1f07c2ecf9dd239ee47aad Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Mon, 18 Feb 2019 18:20:55 +0000 Subject: Restructure project for 2 images Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt Issue-ID: DMAAP-1046 Signed-off-by: dglFromAtt Patchset2 - corrected some typos Signed-off-by: dglFromAtt Signed-off-by: dglFromAtt Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt Patchset3 - use latest dbcapi.jar Change-Id: I05b858012a05b1c177a8a2e25ec610b0174b6a54 Signed-off-by: dglFromAtt --- dbc-client/misc/dbc-client | 122 ++++++++++++++++++++++++++ dbc-client/pom.xml | 197 ++++++++++++++++++++++++++++++++++++++++++ dbc-client/version.properties | 35 ++++++++ 3 files changed, 354 insertions(+) create mode 100644 dbc-client/misc/dbc-client create mode 100644 dbc-client/pom.xml create mode 100644 dbc-client/version.properties (limited to 'dbc-client') diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client new file mode 100644 index 0000000..42e7282 --- /dev/null +++ b/dbc-client/misc/dbc-client @@ -0,0 +1,122 @@ +#!/bin/sh +# +# ============LICENSE_START========================================== +# org.onap.dmaap +# =================================================================== +# Copyright © 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============================================ +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +# + +umask 0022 +TZ=GMT0 +COMPONENT=dbc-client +APP_ROOT=/opt/app/$COMPONENT +USER=root +export TZ +PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin +export PATH +CONFIGMAP_ROOT=${CONFIGMAP_ROOT:-/opt/app/config} +CONTAINER_CONFIG=$CONFIGMAP_ROOT/conf/dbc-client.env + + + + +config() { + echo "ENTER config" + set -x + if [ ! -d $APP_ROOT ] + then + echo "Expected app root directory $APP_ROOT does not exist" + exit 1 + fi + cd $APP_ROOT + find . -type f -exec ls -l {} \; + find $CONFIGMAP_ROOT -type f -exec ls -l {} \; + if [ ! -f $CONTAINER_CONFIG ] + then + echo "WARNING: Expected env file $CONTAINER_CONFIG not found. Default behaviors in effect" + else + source $CONTAINER_CONFIG + fi + + if [ "$DMAAPBC_WAIT_TO_EXIT" != "Y" ] + then + echo "Creating $APP_ROOT/ok_to_exit so no waiting..." + > $APP_ROOT/ok_to_exit + else + 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() { + echo "ENTER init" + if [ ! -d $CONFIGMAP_ROOT ] + then + echo $CONFIGMAP_ROOT does not exist + return + fi + + #loop on get /dmaap until we get a good response to indicate other provisioning can continue + rc=999 + while [ $rc != "200" ] + do + sleep 10 + rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap` + echo "get dmaap response=${rc}" + done +} +doprov() { + + cd $CONFIGMAP_ROOT + pwd + # order is important in this next list + for uri in dmaap dcaeLocations mr_clusters topics feeds mr_clients dr_pubs dr_subs + do + if [ -d ${uri} ] + then + for j in `ls ${uri}/*.json` + do + echo "POST $j to $uri" + rc=`curl -v -X POST -w "%{http_code}" -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}` + echo "response=$rc" + done + fi + done +} + +set -x +config +init +doprov + +echo "Check $APP_ROOT/ok_to_exit" +while [ ! -f $APP_ROOT/ok_to_exit ] +do + echo "$APP_ROOT/ok_to_exit does not exist. Sticking around for debugging..." + sleep 10 +done +exit 0 diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml new file mode 100644 index 0000000..945eeee --- /dev/null +++ b/dbc-client/pom.xml @@ -0,0 +1,197 @@ + + + + 4.0.0 + org.onap.dmaap.buscontroller + dbc-client + ${artifact.version} + dbc-client + + org.onap.oparent + oparent + 1.2.2 + + + + dbc-client + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ecomp-staging + ${nexusproxy} + 176c31dfe190a + + + + + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.10,) + install + + copy-dependencies + + + + + + + + + + + + + + + + docker + + false + false + true + + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + alpine:3.8 + ${onap.nexus.dockerregistry.daily}/${docker.image} + ["./bin/dbc-client", "deploy"] + ${onap.nexus.dockerregistry.daily} + false + + ${artifact.version} + latest + + + /opt/app/dbc-client/log + + true + root + + + /opt/app/dmaapbc/etc + ${multiproject.basedir}/dbc-client + version.properties + + + /opt/app/dbc-client/misc + ${multiproject.basedir}/misc + cert-client-init.sh + + + /opt/app/dbc-client/bin + ${multiproject.basedir}/dbc-client/misc + dbc-client + + + + apk add --no-cache curl + chmod +x /opt/app/dbc-client/misc/cert-client-init.sh + chmod +x /opt/app/dbc-client/bin/* + mkdir /opt/app/dbc-client/logs + + /opt/app/dbc-client + + + + default + + build + push + + + + + + + + + + + + + ${basedir}/.. + 1.0.0 + 2.16 + UTF-8 + 9.4.12.RC2 + 1.0.0 + 1.5.19 + 1.0.2 + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + + onap/dmaap/dbc-client + + https://nexus.onap.org + nexus3.onap.org:10003 + + + /content/sites/site/org/onap/dmaap/dbc-client/${artifact.version} + + Packaging Platform (DMaaP) HTTP Client for Bus Controller Provisioning. + diff --git a/dbc-client/version.properties b/dbc-client/version.properties new file mode 100644 index 0000000..895a84e --- /dev/null +++ b/dbc-client/version.properties @@ -0,0 +1,35 @@ +### +# ============LICENSE_START======================================================= +# org.onap.dmaap +# ================================================================================ +# Copyright (C) 2017 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============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=1 +minor=0 +patch=2 +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg