From 94b43bebf72f60d9cfd67b0abce8a0c5619c0012 Mon Sep 17 00:00:00 2001
From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Tue, 26 Mar 2019 14:30:01 +0100
Subject: [PATCH] Redefine Routing

This change follows related changes in DCAEGEN2-1347

- routing is no longer read from configuration file
- routing format kept in CBS have been adjusted to platform
definitions

Change-Id: I5f6c53325d5ea04d2f5ab13a7ff134932f7edeb0
Issue-ID: DCAEGEN2-1347
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---
 .../testsuites/collector/configuration/insecure.json        | 13 -------------
 .../testsuites/collector/configuration/secure.json          | 13 -------------
 tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot   |  2 +-
 .../testcases/resources/hv-ves-configuration.json           | 12 ++++++++++++
 .../testcases/resources/ves-hv-configuration.json           |  9 ---------
 5 files changed, 13 insertions(+), 36 deletions(-)
 create mode 100644 tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
 delete mode 100644 tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json

diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
index 9af02ffd..3df8e6e8 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json
@@ -11,18 +11,5 @@
   "security": {
     "sslDisable": true
   },
-  "collector": {
-    "maxRequestSizeBytes": 1048576,
-    "kafkaServers": [
-      "kafka:9092"
-    ],
-    "routing": [
-      {
-        "fromDomain": "perf3gpp",
-        "toTopic": "TEST_HV_VES_PERF3GPP"
-      }
-    ],
-    "dummyMode": false
-  },
   "logLevel": "DEBUG"
 }
\ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
index 5aa2b0aa..60ac2366 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
@@ -17,18 +17,5 @@
       "trustStorePassword": "onaponap"
     }
   },
-  "collector": {
-    "maxRequestSizeBytes": 1048576,
-    "kafkaServers": [
-      "kafka:9092"
-    ],
-    "routing": [
-      {
-        "fromDomain": "perf3gpp",
-        "toTopic": "TEST_HV_VES_PERF3GPP"
-      }
-    ],
-    "dummyMode": false
-  },
   "logLevel": "DEBUG"
 }
\ No newline at end of file
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
index 1ac91504..1e574b0e 100644
--- a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
@@ -71,4 +71,4 @@ ${DCAE_APP_API_MESSAGES_VALIDATION_PATH}       ${DCAE_APP_API_MESSAGES_PATH}/val
 ${ROUTED_MESSAGES_TOPIC}                       TEST_HV_VES_PERF3GPP
 
 ${HV_VES_RESOURCES}                            %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources
-${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/ves-hv-configuration.json
+${HV_VES_CONFIGURATION_JSON_FILEPATH}          ${HV_VES_RESOURCES}/hv-ves-configuration.json
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
new file mode 100644
index 00000000..1c4e3439
--- /dev/null
+++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json
@@ -0,0 +1,12 @@
+{
+  "streams_publishes": {
+    "perf3gpp": {
+      "type": "kafka",
+      "kafka_info": {
+        "bootstrap_servers": "kafka:9092",
+        "topic_name": "TEST_HV_VES_PERF3GPP"
+      }
+    }
+  }
+}
+
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
deleted file mode 100644
index 1a65cf1b..00000000
--- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "collector.routing": [
-    {
-      "fromDomain": "perf3gpp",
-      "toTopic": "TEST_HV_VES_PERF3GPP"
-    }
-  ]
-}
-
-- 
2.16.6