diff options
Diffstat (limited to 'scripts/dcaegen2-collectors-datafile')
5 files changed, 47 insertions, 25 deletions
diff --git a/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh b/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh index 03919343..0e7c34ea 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-containers-clean.sh @@ -1,11 +1,15 @@ #!/bin/bash - # Kill dfc and all simulator -docker kill dfc_app -docker kill dfc_dr-sim -docker kill dfc_dr-redir-sim -docker kill dfc_mr-sim -docker kill dfc_sftp-server -docker kill dfc_ftpes-server-vsftpd +running_containers=$(docker ps --filter name=dfc_ -q) + + +if [ -z "$running_containers" ] +then + echo "No container requires termination" +else + echo "Stopping and removing containers" + docker stop $running_containers + docker rm $running_containers +fi diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh index 39f2d0d7..491b6405 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-kill.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker kill dfc_app
\ No newline at end of file +docker kill dfc_app0
\ No newline at end of file diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh index 8478bcb0..c79467a4 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-restart.sh @@ -1,10 +1,10 @@ #!/bin/bash -#Restart DFC app +#Restart DFC app -docker restart dfc_app +docker restart dfc_app0 -DFC_APP="$(docker ps -q --filter='name=dfc_app')" +DFC_APP="$(docker ps -q --filter='name=dfc_app0')" #Wait for initialization of docker container for dfc app diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh index 4bec4ff8..c63eaf68 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh @@ -1,20 +1,25 @@ #!/bin/bash -#Start DFC app +set -x -docker-compose up -d +#Start DFC app -DFC_APP="$(docker ps -q --filter='name=dfc_app')" +DOCKER_SIM_NWNAME="dfcnet" +echo "Creating docker network $DOCKER_SIM_NWNAME, if needed" +docker network ls| grep $DOCKER_SIM_NWNAME > /dev/null || docker network create $DOCKER_SIM_NWNAME + +docker-compose up -d + +DFC_APP="$(docker ps -q --filter='name=dfc_app0')" #Wait for initialization of docker containers for dfc app and all simulators for i in {1..10}; do -if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ] - then - echo "DFC app Running" - break - else - echo sleep $i - sleep $i - fi + if [ $(docker inspect --format '{{ .State.Running }}' $DFC_APP) ] + then + echo "DFC app Running" + break + else + echo sleep $i + sleep $i + fi done - diff --git a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml index 28dfbbf8..9e15ccf0 100644 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/docker-compose.yml @@ -1,9 +1,22 @@ version: '2' +networks: + dfcnet: + external: + name: dfcnet services: dfc: - network_mode: "host" + #image fron Nexus image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest - container_name: dfc_app + #local image for test purposes + #image: org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest + container_name: dfc_app0 ports: - "8100:8100" - "8433:8433" + networks: + dfcnet: null + environment: + CONSUL_HOST: "consul-server" + CONSUL_PORT: 8500 + CONFIG_BINDING_SERVICE: "config-binding-service" + HOSTNAME: "dfc_app0" |