From d3104ef51614e203cb87b78ef254fb106ab467bd Mon Sep 17 00:00:00 2001
From: BjornMagnussonXA <bjorn.magnusson@est.tech>
Date: Tue, 26 Mar 2019 12:48:46 +0000
Subject: Added functional CSIT tests for DFC

New test case for single file download and publish
Minor refactoring of Management interface test

Issue-ID: DCAEGEN2-1313
Change-Id: I2436db42a5884a7d828dbefcf9678aa9cdf064e3
Signed-off-by: BjornMagnussonXA <bjorn.magnusson@est.tech>
---
 .../ManagementInterface-suite/docker-compose.yml      |  8 --------
 .../ManagementInterface-suite/setup.sh                | 19 +++----------------
 .../ManagementInterface-suite/teardown.sh             |  2 +-
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 plans/dcaegen2-collectors-datafile/ManagementInterface-suite/docker-compose.yml

(limited to 'plans/dcaegen2-collectors-datafile/ManagementInterface-suite')

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
-- 
cgit 1.2.3-korg