Remove Consul from CSITs

Issue-ID: DCAEGEN2-2964
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I0f21178e938b4e6ad13b9601fdd9cca93e06621c

4 files changed, 107 insertions, 3 deletions

diff --git a/csit/tests/pmmapper/assets/pm_filter_config.yaml b/csit/tests/pmmapper/assets/pm_filter_config.yaml
new file mode 100644
index 0000000..aa7f6c4
--- /dev/null
+++ b/csit/tests/pmmapper/assets/pm_filter_config.yaml
@@ -0,0 +1,36 @@
+---
+pm-mapper-filter:
+  filters:
+    - pmDefVsn: '1.0'
+      nfType: gnb
+      vendor: Ericsson
+      measTypes:
+        - attTCHSeizures
+        - succTCHSeizures2
+        - succImmediateAssignProcs8
+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
diff --git a/csit/tests/pmmapper/assets/pm_filter_regex_config.yaml b/csit/tests/pmmapper/assets/pm_filter_regex_config.yaml
new file mode 100644
index 0000000..5cb564a
--- /dev/null
+++ b/csit/tests/pmmapper/assets/pm_filter_regex_config.yaml
@@ -0,0 +1,34 @@
+---
+pm-mapper-filter:
+  filters:
+    - pmDefVsn: '1.0'
+      nfType: gnb
+      vendor: Ericsson
+      measTypes:
+        - att.*
+key_store_path: "/opt/app/pm-mapper/etc/cert.jks.b64"
+key_store_pass_path: "/opt/app/pm-mapper/etc/jks.pass"
+trust_store_path: "/opt/app/pm-mapper/etc/trust.jks.b64"
+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
diff --git a/csit/tests/pmmapper/assets/vendor_filter_config.yaml b/csit/tests/pmmapper/assets/vendor_filter_config.yaml
new file mode 100644
index 0000000..9a622ab
--- /dev/null
+++ b/csit/tests/pmmapper/assets/vendor_filter_config.yaml
@@ -0,0 +1,33 @@
+---
+pm-mapper-filter:
+  filters:
+    - pmDefVsn: '1.0'
+      nfType: gnb
+      vendor: Ericsson
+      measTypes: []
+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
diff --git a/csit/tests/pmmapper/pmmapper.robot b/csit/tests/pmmapper/pmmapper.robot
index 72801d0..b7131a3 100644
--- a/csit/tests/pmmapper/pmmapper.robot
+++ b/csit/tests/pmmapper/pmmapper.robot
@@ -31,9 +31,10 @@ ${TYPE-C_PM_DATA_FILE_PATH}              ${ASSETS_PATH}/C20190328.0000-0015.xml
 ${NR-TYPE-A_PM_DATA_FILE_PATH}           ${ASSETS_PATH}/new_radio/A20181004.0000-1000-0015-1000_5G.xml
 ${NR-TYPE-C_PM_DATA_FILE_PATH}           ${ASSETS_PATH}/new_radio/C20190329.0000-0015.xml
 ${NR-TYPE-PM_DATA_FILE_PATH}             ${ASSETS_PATH}/new_radio/PM202007171301+020024C202007171207+0200-1215+0200_45678.xml
-${CLI_EXEC_VENDOR_FILTER}                curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @${ASSETS_PATH}/vendor_filter_config.json
-${CLI_EXEC_PM_FILTER}                    curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @${ASSETS_PATH}/pm_filter_config.json
-${CLI_EXEC_PM_FILTER_regex}              curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @${ASSETS_PATH}/pm_filter_regex_config.json
+${CLI_EXEC_VENDOR_FILTER}                cp ${ASSETS_PATH}/vendor_filter_config.yaml /var/tmp/config.yaml
+${CLI_EXEC_PM_FILTER}                    cp ${ASSETS_PATH}/pm_filter_config.yaml /var/tmp/config.yaml
+${CLI_EXEC_PM_FILTER_regex}              cp ${ASSETS_PATH}/pm_filter_regex_config.yaml /var/tmp/config.yaml
+
 ${CLI_MESSAGE_ROUTER_TOPIC}              curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 > /tmp/mr.log
 ${CLI_MR_LOG}                            cat /tmp/mr.log