Updates for DFC and prepare for pmmapper

Change-Id: Ic6d373b54a70c28ba2f936eb265d19b52d33de60
Issue-ID: INT-832
Signed-off-by: LiamBurke <liam.burke@ericsson.com>

2 files changed, 31 insertions, 24 deletions

diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
index e1e591d7..3ee96355 100644
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
@@ -74,6 +74,14 @@ services:
     environment:
        DMAAPHOST:
 
+  dfc:
+    container_name: dfc
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
+    ports:
+      - "8433:8433"
+    extra_hosts:
+      - "dmaap-dr-node:DR_NODE_IP"
+
   consul:
     container_name: consul
     image: nexus3.onap.org:10001/consul:latest
@@ -96,4 +104,4 @@ services:
     volumes:
       - /tmp/docker-databus-controller.conf:/opt/app/config/conf
     depends_on:
-      - datarouter-prov
\ No newline at end of file
+      - datarouter-prov
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
index 658a6c1e..6f9b7591 100644
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ b/plans/usecases/5G-bulkpm/setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Place the scripts in run order:
+#Place the scripts in run order:
 source ${SCRIPTS}/common_functions.sh
 
 CSIT=TRUE
@@ -137,6 +137,25 @@ sed -i 's/DMAAPMR/'$DMAAP_MR_IP'/g' docker-compose.yml
 docker-compose up -d
 sed -i 's/DMAAPDR/'$DR_PROV_IP'/g' /tmp/docker-databus-controller.conf
 
+# Data File Collector configuration :
+sed -i 's/DR_NODE_IP/'$DR_NODE_IP'/g' docker-compose.yml
+cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
+sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json
+sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json
+echo data_endpoints.json to be copied onto the DFC containter
+cat /tmp/datafile_endpoints.json
+docker-compose up -d
+sleep 2
+# DFC is now online
+docker cp dfc:/opt/app/datafile/config/datafile_endpoints.json /tmp/datafile_endpoints.json.fromcontainer
+echo data_endpoints.json from DFC containter
+cat /tmp/datafile_endpoints.json.fromcontainer
+docker cp /tmp/datafile_endpoints.json dfc:/opt/app/datafile/config/
+#Increase Logging
+docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: ERROR/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml"
+docker restart dfc
+sleep 2
+
 # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS, Buscontroller
 for i in {1..10}; do
     if  [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
@@ -159,27 +178,6 @@ pip install jsonschema uuid
 # Wait container ready
 sleep 2
 
-# Data File Collector configuration :
-mkdir /tmp/docker-compose
-cd /tmp/docker-compose
-cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml /tmp/docker-compose/docker-compose.yml
-sed -i 's/DR_NODE_IP/'$DR_NODE_IP'/g' /tmp/docker-compose/docker-compose.yml
-cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/
-sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json
-sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json
-echo data_endpoints.json to be copied onto the DFC containter
-cat /tmp/datafile_endpoints.json
-docker-compose up -d
-sleep 2
-docker cp dfc:/opt/app/datafile/config/datafile_endpoints.json /tmp/datafile_endpoints.json.fromcontainer
-echo data_endpoints.json from DFC containter
-cat /tmp/datafile_endpoints.json.fromcontainer
-docker cp /tmp/datafile_endpoints.json dfc:/opt/app/datafile/config/
-#Increase Logging
-docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: ERROR/org.onap.dcaegen2.collectors.datafile: TRACE/g' /opt/app/datafile/config/application.yaml"
-docker restart dfc
-sleep 2
-
 # Update the File Ready Notification with actual sftp ip address and copy pm files to sftp server.
 cp $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotification.json $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
 sed -i 's/sftpserver/'${SFTP_IP}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
@@ -270,4 +268,5 @@ curl -k https://$DR_PROV_IP:8443/internal/prov
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v VESC_IP:${VESC_IP} -v VESC_PORT:${VESC_PORT} -v DR_SUBSCIBER_IP:${DR_SUBSCIBER_IP} -v DFC_POD:${DFC_POD} -v HOST_IP:${HOST_IP} "
 
-fi;
\ No newline at end of file
+fi;
+