Seperating usecase test suite dependencies

  # Refactoring BulkPM Dataplane test suite

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4b2ad0dc5147e10ffc55f4ec210a29f073cd865b
Issue-ID: INT-832
Signed-off-by: efiacor <fiachra.corcoran@est.tech>

15 files changed, 0 insertions, 604 deletions

diff --git a/plans/usecases/5G-bulkpm/README.txt b/plans/usecases/5G-bulkpm/README.txt
deleted file mode 100644
index 5bc82a24..00000000
--- a/plans/usecases/5G-bulkpm/README.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-###################################################################################################################
-By executing the below commands it will change the CSIT test from executing on a docker envirnoment to an ONAP one.
-###################################################################################################################
-
-1) Login to an ONAP instance, switch user and verify that the command kubectl executes before proceeding .
-# sudo -s
-# kubectl get svc -n onap| grep dcae
-
-2) Clone the csit repositry 
-# git clone https://gerrit.onap.org/r/integration/csit
-
-3) Install docker-compose 
-# sudo apt-get update
-# sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
-# sudo chmod +x /usr/local/bin/docker-compose
-# docker-compose --version    
-
-4) Install the packages required for the RobotFramework.		
-# apt install python-pip
-# sudo apt install python-pip virtualenv unzip sshuttle netcat libffi-dev libssl-dev
-# sudo pip install robotframework
-# sudo pip install -U requests
-# sudo pip install -U robotframework-requests
-
-5) Expose the Ves-collector
-# kubectl expose svc dcae-ves-collector --type=LoadBalancer --name=vesc -n onap
-	service "vesc" exposed
-
-6) Verify the Ves-collector is exposed
-# kubectl get svc -n onap | grep vesc
-	vesc	LoadBalancer   10.43.203.47    10.209.63.55	8080:31835/TCP		1m
-
-7) Modify the file setup.sh and make the below change
-# cd csit
-# vi plans/usecases/5G-bulkpm/setup.sh 
-CSIT=TRUE
- to
-CSIT=FALSE
-
-8) Excute the Bulk PM e2e csit.
-# ./run-csit.sh plans/usecases/5G-bulkpm/
-
---> Troubleshooting
---------------------
-If the Test case "Verify Default Feed And File Consumer Subscription On Datarouter" is hanging, quit the test and execute the below
-Get the DR-PROV IP address  
-# kubectl -n onap -o=wide get pods | grep dmaap-dr-prov | awk '{print $6}'
- 10.42.123.76
-Make sure there are no feeds
-# curl -k https://10.42.123.76:8443/internal/prov
-
-If there are feeds delete them
-curl -X DELETE -H "Content-Type:application/vnd.att-dr.subscription" -H "X-ATT-DR-ON-BEHALF-OF:dradmin" -k https://10.42.123.76:8443/subs/XX
-
-Where XX is the number of the feeds in the previous command.
diff --git a/plans/usecases/5G-bulkpm/assets/addSubscriber.json b/plans/usecases/5G-bulkpm/assets/addSubscriber.json
deleted file mode 100644
index bab63c4d..00000000
--- a/plans/usecases/5G-bulkpm/assets/addSubscriber.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "delivery":{
-       "url":"http://fileconsumer:7070",
-       "user":"LOGIN",
-       "password":"PASSWORD",
-       "use100":true
-    },
-    "follow_redirect":false,
-    "metadataOnly":false,
-    "suspend":false,
-    "groupid":0,
-    "links":{
-       "self": "https://dmaap-dr-prov/subscribe/1",
-       "log": "https://dmaap-dr-prov/feedlog/1",
-       "feed": "https://dmaap-dr-prov/feed/1"
-    },
-    "subscriber":"admin",
-    "decompress":true
- }
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/assets/application.yaml b/plans/usecases/5G-bulkpm/assets/application.yaml
deleted file mode 100644
index 086babc4..00000000
--- a/plans/usecases/5G-bulkpm/assets/application.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-spring:
-  profiles:
-    active: prod
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "loggers,logfile,health,info,metrics"
-server:
-  port: 8433
-  ssl:
-    key-store-type: PKCS12
-    key-store-password: ericssondfc
-    key-store: classpath:keystore.jks
-    key-password: ericssondfc
-    keyAlias: tomcat-localhost
-logging:
-  level:
-    ROOT: ERROR
-    org.springframework: ERROR
-    org.springframework.data: ERROR
-    org.springframework.web.reactive.function.client.ExchangeFunctions: ERROR
-    org.onap.dcaegen2.collectors.datafile: TRACE
-  file: /var/log/ONAP/application.log
-app:
-  filepath: /opt/app/datafile/config/datafile_endpoints.json
diff --git a/plans/usecases/5G-bulkpm/assets/config.json b/plans/usecases/5G-bulkpm/assets/config.json
deleted file mode 100644
index 7d2d64ef..00000000
--- a/plans/usecases/5G-bulkpm/assets/config.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "pm-mapper-filter": { "filters":[]},
-  "key_store_path": "/opt/app/pm-mapper/etc/cert.jks",
-  "key_store_pass_path": "/opt/app/pm-mapper/etc/jks.pass",
-  "trust_store_path": "/opt/app/pm-mapper/etc/trust.jks",
-  "trust_store_pass_path": "/opt/app/pm-mapper/etc/trust.pass",
-  "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete",
-  "dmaap_dr_feed_name": "1",
-  "aaf_identity": "aaf_admin@people.osaaf.org",
-  "aaf_password": "demo123456!",
-  "enable_http": true,
-  "streams_publishes": {
-    "dmaap_publisher": {
-      "type": "message_router",
-      "dmaap_info": {
-        "topic_url": "http://message-router:3904/events/org.onap.dmaap.mr.VES_PM",
-        "client_role": "org.onap.dcae.pmPublisher",
-        "location": "csit-pmmapper",
-        "client_id": "1562763644939"
-      }
-    }
-  },
-  "streams_subscribes": {
-    "dmaap_subscriber": {
-      "type": "data_router",
-      "dmaap_info": {
-        "username": "username",
-        "password": "password",
-        "location": "csit-pmmapper",
-        "delivery_url": "http://dcae-pm-mapper:8081/delivery",
-        "subscriber_id": 1
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/assets/createFeed.json b/plans/usecases/5G-bulkpm/assets/createFeed.json
deleted file mode 100644
index fdcc7eef..00000000
--- a/plans/usecases/5G-bulkpm/assets/createFeed.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "DefaultFeed",
-    "version": "m1.0",
-    "description": "Default feed",
-    "business_description": "Default Feed",
-    "suspend": false,
-    "deleted": false,
-    "changeowner": true,
-    "authorization": {
-      "classification": "unclassified",
-      "endpoint_addrs": [],
-      "endpoint_ids": [
-        {
-          "password": "dradmin",
-          "id": "dradmin"
-        }]
-    }
-  }
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json b/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
deleted file mode 100644
index cbb7cd53..00000000
--- a/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "config": {
-    "//description": "This file is only used for testing purposes",
-    "dmaap.ftpesConfig.keyCert": "/opt/app/datafile/etc/cert/cert.jks",
-    "dmaap.ftpesConfig.keyPasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-    "dmaap.ftpesConfig.trustedCa": "/opt/app/datafile/etc/cert/trust.jks",
-    "dmaap.ftpesConfig.trustedCaPasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-    "dmaap.security.trustStorePath": "/opt/app/datafile/etc/cert/trust.jks",
-    "dmaap.security.trustStorePasswordPath": "/opt/app/datafile/etc/cert/trust.pass",
-    "dmaap.security.keyStorePath": "/opt/app/datafile/etc/cert/cert.jks",
-    "dmaap.security.keyStorePasswordPath": "/opt/app/datafile/etc/cert/jks.pass",
-    "dmaap.security.enableDmaapCertAuth": "false",
-    "streams_publishes": {
-      "PM_MEAS_FILES": {
-        "type": "data_router",
-        "dmaap_info": {
-          "username": "dradmin",
-          "location": "san-francisco",
-          "log_url": "https://dmaapdrhost:8443/feedlog/1",
-          "publisher_id": "972.360gm",
-          "password": "dradmin",
-          "publish_url": "https://dmaapdrhost:8443/publish/1"
-        }
-      }
-    },
-    "streams_subscribes": {
-      "dmaap_subscriber": {
-        "dmaap_info": {
-             "topic_url":"http://dradmin:dradmin@dmaapmrhost:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/OpenDcae-c12/C12"
-        },
-        "type": "message_router"
-      }
-    }
-  }
-}
diff --git a/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz b/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz
deleted file mode 100644
index 2f527c27..00000000
--- a/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz
+++ /dev/null
diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml
deleted file mode 100644
index aae77f71..00000000
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-dfc.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '2.1'
-services:
-  dfc:
-    container_name: dfc
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
-    ports:
-      - "8433:8433"
-    environment:
-       CONSUL_HOST: CONSUL_IP
-       CONSUL_PORT: 8500
-    extra_hosts:
-      - "dmaap-dr-node:DR_NODE_IP"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
deleted file mode 100644
index 35340551..00000000
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-version: '2.1'
-services:
-  datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:latest
-    container_name: datarouter-prov
-    hostname: dmaap-dr-prov
-    ports:
-     - "443:8443"
-     - "8443:8443"
-     - "8080:8080"
-    volumes:
-     - ../prov_data/provserver.properties:/opt/app/datartr/etc/provserver.properties
-     - ../prov_data/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-     - ../prov_data/addFeed3.txt:/opt/app/datartr/addFeed3.txt
-    depends_on:
-      mariadb_container:
-        condition: service_healthy
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-    extra_hosts:
-      - "dmaap-dr-node:1.1.1.1"
-      - "dcae-pm-mapper:3.3.3.3"
-
-  datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:latest
-    container_name: datarouter-node
-    hostname: dmaap-dr-node
-    ports:
-     - "9443:8443"
-     - "9090:8080"
-    volumes:
-     - ../node_data/node.properties:/opt/app/datartr/etc/node.properties
-    depends_on:
-      datarouter-prov:
-        condition: service_healthy
-    extra_hosts:
-      - "dmaap-dr-prov:2.2.2.2"
-      - "dcae-pm-mapper:3.3.3.3"
-
-  datarouter-subscriber:
-      image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:latest
-      container_name: fileconsumer-node
-      hostname: subscriber.com
-      ports:
-       - "7070:7070"
-      volumes:
-       - ../subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
-
-  mariadb_container:
-    image: mariadb:10.2.14
-    container_name: mariadb
-    ports:
-      - "3306:3306"
-    environment:
-      MYSQL_ROOT_PASSWORD: datarouter
-      MYSQL_DATABASE: datarouter
-      MYSQL_USER: datarouter
-      MYSQL_PASSWORD: datarouter
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "--silent"]
-      interval: 10s
-      timeout: 30s
-      retries: 5
-
-  sftp:
-    container_name: sftp
-    image: atmoz/sftp
-    ports:
-      - "2222:22"
-    volumes:
-      - /host/upload:/home/admin
-    command: admin:admin:1001
-
-  ves:
-    container_name: vescollector
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.4.4
-    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:5.5.5.5"
-
-  consul:
-    container_name: consul
-    image: nexus3.onap.org:10001/consul:latest
-
-  cbs:
-    container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
-    environment:
-       CONSUL_HOST:
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml b/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
deleted file mode 100644
index fb999ce3..00000000
--- a/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '2.1'
-services:
-  pmmapper:
-    container_name: pmmapper
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
-    ports:
-      - "8081:8081"
-    environment:
-      CONFIG_BINDING_SERVICE_SERVICE_HOST: CBSIP
-      CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
-      HOSTNAME: pmmapper
-    extra_hosts:
-      - "dmaap-dr-node:1.1.1.1"
-      - "message-router:4.4.4.4"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/composefile/onap.docker-compose-e2e b/plans/usecases/5G-bulkpm/composefile/onap.docker-compose-e2e
deleted file mode 100644
index 1c05ca5b..00000000
--- a/plans/usecases/5G-bulkpm/composefile/onap.docker-compose-e2e
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '2.1'
-services:
-  datarouter-subscriber:
-      image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:2.0.0-SNAPSHOT
-      container_name: fileconsumer-node
-      hostname: subscriber.com
-      ports:
-       - "7070:7070"
-      volumes:
-       - ../subscriber_data/subscriber.properties:/opt/app/subscriber/etc/subscriber.properties
-
-  sftp:
-    container_name: sftp
-    image: atmoz/sftp
-    ports:
-      - "2222:22"
-    volumes:
-      - /host/upload:/home/admin
-    command: admin:admin:1001
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/onap.teardown.sh b/plans/usecases/5G-bulkpm/onap.teardown.sh
deleted file mode 100644
index 966be45d..00000000
--- a/plans/usecases/5G-bulkpm/onap.teardown.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-echo "Starting teardown script"
-DFC_POD=$(kubectl -n onap get pods | grep datafile-collector | awk '{print $1}')
-kubectl -n onap exec $DFC_POD -it  cat /opt/log/application.log > /tmp/dfc_docker.log
-cat /tmp/dfc_docker.log
-sleep 3
-kill-instance.sh fileconsumer-node
-kill-instance.sh sftp
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh
deleted file mode 100644
index e0d7b801..00000000
--- a/plans/usecases/5G-bulkpm/setup.sh
+++ /dev/null
@@ -1,239 +0,0 @@
-#!/bin/bash
-# Place the scripts in run order:
-source ${SCRIPTS}/common_functions.sh
-SFTP_PORT=22
-VESC_PORT=8080
-export VESC_PORT=${VESC_PORT}
-export CLI_EXEC_CLI_DFC="docker exec dfc /bin/sh -c \"ls /target | grep .gz\""
-
-# Clone DMaaP Message Router repo
-mkdir -p $WORKSPACE/archives/dmaapmr
-cd $WORKSPACE/archives/dmaapmr
-git clone --depth 1 http://gerrit.onap.org/r/dmaap/messagerouter/messageservice -b master
-sed -i 's/enableCadi: false/enableCadi: "false"/g' /$WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose/docker-compose.yml
-cd $WORKSPACE/archives/dmaapmr/messageservice/src/main/resources/docker-compose
-cp $WORKSPACE/archives/dmaapmr/messageservice/bundleconfig-local/etc/appprops/MsgRtrApi.properties /var/tmp/
-
-# start DMaaP MR containers with docker compose and configuration from docker-compose.yml
-docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
-
-ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1")
-KAFKA=$(docker ps -a -q --filter="name=kafka_1")
-DMAAP=$(docker ps -a -q --filter="name=dmaap_1")
-
-# Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper
-for i in {1..10}; do
-if [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \
-[ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ]
-then
-   echo "DMaaP Service Running"
-   break
-else
-   echo sleep $i
-   sleep $i
-fi
-done
-
-# Get IP address of DMAAP, KAFKA, Zookeeper
-KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA)
-ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER)
-DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
-
-sleep 2
-# Shutdown DMAAP Container
-docker kill $DMAAP
-
-# Initial docker-compose up and down is for populating kafka and zookeeper IPs in /var/tmp/MsgRtrApi.properites
-sed -i -e '/config.zk.servers=/ s/=.*/='$ZOOKEEPER_IP'/' /var/tmp/MsgRtrApi.properties
-sed -i -e '/kafka.metadata.broker.list=/ s/=.*/='$KAFKA_IP':9092/' /var/tmp/MsgRtrApi.properties
-
-# Start DMaaP MR containers with docker compose and configuration from docker-compose.yml
-docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
-sleep 5
-
-# Clone DMaaP Data Router repo
-mkdir -p $WORKSPACE/archives/dmaapdr
-cd $WORKSPACE/archives/dmaapdr
-git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources
-mkdir docker-compose
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
-cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml
-
-docker login -u docker -p docker nexus3.onap.org:10001
-docker-compose up -d
-echo "Disregard the message ERROR: for datarouter-node  Container 1234456 is unhealthy, this is expected behaiour at this stage"
-docker kill vescollector
-docker kill cbs
-sleep 10
-CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul )
-sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml
-HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $7}')
-DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
-sed -i -e '/DMAAPHOST:/ s/:.*/: '$DMAAP_MR_IP'/' docker-compose.yml
-MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb )
-sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties
-docker-compose up -d
-sleep 5
-# Get IP address of datarrouger-prov, datarouter-node, fileconsumer-node.
-DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov)
-DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
-DR_SUBSCIBER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' fileconsumer-node)
-DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
-
-echo DR_PROV_IP=${DR_PROV_IP}
-echo DR_NODE_IP=${DR_NODE_IP}
-echo DR_GATEWAY_IP=${DR_GATEWAY_IP}
-echo DR_SUBSCIBER_IP=${DR_SUBSCIBER_IP}
-
-docker kill datarouter-node
-docker kill datarouter-prov
-sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml
-docker-compose up -d
-
-# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb
-for i in {1..10}; do
-    if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mariadb) ]
-    then
-        echo "DR Service Running"
-        break
-    else
-        echo sleep $i
-        sleep $i
-    fi
-done
-
-sleep 5
-
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_GATEWAY_IP"
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$DR_GATEWAY_IP"
-docker exec datarouter-node /bin/sh -c "echo '${DR_SUBSCIBER_IP}' dmaap-dr-subscriber >> /etc/hosts"
-
-
-# Get IP address of DMAAP, KAFKA, Zookeeper
-DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
-KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA)
-ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER)
-VESC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vescollector)
-SFTP_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sftp)
-
-export VESC_IP=${VESC_IP}
-export HOST_IP=${HOST_IP}
-export DMAAP_MR_IP=${DMAAP_MR_IP}
-
-
-# Data File Collector configuration :
-sed -i 's/5.5.5.5/'$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/
-docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/application.yaml dfc:/opt/app/datafile/config/
-#Increase Logging
-#docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WARN/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
-for i in {1..10}; do
-    if  [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' cbs) ]
-    then
-        echo "Data Router, Consul, Config Binding Service Services Running"
-        break
-    else
-        echo sleep $i
-        sleep $i
-    fi
-done
-sleep 10
-
-pip install jsonschema uuid simplejson
-# Wait container ready
-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
-sed -i 's/sftpport/'${SFTP_PORT}'/g' $WORKSPACE/tests/usecases/5G-bulkpm/assets/json_events/FileExistNotificationUpdated.json
-docker cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/xNF.pm.xml.gz sftp:/home/admin/
-docker cp $WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml.gz sftp:/home/admin/
-
-# Data Router Configuration:
-# Create default feed and create file consumer subscriber on data router
-curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:dradmin" --data-ascii @$WORKSPACE/plans/usecases/5G-bulkpm/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
-cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/addSubscriber.json /tmp/addSubscriber.json
-sed -i 's/fileconsumer/'${DR_SUBSCIBER_IP}'/g' /tmp/addSubscriber.json
-curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:dradmin" --data-ascii @/tmp/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
-sleep 10
-curl -k https://$DR_PROV_IP:8443/internal/prov
-
-# Consul Configuration for PM Mapper
-cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json /tmp/cbs.json
-sed -i 's/ipaddress/'${CBS_IP}'/g' /tmp/cbs.json
-curl --request PUT --data @/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register
-curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/usecases/5G-bulkpm/assets/config.json
-
-# PM Mapper startup and configuration
-mkdir /tmp/docker-compose
-cd /tmp/docker-compose
-cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml
-CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs)
-sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml
-sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/4.4.4.4/'$MARIADB'/g' docker-compose.yml
-docker-compose up -d
-
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose
-PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
-docker kill datarouter-node
-docker kill datarouter-prov
-sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml
-sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml
-sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml
-docker-compose up -d
-
-# Setting up PM Mapper certs.
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks pmmapper:opt/app/pm-mapper/etc/
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass pmmapper:opt/app/pm-mapper/etc/
-docker restart pmmapper
-sleep 5
-
-# Simulation setup for Message Router
-docker cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js mariadb:/
-docker exec mariadb /bin/bash -c "apt update"
-sleep 2
-docker exec mariadb /bin/bash -c "apt install nodejs -y"
-sleep 10
-docker exec mariadb /bin/bash -c "nodejs mrserver.js &" &
-
-# Create PM Mapper feed and create PM Mapper subscriber on data router
-#curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443
-curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
-
-# Create PM Mapper tocic in Message Router
-PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper)
-docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log
-cat /tmp/pmmapper.log
-docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
-sleep 10
-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 SFTP_IP:${SFTP_IP}"
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/teardown.sh b/plans/usecases/5G-bulkpm/teardown.sh
deleted file mode 100644
index 73aaf3bd..00000000
--- a/plans/usecases/5G-bulkpm/teardown.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-echo "Starting teardown script"
-docker exec dfc /bin/sh -c "less /var/log/ONAP/application.log" > /tmp/dfc_docker.log
-echo "===== DFC LOG ========"
-cat /tmp/dfc_docker.log
-sleep 3
-echo "===== PM MAPPER LOG ========"
-cat /tmp/pmmapper_docker.log.robot
-sleep 2
-kill-instance.sh $DMAAP
-kill-instance.sh $KAFKA
-kill-instance.sh $ZOOKEEPER
-kill-instance.sh vescollector
-kill-instance.sh datarouter-node
-kill-instance.sh datarouter-prov
-kill-instance.sh fileconsumer-node
-kill-instance.sh mariadb
-kill-instance.sh dfc
-kill-instance.sh sftp
-kill-instance.sh cbs
-kill-instance.sh consul
-kill-instance.sh pmmapper
\ No newline at end of file
diff --git a/plans/usecases/5G-bulkpm/testplan.txt b/plans/usecases/5G-bulkpm/testplan.txt
deleted file mode 100644
index feeffcc7..00000000
--- a/plans/usecases/5G-bulkpm/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-usecases/5G-bulkpm