diff options
15 files changed, 63 insertions, 43 deletions
diff --git a/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json b/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json index 79dda59e8..ed4dc10c2 100644 --- a/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json +++ b/deployment/Azure_ARM_Template/arm_cluster_deploy_beijing.json @@ -390,7 +390,7 @@ "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { - "fileUris": [ "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=Azure_ARM_Template/scripts/azure-rancher-server.sh;hb=refs/heads/master" ], + "fileUris": [ "https://git.onap.org/integration/plain/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh" ], "commandToExecute": "[concat('./' , parameters('masterScriptName'),' ',reference(variables('publicIPAddressName')).dnsSettings.fqdn,' ',parameters('privateIPAddress'),' ',parameters('numberOfVms'))]" } } @@ -413,7 +413,7 @@ "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion": true, "settings": { - "fileUris": [ "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=Azure_ARM_Template/scripts/azure-k8s-node.sh;hb=refs/heads/master" ], + "fileUris": [ "https://git.onap.org/integration/plain/deployment/Azure_ARM_Template/scripts/azure-k8s-node.sh" ], "commandToExecute": "[concat('./' , parameters('nodeScriptName'),' ',concat(parameters('privateIPAddress'),'0'))]" } } diff --git a/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh b/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh index 1c4373c4d..fc92c295e 100644 --- a/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh +++ b/deployment/Azure_ARM_Template/scripts/azure-rancher-server.sh @@ -3,7 +3,7 @@ set -x DOCKER_VERSION=17.03 -RANCHER_VERSION=1.6.14 +RANCHER_VERSION=1.6.18 KUBECTL_VERSION=1.8.10 HELM_VERSION=2.9.1 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json index 75d938766..9aca4015c 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 5000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json index fb53f50ec..642c7d564 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json index fb53f50ec..642c7d564 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json index 772b03bef..f38e9aa07 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json index d9cb4c2ec..22d48c5f5 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 @@ -23,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -36,7 +37,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "INVALID_GPB_DATA", "messagesAmount": 100 @@ -44,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -57,7 +59,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json index 772b03bef..f38e9aa07 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json index 88d4e325d..a7d221905 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 @@ -23,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -36,7 +37,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "INVALID_WIRE_FRAME", "messagesAmount": 100 @@ -44,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -57,7 +59,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json index 9d34a7e24..89f3e0672 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 15000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json index 625737e56..60c81a898 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "FIXED_PAYLOAD", "messagesAmount": 5000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json index b1c727a0c..54836bf38 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json +++ b/test/csit/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": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 @@ -23,7 +24,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -36,7 +37,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "TOO_BIG_PAYLOAD", "messagesAmount": 100 @@ -44,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -57,7 +59,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json index 772b03bef..f38e9aa07 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 50000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json index e37e20d19..b3aada5bd 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json @@ -2,7 +2,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -15,7 +15,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 @@ -36,7 +37,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 100 @@ -44,7 +46,7 @@ { "commonEventHeader": { "version": "sample-version", - "domain": "HVRANMEAS", + "domain": "HVMEAS", "sequence": 1, "priority": 1, "eventId": "sample-event-id", @@ -57,7 +59,8 @@ "reportingEntityId": "sample-reporting-entity-id", "reportingEntityName": "sample-reporting-entity-name", "sourceId": "sample-source-id", - "sourceName": "sample-source-name" + "sourceName": "sample-source-name", + "vesEventListenerVersion": "another-version" }, "messageType": "VALID", "messagesAmount": 25000 diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json index 88a70b0db..b9e1a4b59 100644 --- a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json +++ b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json @@ -2,7 +2,7 @@ "dmaap.kafkaBootstrapServers": "kafka:9092", "collector.routing": [ { - "fromDomain": 11, + "fromDomain": "HVMEAS", "toTopic": "test-hv-ran-meas" } ] |