3 files changed, 29 insertions, 42 deletions
diff --git a/csit/plans/pmmapper/assets/cbs.json b/csit/plans/pmmapper/assets/cbs.json
deleted file mode 100644
index a29956f..0000000
--- a/csit/plans/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/csit/plans/pmmapper/assets/config.json b/csit/plans/pmmapper/assets/config.json
deleted file mode 100644
index 3f1009d..0000000
--- a/csit/plans/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/csit/plans/pmmapper/assets/config.yaml b/csit/plans/pmmapper/assets/config.yaml
new file mode 100644
index 0000000..c535113
--- /dev/null
+++ b/csit/plans/pmmapper/assets/config.yaml
@@ -0,0 +1,29 @@
+---
+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