From f1ea637a60bace906db5619d71a914ad601e9478 Mon Sep 17 00:00:00 2001 From: Bogumil Zebek Date: Thu, 13 Aug 2020 07:35:53 +0200 Subject: StndDefined event routing - Update WS error response - Update DPO configuration Change-Id: Id4eb5ea50af6d55c839047c4f39b9f99487e95de Issue-ID: DCAEGEN2-1771 Signed-off-by: Zebek Bogumil --- dpo/data-formats/ConsulConfig.json | 26 ++++++++++++++- dpo/data-formats/ves-dmaap-config.json | 56 ++++++++++++++++++++++++++++++++ dpo/spec/vescollector-componentspec.json | 24 ++++++++++++++ 3 files changed, 105 insertions(+), 1 deletion(-) (limited to 'dpo') diff --git a/dpo/data-formats/ConsulConfig.json b/dpo/data-formats/ConsulConfig.json index dcfcdf63..1249afe4 100644 --- a/dpo/data-formats/ConsulConfig.json +++ b/dpo/data-formats/ConsulConfig.json @@ -2,7 +2,7 @@ "collector.dynamic.config.update.frequency": "5", "event.transform.flag": "0", "collector.schema.checkflag": "1", - "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|stndDefined=ves-other", + "collector.dmaap.streamid": "fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance", "collector.service.port": "8080", "collector.schema.file": "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.2_ONAP.json\"}", "collector.keystore.passwordfile": "/opt/app/VESCollector/etc/passwordfile", @@ -42,6 +42,30 @@ "dmaap_info": { "topic_url": "http://message-router:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT/" } + }, + "ves-3gpp-fault-supervision": { + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT/" + } + }, + "ves-3gpp-provisioning": { + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT/" + } + }, + "ves-3gpp-heartbeat": { + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT/" + } + }, + "ves-3gpp-performance-assurance": { + "type": "message_router", + "dmaap_info": { + "topic_url": "http://message-router:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT/" + } } }, "collector.service.secure.port": "8443", diff --git a/dpo/data-formats/ves-dmaap-config.json b/dpo/data-formats/ves-dmaap-config.json index 53e8def1..c3b4b809 100644 --- a/dpo/data-formats/ves-dmaap-config.json +++ b/dpo/data-formats/ves-dmaap-config.json @@ -69,6 +69,34 @@ "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" } }, + "ves_3gpp_fault_supervision": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_provisioning": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_heartbeat": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_performance_assurance": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, "ves_syslog_secondary": { "type": "message_router", "dmaap_info": { @@ -138,5 +166,33 @@ "location": "mtl5", "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" } + }, + "ves_3gpp_fault_supervision_secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_provisioning_secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_heartbeat_secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves_3gpp_performance_assurance_secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://dmaap-mr-hostname:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } } } diff --git a/dpo/spec/vescollector-componentspec.json b/dpo/spec/vescollector-componentspec.json index 3a21d2db..65972c65 100644 --- a/dpo/spec/vescollector-componentspec.json +++ b/dpo/spec/vescollector-componentspec.json @@ -85,6 +85,30 @@ "version": "7.30.2", "type": "message router", "config_key": "ves-perf3gpp" + }, + { + "format": "VES_specification", + "version": "7.30.2", + "type": "message router", + "config_key": "ves-3gpp-fault-supervision" + }, + { + "format": "VES_specification", + "version": "7.30.2", + "type": "message router", + "config_key": "ves-3gpp-provisioning" + }, + { + "format": "VES_specification", + "version": "7.30.2", + "type": "message router", + "config_key": "ves-3gpp-heartbeat" + }, + { + "format": "VES_specification", + "version": "7.30.2", + "type": "message router", + "config_key": "ves-3gpp-performance-assurance" } ] }, -- cgit 1.2.3-korg