aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dbc-client/misc/dbc-client15
-rw-r--r--dbc-client/pom.xml2
-rw-r--r--dbc-client/version.properties2
3 files changed, 14 insertions, 5 deletions
diff --git a/dbc-client/misc/dbc-client b/dbc-client/misc/dbc-client
index 42e7282..a812460 100644
--- a/dbc-client/misc/dbc-client
+++ b/dbc-client/misc/dbc-client
@@ -31,6 +31,7 @@ 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
+REQUESTID=${REQUESTID:-dbc-client}
@@ -85,7 +86,7 @@ init() {
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`
+ rc=`curl -s -o /dev/null -I -w "%{http_code}" -X GET -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" http://dmaap-bc:8080/webapi/dmaap`
echo "get dmaap response=${rc}"
done
}
@@ -94,21 +95,29 @@ 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
+ for uri in dmaap dcaeLocations mr_clusters topics mr_clients dr_nodes feeds 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}`
+ rc=`curl -v -X POST -w "%{http_code}" -H "X-ECOMP-RequestID: $REQUESTID" -H "Content-Type: application/json" -d @${j} http://dmaap-bc:8080/webapi/${uri}`
echo "response=$rc"
done
fi
done
}
+delay() {
+ echo "DELAY=$DELAY"
+ if [ ! -z "$DELAY" ]
+ then
+ sleep $DELAY
+ fi
+}
set -x
+delay
config
init
doprov
diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 945eeee..d35ca48 100644
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -173,7 +173,7 @@
<jettyVersion>9.4.12.RC2</jettyVersion>
<eelf.version>1.0.0</eelf.version>
<swagger.version>1.5.19</swagger.version>
- <artifact.version>1.0.2</artifact.version>
+ <artifact.version>1.0.3</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/dbc-client/version.properties b/dbc-client/version.properties
index 895a84e..870d861 100644
--- a/dbc-client/version.properties
+++ b/dbc-client/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=2
+patch=3
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins