aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/insecure.json13
-rw-r--r--plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json13
-rw-r--r--tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot2
-rw-r--r--tests/dcaegen2-collectors-hv-ves/testcases/resources/hv-ves-configuration.json12
-rw-r--r--tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json9
5 files changed, 13 insertions, 36 deletions
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"
- }
- ]
-}
-