aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-03-14 17:19:44 -0700
committerVictor Morales <victor.morales@intel.com>2018-03-14 17:19:44 -0700
commit294a3567d7363e2cac4cb6be8cb5aac7b7b9d1f0 (patch)
tree1fe9db4b10325b7364bd936c2f7d289b263026e7 /lib
parent4d7590ed7425a94c0f87a8461548c2461d79a710 (diff)
Add DMaaP support
This change includes the creation of DMaaP scripts as well as its unit tests. The docker building image process was modified, removed the clean option. Change-Id: I941c84f82ed5c2375e62905d56145fc0e1a541a8 Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: INT-442
Diffstat (limited to 'lib')
-rwxr-xr-xlib/config/env-vars5
-rwxr-xr-xlib/dmaap49
-rwxr-xr-xlib/functions2
3 files changed, 55 insertions, 1 deletions
diff --git a/lib/config/env-vars b/lib/config/env-vars
index 7712de8..65d6629 100755
--- a/lib/config/env-vars
+++ b/lib/config/env-vars
@@ -9,6 +9,7 @@ src_folders=(
["appc"]="$git_src_folder/appc"
["ccsdk"]="$git_src_folder/ccsdk"
["dcae"]="$git_src_folder/dcae"
+["dmaap"]="$git_src_folder/dmaap"
["mr"]="$git_src_folder/dcae/message-router"
["msb"]="$git_src_folder/msb"
["mso"]="$git_src_folder/mso"
@@ -46,6 +47,10 @@ dcae/demo/startup dcae/demo/startup/aaf dcae/demo/startup/controller \
dcae/demo/startup/message-router dcae/dmaapbc dcae/operation \
dcae/operation/utils dcae/orch-dispatcher dcae/pgaas dcae/utils \
dcae/utils/buildtools"
+["dmaap"]="dmaap dmaap/buscontroller dmaap/datarouter dmaap/dbcapi \
+dmaap/messagerouter dmaap/messagerouter/dmaapclient \
+dmaap/messagerouter/messageservice dmaap/messagerouter/mirroragent \
+dmaap/messagerouter/msgrtr"
["msb"]="msb/apigateway msb/discovery msb/java-sdk msb/swagger-sdk"
["mso"]="mso mso/chef-repo mso/docker-config mso/libs mso/mso-config"
["multicloud"]="multicloud multicloud/framework multicloud/openstack \
diff --git a/lib/dmaap b/lib/dmaap
new file mode 100755
index 0000000..cd2e244
--- /dev/null
+++ b/lib/dmaap
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+source /var/onap/functions
+
+# _build_dmaap_images() - Build DMaaP Docker images from source code
+function _build_dmaap_images {
+ if [[ "$compile_repo" != "True" ]]; then
+ compile_repos "dmaap"
+ fi
+ for project in buscontroller datarouter/datarouter-node datarouter/datarouter-prov messagerouter/messageservice; do
+ build_docker_image ${src_folders[dmaap]}/$project
+ done
+}
+
+# get_dmaap_images() - Get DMaaP Docker images
+function get_dmaap_images {
+ if [[ "$build_image" == "True" ]]; then
+ _build_dmaap_images
+ else
+ for image in dmaap-mr datarouter-prov datarouter-node buscontroller; do
+ pull_onap_image dmaap/$image
+ done
+ fi
+}
+
+# install_dmaap() - Install DMaaP services
+function install_dmaap {
+ cp ${src_folders[dmaap]}/messagerouter//messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/
+ sed -i "s|config.zk.servers=<zookeeper_host>|config.zk.servers=172.18.0.3|g" /var/tmp/MsgRtrApi.properties
+ sed -i "s|kafka.metadata.broker.list=<kafka_host>:<kafka_port>|kafka.metadata.broker.list=172.18.0.2:9092|g" /var/tmp/MsgRtrApi.properties
+ run_docker_compose ${src_folders[dmaap]}/messagerouter/messageservice/src/main/resources/docker-compose/
+ run_docker_compose ${src_folders[dmaap]}/datarouter/datarouter-prov/src/main/resources/docker-compose/
+}
+
+# init_dmaap() - Function that initialize DMaaP service
+function init_dmaap {
+ if [[ "$clone_repo" == "True" ]]; then
+ clone_repos "dmaap"
+ if [[ "$compile_repo" == "True" ]]; then
+ compile_repos "dmaap"
+ fi
+ fi
+ if [[ "$skip_get_images" == "False" ]]; then
+ get_dmaap_images
+ fi
+ if [[ "$skip_install" == "False" ]]; then
+ install_dmaap
+ fi
+}
diff --git a/lib/functions b/lib/functions
index f40761f..08e5655 100755
--- a/lib/functions
+++ b/lib/functions
@@ -378,7 +378,7 @@ function build_docker_image {
install_maven
# Cleanup external repo
sed -i 's|${docker.push.registry}/||g' pom.xml
- local docker_build="mvn clean package docker:build -DskipTests=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true"
+ local docker_build="mvn package docker:build -DskipTests=true -Dmaven.test.skip=true -Dmaven.javadoc.skip=true"
if [ $profile ]; then
docker_build+=" -P $profile"
fi