From 7729ada64fae14e43d0a7de417d52bdb920ae4d4 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Mon, 1 Oct 2018 08:12:07 +0200 Subject: [PATCH 1/1] Update HV-VES domain Commit follows changes to domain name made in other tasks for this issue. Change-Id: I5d1b6b64d046cc5a2323e1e1646499cbd05d24a2 Issue-ID: DCAEGEN2-847 Signed-off-by: Filip Krzywka --- tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot | 2 +- .../scenarios/authorization/xnf-valid-messages-request.json | 2 +- .../scenarios/fixed-payload/dcae-fixed-payload-request.json | 2 +- .../scenarios/fixed-payload/xnf-fixed-payload-request.json | 2 +- .../scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json | 2 +- .../scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json | 6 +++--- .../invalid-wire-frame/dcae-invalid-wire-frame-request.json | 2 +- .../invalid-wire-frame/xnf-invalid-wire-frame-request.json | 6 +++--- .../multiple-simulators-payload/dcae-smaller-valid-request.json | 2 +- .../xnf-simulator-smaller-valid-request.json | 2 +- .../scenarios/too-big-payload/xnf-too-big-payload-request.json | 6 +++--- .../unsupported-domain/dcae-unsupported-domain-request.json | 2 +- .../unsupported-domain/xnf-unsupported-domain-request.json | 4 ++-- .../testcases/resources/ves-hv-configuration.json | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot index 7b99fb0d..60580083 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot +++ b/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot @@ -50,7 +50,7 @@ ${DCAE_APP_API_MESSAGES_PATH} /messages/all ${DCAE_APP_API_MESSAGES_COUNT_PATH} ${DCAE_APP_API_MESSAGES_PATH}/count ${DCAE_APP_API_MESSAGES_VALIDATION_PATH} ${DCAE_APP_API_MESSAGES_PATH}/validate -${ROUTED_MESSAGES_TOPIC} test-hv-ran-meas +${ROUTED_MESSAGES_TOPIC} TEST_HV_VES_PERF3GPP ${VES_HV_RESOURCES} %{WORKSPACE}/tests/dcaegen2-collectors-hv-ves/testcases/resources ${VES_HV_CONFIGURATION_JSON_FILEPATH} ${VES_HV_RESOURCES}/ves-hv-configuration.json diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json index 9aca4015..eabb9ce1 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json index 642c7d56..f0c169da 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json index 642c7d56..f0c169da 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json index f38e9aa0..76b51931 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json index 22d48c5f..281b66b7 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -24,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -46,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json index f38e9aa0..76b51931 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json index a7d22190..6d50cc99 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -24,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -46,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json index 89f3e067..5614c353 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json index 60c81a89..18cde57b 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json index 54836bf3..6dab0112 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -24,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -46,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json index f38e9aa0..76b51931 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json index b3aada5b..58f7c978 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -46,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVMEAS", + "domain": "PERF3GPP", "sequence": 1, "priority": 1, "eventId": "sample-event-id", 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 index b9e1a4b5..6404c6c1 100644 --- a/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json +++ b/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json @@ -2,8 +2,8 @@ "dmaap.kafkaBootstrapServers": "kafka:9092", "collector.routing": [ { - "fromDomain": "HVMEAS", - "toTopic": "test-hv-ran-meas" + "fromDomain": "PERF3GPP", + "toTopic": "TEST_HV_VES_PERF3GPP" } ] } \ No newline at end of file -- 2.16.6