diff options
| author |   Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com> | 2021-09-03 15:07:42 +0200 |
|---|---|---|
| committer | Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com> | 2021-09-08 14:42:05 +0200 |
| commit | 532cd635c7ad5561657b2a64d423aad611969b66 (patch) | |
| tree | ed780fcbf6e11c4fc63387becb0cd0d071970c6e /plans/dcaegen2-collectors-datafile | |
| parent | b4100cb27697b764aead482c50bd3fdef90fb5ee (diff) | |
Update DFC tests to use file based conifg
To remove Consul/CBS dependency in DCAE DFC was updated
to use file based configuration
CSIT updates:
- file based config use in DFC
- removal of Consul/CBS from DFC tests
Issue-ID: DCAEGEN2-2692
Signed-off-by: Piotr Marcinkiewicz <piotr.marcinkiewicz@nokia.com>
Change-Id: I9d84559f3650fc8554c317ae8eab09c76662de09
Diffstat (limited to 'plans/dcaegen2-collectors-datafile')
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh | 3 | ||||
| -rw-r--r-- | plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh index e85c0eea..2dc7e945 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/setup.sh @@ -22,6 +22,9 @@ else echo "Using SIM_ROOT from environmental variable: " $SIM_ROOT fi +#Prepare DFC config volume +mkdir $SIM_ROOT/simulator-group/dfc_config_volume || true + #Location of the above simulators when run as a group. For start+config and stop. SIMGROUP_ROOT=$SIM_ROOT/simulator-group diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh index 81d85fe5..c05f3561 100644 --- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh +++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh @@ -5,6 +5,8 @@ running_images=$(docker images -q) docker exec dfc_app0 cat /var/log/ONAP/application.log >> $WORKSPACE/archives/dfc_app0_application.log docker logs dfc_mr-sim >> $WORKSPACE/archives/dfc_mr-sim.log +rm -rf $SIM_ROOT/simulator-group/dfc_config_volume || true + if [ -z "$running_containers" ] then echo "No container requires termination" |