diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-03-28 18:14:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-28 18:14:11 +0000 |
| commit | 2201af3921058d168581b2a0d9c8ce276efecde6 (patch) | |
| tree | 8d342e9010ab8861430564f4b255aa92a83d54de /plans/dcaegen2-collectors-datafile/ManagementInterface-suite | |
| parent | 975f3eb217d02e2a4c92a7a3173c39c8dd92353f (diff) | |
| parent | d3104ef51614e203cb87b78ef254fb106ab467bd (diff) | |
Merge "Added functional CSIT tests for DFC"
Diffstat (limited to 'plans/dcaegen2-collectors-datafile/ManagementInterface-suite')
3 files changed, 4 insertions, 25 deletions
diff --git a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/docker-compose.yml b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/docker-compose.yml deleted file mode 100644 index b95842ba..00000000 --- a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/docker-compose.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '2' -services: - dfc: - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest - container_name: dfc - ports: - - "8100:8100" - - "8433:8433" diff --git a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/setup.sh b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/setup.sh index af24717a..8f50d00b 100644 --- a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/setup.sh +++ b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/setup.sh @@ -1,21 +1,8 @@ #!/usr/bin/env bash -docker-compose up -d - - -DFC=$(docker ps -a -q --filter="name=dfc") - -# Wait for initialization of Docker contaienr for DFC -for i in {1..10}; do -if [ $(docker inspect --format '{{ .State.Running }}' $DFC) ] -then - echo "DFC Container Running" - break -else - echo sleep $i - sleep $i -fi -done +DFC_ROOT=$WORKSPACE/scripts/dcaegen2-collectors-datafile/dfc-management +cd $DFC_ROOT +source dfc-start.sh #Wait for initialization of the DFC service for i in {1..10}; do diff --git a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh index bb0ac923..97ef4037 100644 --- a/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh +++ b/plans/dcaegen2-collectors-datafile/ManagementInterface-suite/teardown.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -kill-instance.sh dfc
\ No newline at end of file +kill-instance.sh dfc_app
\ No newline at end of file |