From d418dd43e7812ea2cdebf188bf5ab51a997df90c Mon Sep 17 00:00:00 2001
From: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Date: Thu, 21 Mar 2019 09:10:11 +0100
Subject: Include basic configuration in Docker image

Makes the collector start out of the box, even without valid CBS
configuration.

Note: the basic configuration will need to be changed later.

Issue-ID: DCAEGEN2-1340
Change-Id: I3c2b502f253677e78a4f4990002e683613b8869e
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
---
 sources/hv-collector-main/Dockerfile               |  5 +++-
 .../hv-collector-main/src/main/docker/base.json    | 27 ++++++++++++++++++++++
 sources/hv-collector-main/src/main/docker/entry.sh | 20 ++++++++++++++++
 .../src/main/docker/healthcheck.sh                 |  4 ++++
 .../hv-collector-main/src/main/scripts/entry.sh    | 20 ----------------
 .../src/main/scripts/healthcheck.sh                |  4 ----
 6 files changed, 55 insertions(+), 25 deletions(-)
 create mode 100644 sources/hv-collector-main/src/main/docker/base.json
 create mode 100755 sources/hv-collector-main/src/main/docker/entry.sh
 create mode 100755 sources/hv-collector-main/src/main/docker/healthcheck.sh
 delete mode 100755 sources/hv-collector-main/src/main/scripts/entry.sh
 delete mode 100755 sources/hv-collector-main/src/main/scripts/healthcheck.sh

(limited to 'sources/hv-collector-main')

diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile
index 3322059c..a1e89a73 100644
--- a/sources/hv-collector-main/Dockerfile
+++ b/sources/hv-collector-main/Dockerfile
@@ -12,8 +12,11 @@ RUN apt-get update \
 WORKDIR /opt/ves-hv-collector
 
 ENTRYPOINT ["./entry.sh"]
+CMD ["--configuration-file /etc/ves-hv/configuration/base.json"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./
-COPY src/main/scripts/*.sh ./
+COPY src/main/docker/*.sh ./
+COPY src/main/docker/base.json /etc/ves-hv/configuration/base.json
+
 COPY target/hv-collector-main-*.jar ./
diff --git a/sources/hv-collector-main/src/main/docker/base.json b/sources/hv-collector-main/src/main/docker/base.json
new file mode 100644
index 00000000..7f88cb6e
--- /dev/null
+++ b/sources/hv-collector-main/src/main/docker/base.json
@@ -0,0 +1,27 @@
+{
+  "logLevel": "INFO",
+  "server": {
+    "listenPort": 6061,
+    "idleTimeoutSec": 60,
+    "maxPayloadSizeBytes": 1048576
+  },
+  "cbs": {
+    "firstRequestDelaySec": 10,
+    "requestIntervalSec": 5
+  },
+  "security": {
+  },
+  "collector": {
+    "dummyMode": false,
+    "maxRequestSizeBytes": 1048576,
+    "kafkaServers": [
+      "message-router-kafka:9092"
+    ],
+    "routing": [
+      {
+        "fromDomain": "perf3gpp",
+        "toTopic": "HV_VES_PERF3GPP"
+      }
+    ]
+  }
+}
diff --git a/sources/hv-collector-main/src/main/docker/entry.sh b/sources/hv-collector-main/src/main/docker/entry.sh
new file mode 100755
index 00000000..a612e393
--- /dev/null
+++ b/sources/hv-collector-main/src/main/docker/entry.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+pid=-1
+
+function handle_sigterm() {
+  if [[ ${pid} -ge 0 ]]; then
+    echo "Caught SIGTERM signal. Redirecting to process with pid=${pid}"
+    kill -TERM "${pid}"
+    wait ${pid}
+  fi
+  exit 143 # 128 + 15 -- SIGTERM
+}
+trap "handle_sigterm" SIGTERM
+
+java ${JAVA_OPTS:-} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt $@ &
+pid=$!
+echo "Service started with pid=${pid}"
+wait ${pid}
diff --git a/sources/hv-collector-main/src/main/docker/healthcheck.sh b/sources/hv-collector-main/src/main/docker/healthcheck.sh
new file mode 100755
index 00000000..db62eece
--- /dev/null
+++ b/sources/hv-collector-main/src/main/docker/healthcheck.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+curl -f http://localhost:${VESHV_HEALTH_CHECK_API_PORT:-6060}/health/ready || exit 1
+nc -vz localhost ${VESHV_LISTEN_PORT:-6061} || exit 2
diff --git a/sources/hv-collector-main/src/main/scripts/entry.sh b/sources/hv-collector-main/src/main/scripts/entry.sh
deleted file mode 100755
index a612e393..00000000
--- a/sources/hv-collector-main/src/main/scripts/entry.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-pid=-1
-
-function handle_sigterm() {
-  if [[ ${pid} -ge 0 ]]; then
-    echo "Caught SIGTERM signal. Redirecting to process with pid=${pid}"
-    kill -TERM "${pid}"
-    wait ${pid}
-  fi
-  exit 143 # 128 + 15 -- SIGTERM
-}
-trap "handle_sigterm" SIGTERM
-
-java ${JAVA_OPTS:-} -cp '*:' org.onap.dcae.collectors.veshv.main.MainKt $@ &
-pid=$!
-echo "Service started with pid=${pid}"
-wait ${pid}
diff --git a/sources/hv-collector-main/src/main/scripts/healthcheck.sh b/sources/hv-collector-main/src/main/scripts/healthcheck.sh
deleted file mode 100755
index db62eece..00000000
--- a/sources/hv-collector-main/src/main/scripts/healthcheck.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-curl -f http://localhost:${VESHV_HEALTH_CHECK_API_PORT:-6060}/health/ready || exit 1
-nc -vz localhost ${VESHV_LISTEN_PORT:-6061} || exit 2
-- 
cgit 1.2.3-korg