Remove obsolete PM-Mapper CSITs

 - the tests have moved to dcaegen2/services/pm-mapper repo

Issue-ID: DCAEGEN2-2796
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I398edd1c0bfa53aaa719c3f3a380505c7366bdf7

32 files changed, 0 insertions, 1050 deletions

diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/addSubscriber.json b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/addSubscriber.json
deleted file mode 100644
index 0666a7d5..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/addSubscriber.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "delivery":{
-       "url":"http://dcae-pm-mapper:8081/delivery",
-       "user":"username",
-       "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":"pmmapper",
-    "decompress":true,
-    "privilegedSubscriber": true
- }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cbs.json b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cbs.json
deleted file mode 100644
index a29956fb..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cbs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "ID": "cbs",
-    "Name": "config_binding_service",
-    "Tags": ["cbs"],
-    "Address": "ipaddress",
-    "Port": 10000
-}
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cert.jks b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cert.jks
deleted file mode 100644
index 33dc9a31..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/cert.jks
+++ /dev/null
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/config.json
deleted file mode 100644
index 3f1009d4..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/config.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "pm-mapper-filter": { "filters":[]},
-  "key_store_path": "/opt/app/pm-mapper/etc/certs/cert.jks",
-  "key_store_pass_path": "/opt/app/pm-mapper/etc/certs/jks.pass",
-  "trust_store_path": "/opt/app/pm-mapper/etc/certs/trust.jks",
-  "trust_store_pass_path": "/opt/app/pm-mapper/etc/certs/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/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/createFeed.json b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/createFeed.json
deleted file mode 100644
index f93633dc..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/createFeed.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "PM Mapper Feed",
-    "version": "m1.0",
-    "description": "PM Mapper Feed",
-    "business_description": "PM Mapper",
-    "suspend": false,
-    "deleted": false,
-    "changeowner": true,
-    "authorization": {
-      "classification": "unclassified",
-      "endpoint_addrs": [],
-      "endpoint_ids": [
-        {
-          "password": "pmmapper",
-          "id": "pmmapper"
-        }]
-    }
-  }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/jks.pass b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/jks.pass
deleted file mode 100644
index ae8f7e72..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/jks.pass
+++ /dev/null
@@ -1 +0,0 @@
-Er1tmip;T4w[%1}YE?x{fN9v
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/mrserver.js b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/mrserver.js
deleted file mode 100644
index cc845712..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/mrserver.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var httpServer = function () {
-  var http = require('http'),
-      url = require('url'),
-      fs = require('fs'),
-
-      start = function (port) {
-        var server = http.createServer(function (req, res) {
-          processHttpRequest(res);
-        });
-        server.listen(port, function () {
-          console.log('Listening on ' + port + '...');
-        });
-      },
-
-      processHttpRequest = function (res) {
-        res.writeHead(200, {'Content-Type': 'text/plain'});
-        console.log('received message');
-        setTimeout(() => {
-          res.end('Published Successfully.\n');
-        }, 100);
-      };
-
-  return {
-    start: start
-  }
-}();
-
-httpServer.start(3904);
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/node.properties b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/node.properties
deleted file mode 100644
index 7abaf60a..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/node.properties
+++ /dev/null
@@ -1,89 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Modifications Copyright (C) 2021 Nokia Intellectual Property
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-#
-#    Configuration parameters set at startup for the DataRouter node
-#
-#    URL to retrieve dynamic configuration
-ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov
-#
-#    URL to upload PUB/DEL/EXP logs
-LogUploadURL = https://dmaap-dr-prov:8443/internal/logs
-#
-#    The port number for http as seen within the server
-IntHttpPort = 8080
-#
-#    The port number for https as seen within the server
-IntHttpsPort = 8443
-#
-#    The external port number for https taking port mapping into account
-ExtHttpsPort = 443
-#
-#    The minimum interval between fetches of the dynamic configuration from the provisioning server
-MinProvFetchInterval = 10000
-#
-#    The minimum interval between saves of the redirection data file
-MinRedirSaveInterval = 10000
-#
-#    The path to the directory where log files are stored
-LogDir = /opt/app/datartr/logs
-#
-#    The retention interval (in days) for log files
-LogRetention = 30
-#
-#    The path to the directories where data and meta data files are stored
-SpoolDir = /opt/app/datartr/spool
-#
-#    The path to the redirection data file
-RedirectionFile = etc/redirections.dat
-#
-#    The type of keystore for https
-KeyStoreType = PKCS12
-#
-#    The type of truststore for https
-TrustStoreType = jks
-#
-#    The path to the file used to trigger an orderly shutdown
-QuiesceFile = etc/SHUTDOWN
-#
-#    The key used to generate passwords for node to node transfers
-NodeAuthKey = Node123!
-#
-#    DR_NODE DEFAULT ENABLED TLS PROTOCOLS
-NodeHttpsProtocols = TLSv1.1|TLSv1.2
-#
-#    AAF type to generate permission string
-AAFType = org.onap.dmaap-dr.feed
-#
-#    AAF default instance to generate permission string - default should be legacy
-AAFInstance = legacy
-#
-#    AAF action to generate permission string - default should be publish
-AAFAction = publish
-#
-#    AAF CADI enabled flag
-CadiEnabled = false
-#
-#    AAF Props file path
-AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/provserver.properties b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/provserver.properties
deleted file mode 100644
index cd333efb..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/provserver.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Modifications Copyright (C) 2021 Nokia Intellectual Property
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-
-#Jetty Server properties
-org.onap.dmaap.datarouter.provserver.http.port           = 8080
-org.onap.dmaap.datarouter.provserver.https.port          = 8443
-org.onap.dmaap.datarouter.provserver.https.relaxation    = true
-
-org.onap.dmaap.datarouter.provserver.aafprops.path       = /opt/app/osaaf/local/org.onap.dmaap-dr.props
-
-org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs
-org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool
-org.onap.dmaap.datarouter.provserver.dbscripts           = /opt/app/datartr/etc/misc
-org.onap.dmaap.datarouter.provserver.logretention        = 30
-
-#DMAAP-597 (Tech Dept) REST request source IP auth
-# relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
-
-#Localhost address config
-org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1
-
-# Database access
-org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
-org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://datarouter-mariadb:3306/datarouter
-org.onap.dmaap.datarouter.db.login    = datarouter
-org.onap.dmaap.datarouter.db.password = datarouter
-
-# PROV - DEFAULT ENABLED TLS PROTOCOLS
-org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2
-
-# AAF config
-org.onap.dmaap.datarouter.provserver.cadi.enabled = false
-
-org.onap.dmaap.datarouter.provserver.passwordencryption   = PasswordEncryptionKey#@$%^&1234#
-org.onap.dmaap.datarouter.provserver.aaf.feed.type        = org.onap.dmaap-dr.feed
-org.onap.dmaap.datarouter.provserver.aaf.sub.type         = org.onap.dmaap-dr.sub
-org.onap.dmaap.datarouter.provserver.aaf.instance         = legacy
-org.onap.dmaap.datarouter.provserver.aaf.action.publish   = publish
-org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.jks b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.jks
deleted file mode 100644
index 679c95a5..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.jks
+++ /dev/null
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.pass b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.pass
deleted file mode 100644
index d3d01b0a..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/assets/trust.pass
+++ /dev/null
@@ -1 +0,0 @@
-583Ls;XF(qDQu3p!L22gyh1t
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/docker-compose.yml b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/docker-compose.yml
deleted file mode 100644
index 66946ea0..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/docker-compose.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-version: '3.3'
-
-services:
-  datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
-    container_name: datarouter-prov
-    hostname: dmaap-dr-prov
-    ports:
-     - "443:8443"
-     - "8443:8443"
-     - "8080:8080"
-    volumes:
-     - /var/tmp/provserver.properties:/opt/app/datartr/etc/provserver.properties
-    depends_on:
-      - mariadb
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-    networks:
-      pmmapper-network:
-        ipv4_address: $DR_PROV_IP
-    extra_hosts:
-      - "dmaap-dr-node:$DR_NODE_IP"
-      - "dcae-pm-mapper:$PMMAPPER_IP"
-
-  datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
-    container_name: datarouter-node
-    hostname: dmaap-dr-node
-    ports:
-     - "9443:8443"
-     - "9090:8080"
-    volumes:
-     - /var/tmp/node.properties:/opt/app/datartr/etc/node.properties
-    depends_on:
-      - datarouter-prov
-    networks:
-      pmmapper-network:
-        ipv4_address: $DR_NODE_IP
-    extra_hosts:
-      - "dmaap-dr-prov:$DR_PROV_IP"
-      - "dcae-pm-mapper:$PMMAPPER_IP"
-
-  node:
-    image: nexus3.onap.org:10001/node:10-slim
-    container_name: mr-simulator
-    volumes:
-      - /var/tmp/mrserver.js:/tmp/mrserver.js
-    command:
-      nodejs /tmp/mrserver.js
-    networks:
-      pmmapper-network:
-        ipv4_address: $NODE_IP
-
-  mariadb:
-    image: nexus3.onap.org:10001/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
-    networks:
-      pmmapper-network:
-        ipv4_address: $MARIADB_IP
-
-  consul:
-    container_name: consul
-    image: nexus3.onap.org:10001/consul:latest
-    networks:
-      pmmapper-network:
-        ipv4_address: $CONSUL_IP
-
-  cbs:
-    container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
-    environment:
-       CONSUL_HOST: $CONSUL_IP
-    networks:
-      pmmapper-network:
-        ipv4_address: $CBS_IP
-
-  pmmapper:
-    container_name: pmmapper
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
-    ports:
-     - "8081:8081"
-    volumes:
-      - /var/tmp/:/opt/app/pm-mapper/etc/certs/
-    depends_on:
-      - datarouter-prov
-    environment:
-       CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP
-       CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
-       HOSTNAME: pmmapper
-    networks:
-      pmmapper-network:
-        ipv4_address: $PMMAPPER_IP
-    extra_hosts:
-      - "dmaap-dr-node:$DR_NODE_IP"
-      - "message-router:$NODE_IP"
-
-
-networks:
-  pmmapper-network:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.18.0.0/16
-
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/setup.sh b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/setup.sh
deleted file mode 100644
index f314055e..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/setup.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-# Place the scripts in run order:
-source ${SCRIPTS}/common_functions.sh
-
-docker login -u docker -p docker nexus3.onap.org:10001
-
-TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/files-processing-config-pmmapper
-
-export GATEWAY_IP=172.18.0.1
-export DR_NODE_IP=172.18.0.2
-export DR_PROV_IP=172.18.0.3
-export CONSUL_IP=172.18.0.4
-export CBS_IP=172.18.0.5
-export MARIADB_IP=172.18.0.6
-export NODE_IP=172.18.0.7
-export PMMAPPER_IP=172.18.0.8
-
-for asset in provserver.properties node.properties cbs.json mrserver.js cert.jks jks.pass trust.jks trust.pass; do
-  cp $TEST_PLANS_DIR/assets/${asset} /var/tmp/
-done
-
-sed -i 's/datarouter-mariadb/'$MARIADB_IP'/g' /var/tmp/provserver.properties
-sed -i 's/ipaddress//g' /var/tmp/cbs.json
-
-# ------------------------------------
-#Prepare enviroment for client
-#install docker sdk
-echo "Uninstall docker-py and reinstall docker."
-pip uninstall -y docker-py
-pip uninstall -y docker
-pip install -U docker==2.7.0
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d mariadb consul cbs node
-
-echo "Waiting for MariaDB to come up healthy..."
-for i in {1..30}; do
-    mariadb_state=$(docker inspect --format='{{json .State.Health.Status}}' mariadb)
-    if [ $mariadb_state = '"healthy"' ]
-    then
-      break
-    else
-      sleep 2
-    fi
-done
-[ "$mariadb_state" != '"healthy"' ] && echo "Error: MariaDB container state not healthy" && exit 1
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d datarouter-node datarouter-prov
-
-unset http_proxy
-unset https_proxy
-curl --request PUT --data @/var/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 @$TEST_PLANS_DIR/assets/config.json
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d pmmapper
-sleep 2
-
-# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS
-containers_ok=false
-for i in {1..5}; do
-    if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mr-simulator) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ]
-    then
-        echo "All required docker containers are up."
-        containers_ok=true
-        break
-    else
-        sleep $i
-    fi
-done
-[ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
-
-# Data Router Configuration.
-docker exec -i datarouter-prov sh -c \
-    "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$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\|$GATEWAY_IP"
-
-# 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 @$TEST_PLANS_DIR/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 @$TEST_PLANS_DIR/assets/addSubscriber.json \
-      --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
-
-docker cp pmmapper:/var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log /tmp/pmmapper.log
-sleep 10
-docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
-curl -k https://$DR_PROV_IP:8443/internal/prov
-
-#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP} -v NODE_IP:${NODE_IP}"
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/teardown.sh
deleted file mode 100644
index ffa2da60..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/teardown.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-echo "Starting teardown script"
-TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/files-processing-config-pmmapper
-mkdir -p $WORKSPACE/archives
-docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
-kill-instance.sh pmmapper
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml logs > $WORKSPACE/archives/files-processing-config-pmmapper-docker-compose.log
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml down -v
diff --git a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/testplan.txt b/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/testplan.txt
deleted file mode 100644
index 543973d0..00000000
--- a/plans/dcaegen2-pmmapper/files-processing-config-pmmapper/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-dcaegen2-pmmapper/files-processing-config-pmmapper
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt b/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt
deleted file mode 100644
index 60544d97..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/addFeed3.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-{
-     "name": "Jettydemo",
-     "version": "m1.0",
-     "description": "Jettydemo",
-     "business_description": "Jettydemo",
-     "suspend": false,
-     "deleted": false,
-     "changeowner": true,
-     "authorization": {
-          "classification": "unclassified",
-          "endpoint_addrs": [
-               "<kafka-ip>",
-            ],
-          "endpoint_ids": [
-               {
-                    "password": "rs873m",
-                    "id": "rs873m"
-               }
-          ]
-     },
-}
-
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json
deleted file mode 100644
index 0666a7d5..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "delivery":{
-       "url":"http://dcae-pm-mapper:8081/delivery",
-       "user":"username",
-       "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":"pmmapper",
-    "decompress":true,
-    "privilegedSubscriber": true
- }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt
deleted file mode 100644
index 95cc2afb..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-{
-"delivery" :
-    {
-        "url" : "http://<kafka-ip>:7070/",
-        "user" : "datarouter",
-        "password" : "datarouter",
-        "use100" : true
-    },
-"metadataOnly" : false,
-"suspend" : false,
-"groupid" : 29,
-"subscriber" : "sg481n"
-}
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json b/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json
deleted file mode 100644
index a29956fb..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "ID": "cbs",
-    "Name": "config_binding_service",
-    "Tags": ["cbs"],
-    "Address": "ipaddress",
-    "Port": 10000
-}
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks b/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks
deleted file mode 100644
index 33dc9a31..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/cert.jks
+++ /dev/null
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
deleted file mode 100644
index 3f1009d4..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "pm-mapper-filter": { "filters":[]},
-  "key_store_path": "/opt/app/pm-mapper/etc/certs/cert.jks",
-  "key_store_pass_path": "/opt/app/pm-mapper/etc/certs/jks.pass",
-  "trust_store_path": "/opt/app/pm-mapper/etc/certs/trust.jks",
-  "trust_store_pass_path": "/opt/app/pm-mapper/etc/certs/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/dcaegen2-pmmapper/pmmapper/assets/createFeed.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json
deleted file mode 100644
index f93633dc..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "name": "PM Mapper Feed",
-    "version": "m1.0",
-    "description": "PM Mapper Feed",
-    "business_description": "PM Mapper",
-    "suspend": false,
-    "deleted": false,
-    "changeowner": true,
-    "authorization": {
-      "classification": "unclassified",
-      "endpoint_addrs": [],
-      "endpoint_ids": [
-        {
-          "password": "pmmapper",
-          "id": "pmmapper"
-        }]
-    }
-  }
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass b/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass
deleted file mode 100644
index ae8f7e72..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/jks.pass
+++ /dev/null
@@ -1 +0,0 @@
-Er1tmip;T4w[%1}YE?x{fN9v
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js b/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
deleted file mode 100644
index a6a61303..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/mrserver.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var httpServer = function() {
-var http = require('http'),
-url = require('url'),
-fs = require('fs'),
-
-start = function(port) {
-    var server = http.createServer(function(req, res) {
-    processHttpRequest(res);	
-    });
-    server.listen(port, function() {
-    console.log('Listening on ' + port + '...');
-    });
-},
-
-processHttpRequest = function(res) {
-    res.writeHead(200, {'Content-Type': 'text/plain'});
-    res.end('Published Successfully.\n');
-};
-
-return {
-    start: start		
-}
-}();
-
-httpServer.start(3904);
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties b/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties
deleted file mode 100644
index ddd4ebc8..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/node.properties
+++ /dev/null
@@ -1,87 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-#
-#    Configuration parameters set at startup for the DataRouter node
-#
-#    URL to retrieve dynamic configuration
-ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov
-#
-#    URL to upload PUB/DEL/EXP logs
-LogUploadURL = https://dmaap-dr-prov:8443/internal/logs
-#
-#    The port number for http as seen within the server
-IntHttpPort = 8080
-#
-#    The port number for https as seen within the server
-IntHttpsPort = 8443
-#
-#    The external port number for https taking port mapping into account
-ExtHttpsPort = 443
-#
-#    The minimum interval between fetches of the dynamic configuration from the provisioning server
-MinProvFetchInterval = 10000
-#
-#    The minimum interval between saves of the redirection data file
-MinRedirSaveInterval = 10000
-#
-#    The path to the directory where log files are stored
-LogDir = /opt/app/datartr/logs
-#
-#    The retention interval (in days) for log files
-LogRetention = 30
-#
-#    The path to the directories where data and meta data files are stored
-SpoolDir = /opt/app/datartr/spool
-#
-#    The path to the redirection data file
-RedirectionFile = etc/redirections.dat
-#
-#    The type of keystore for https
-KeyStoreType = PKCS12
-#
-#    The type of truststore for https
-TrustStoreType = jks
-#
-#    The path to the file used to trigger an orderly shutdown
-QuiesceFile = etc/SHUTDOWN
-#
-#    The key used to generate passwords for node to node transfers
-NodeAuthKey = Node123!
-#
-#    DR_NODE DEFAULT ENABLED TLS PROTOCOLS
-NodeHttpsProtocols = TLSv1.1|TLSv1.2
-#
-#    AAF type to generate permission string
-AAFType = org.onap.dmaap-dr.feed
-#
-#    AAF default instance to generate permission string - default should be legacy
-AAFInstance = legacy
-#
-#    AAF action to generate permission string - default should be publish
-AAFAction = publish
-#
-#    AAF CADI enabled flag
-CadiEnabled = false
-#
-#    AAF Props file path
-AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties b/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties
deleted file mode 100644
index 20b5cb92..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/provserver.properties
+++ /dev/null
@@ -1,60 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * Licensed under the Apache License, Version 2.0 (the "License");
-# * you may not use this file except in compliance with the License.
-# * You may obtain a copy of the License at
-# *
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-# *
-#  * Unless required by applicable law or agreed to in writing, software
-# * distributed under the License is distributed on an "AS IS" BASIS,
-# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# * See the License for the specific language governing permissions and
-# * limitations under the License.
-# * ============LICENSE_END====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-
-#Jetty Server properties
-org.onap.dmaap.datarouter.provserver.http.port           = 8080
-org.onap.dmaap.datarouter.provserver.https.port          = 8443
-org.onap.dmaap.datarouter.provserver.https.relaxation    = true
-
-org.onap.dmaap.datarouter.provserver.aafprops.path       = /opt/app/osaaf/local/org.onap.dmaap-dr.props
-
-org.onap.dmaap.datarouter.provserver.accesslog.dir       = /opt/app/datartr/logs
-org.onap.dmaap.datarouter.provserver.spooldir            = /opt/app/datartr/spool
-org.onap.dmaap.datarouter.provserver.dbscripts           = /opt/app/datartr/etc/misc
-org.onap.dmaap.datarouter.provserver.logretention        = 30
-
-#DMAAP-597 (Tech Dept) REST request source IP auth
-# relaxation to accommodate OOM kubernetes deploy
-org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false
-
-#Localhost address config
-org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1
-
-# Database access
-org.onap.dmaap.datarouter.db.driver   = org.mariadb.jdbc.Driver
-org.onap.dmaap.datarouter.db.url      = jdbc:mariadb://datarouter-mariadb:3306/datarouter
-org.onap.dmaap.datarouter.db.login    = datarouter
-org.onap.dmaap.datarouter.db.password = datarouter
-
-# PROV - DEFAULT ENABLED TLS PROTOCOLS
-org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2
-
-# AAF config
-org.onap.dmaap.datarouter.provserver.cadi.enabled = false
-
-org.onap.dmaap.datarouter.provserver.passwordencryption   = PasswordEncryptionKey#@$%^&1234#
-org.onap.dmaap.datarouter.provserver.aaf.feed.type        = org.onap.dmaap-dr.feed
-org.onap.dmaap.datarouter.provserver.aaf.sub.type         = org.onap.dmaap-dr.sub
-org.onap.dmaap.datarouter.provserver.aaf.instance         = legacy
-org.onap.dmaap.datarouter.provserver.aaf.action.publish   = publish
-org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks b/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks
deleted file mode 100644
index 679c95a5..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/trust.jks
+++ /dev/null
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass b/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass
deleted file mode 100644
index d3d01b0a..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/assets/trust.pass
+++ /dev/null
@@ -1 +0,0 @@
-583Ls;XF(qDQu3p!L22gyh1t
\ No newline at end of file
diff --git a/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml b/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml
deleted file mode 100644
index c9f3e9ad..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/docker-compose.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-version: '3.3'
-
-services:
-  datarouter-prov:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov
-    container_name: datarouter-prov
-    hostname: dmaap-dr-prov
-    ports:
-     - "443:8443"
-     - "8443:8443"
-     - "8080:8080"
-    volumes:
-     - /var/tmp/provserver.properties:/opt/app/datartr/etc/provserver.properties
-     - /var/tmp/addSubscriber.txt:/opt/app/datartr/addSubscriber.txt
-     - /var/tmp/addFeed3.txt:/opt/app/datartr/addFeed3.txt
-    depends_on:
-      - mariadb
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://dmaap-dr-prov:8080/internal/prov"]
-      interval: 10s
-      timeout: 10s
-      retries: 5
-    networks:
-      pmmapper-network:
-        ipv4_address: $DR_PROV_IP
-    extra_hosts:
-      - "dmaap-dr-node:$DR_NODE_IP"
-      - "dcae-pm-mapper:$PMMAPPER_IP"
-
-  datarouter-node:
-    image: nexus3.onap.org:10001/onap/dmaap/datarouter-node
-    container_name: datarouter-node
-    hostname: dmaap-dr-node
-    ports:
-     - "9443:8443"
-     - "9090:8080"
-    volumes:
-     - /var/tmp/node.properties:/opt/app/datartr/etc/node.properties
-    depends_on:
-      - datarouter-prov
-    networks:
-      pmmapper-network:
-        ipv4_address: $DR_NODE_IP
-    extra_hosts:
-      - "dmaap-dr-prov:$DR_PROV_IP"
-      - "dcae-pm-mapper:$PMMAPPER_IP"
-
-  node:
-    image: node:10-slim
-    container_name: mr-simulator
-    volumes:
-      - /var/tmp/mrserver.js:/tmp/mrserver.js
-    command:
-      nodejs /tmp/mrserver.js
-    networks:
-      pmmapper-network:
-        ipv4_address: $NODE_IP
-
-  mariadb:
-    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
-    networks:
-      pmmapper-network:
-        ipv4_address: $MARIADB_IP
-
-  consul:
-    container_name: consul
-    image: nexus3.onap.org:10001/consul:latest
-    networks:
-      pmmapper-network:
-        ipv4_address: $CONSUL_IP
-
-  cbs:
-    container_name: cbs
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest
-    environment:
-       CONSUL_HOST: $CONSUL_IP
-    networks:
-      pmmapper-network:
-        ipv4_address: $CBS_IP
-
-  pmmapper:
-    container_name: pmmapper
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:latest
-    ports:
-     - "8081:8081"
-    volumes:
-      - /var/tmp/:/opt/app/pm-mapper/etc/certs/
-    depends_on:
-      - datarouter-prov
-    environment:
-       CONFIG_BINDING_SERVICE_SERVICE_HOST: $CBS_IP
-       CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000
-       HOSTNAME: pmmapper
-    networks:
-      pmmapper-network:
-        ipv4_address: $PMMAPPER_IP
-    extra_hosts:
-      - "dmaap-dr-node:$DR_NODE_IP"
-      - "message-router:$NODE_IP"
-
-
-networks:
-  pmmapper-network:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.18.0.0/16
-
diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh
deleted file mode 100644
index 7d851738..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-# Place the scripts in run order:
-source ${SCRIPTS}/common_functions.sh
-
-docker login -u docker -p docker nexus3.onap.org:10001
-
-TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper
-
-export GATEWAY_IP=172.18.0.1
-export DR_NODE_IP=172.18.0.2
-export DR_PROV_IP=172.18.0.3
-export CONSUL_IP=172.18.0.4
-export CBS_IP=172.18.0.5
-export MARIADB_IP=172.18.0.6
-export NODE_IP=172.18.0.7
-export PMMAPPER_IP=172.18.0.8
-
-for asset in provserver.properties addSubscriber.txt addFeed3.txt node.properties cbs.json mrserver.js cert.jks jks.pass trust.jks trust.pass; do
-  cp $TEST_PLANS_DIR/assets/${asset} /var/tmp/
-done
-
-sed -i 's/datarouter-mariadb/'$MARIADB_IP'/g' /var/tmp/provserver.properties
-#sed -i 's/<kafka-ip>/'$KAFKA_IP'/g' /var/tmp/addSubscriber.txt
-#sed -i 's/<kafka-ip>/'$KAFKA_IP'/g' /var/tmp/addFeed3.txt
-#sed -i 's/ipaddress/'$CBS_IP'/g' /var/tmp/cbs.json
-sed -i 's/ipaddress//g' /var/tmp/cbs.json
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d mariadb consul cbs node
-
-echo "Waiting for MariaDB to come up healthy..."
-for i in {1..30}; do
-    mariadb_state=$(docker inspect --format='{{json .State.Health.Status}}' mariadb)
-    if [ $mariadb_state = '"healthy"' ]
-    then
-      break
-    else
-      sleep 2
-    fi
-done
-[ "$mariadb_state" != '"healthy"' ] && echo "Error: MariaDB container state not healthy" && exit 1
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d datarouter-node datarouter-prov
-
-curl --request PUT --data @/var/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 @$TEST_PLANS_DIR/assets/config.json
-
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml up -d pmmapper
-sleep 2
-
-# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS
-containers_ok=false
-for i in {1..5}; do
-    if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' mr-simulator) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ]
-    then
-        echo "All required docker containers are up."
-        containers_ok=true
-        break
-    else
-        sleep $i
-    fi
-done
-[ "$containers_ok" = "false" ] && echo "Error: required container not running." && exit 1
-
-# Data Router Configuration.
-docker exec -i datarouter-prov sh -c \
-    "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$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\|$GATEWAY_IP"
-
-# 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 @$TEST_PLANS_DIR/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 @$TEST_PLANS_DIR/assets/addSubscriber.json \
-      --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1
-
-docker cp pmmapper:/var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log /tmp/pmmapper.log
-sleep 10
-docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv"
-curl -k https://$DR_PROV_IP:8443/internal/prov
-
-#Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
deleted file mode 100644
index 77bed8e0..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-echo "Starting teardown script"
-TEST_PLANS_DIR=$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper
-mkdir -p $WORKSPACE/archives
-docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log"
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml logs > $WORKSPACE/archives/pmmapper-docker-compose.log
-docker-compose -f $TEST_PLANS_DIR/docker-compose.yml down -v
diff --git a/plans/dcaegen2-pmmapper/pmmapper/testplan.txt b/plans/dcaegen2-pmmapper/pmmapper/testplan.txt
deleted file mode 100644
index f874b4df..00000000
--- a/plans/dcaegen2-pmmapper/pmmapper/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-dcaegen2-pmmapper/pmmapper