From: demx8as6 Date: Mon, 13 Dec 2021 07:32:34 +0000 (+0100) Subject: Late updates on integration deployment X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=f0a2808bb98fd539203b8032c75b8a922324d092;p=oam.git Late updates on integration deployment - update 'stndDefined' support for VES Collector IssueID: OAM-240 Change-Id: I1c219ed5e3b5b07e24f28a3f366e6a40baef7b93 Signed-off-by: demx8as6 --- diff --git a/solution/integration/smo/common/.env b/solution/integration/smo/common/.env index 6f4e5c8..ae91017 100644 --- a/solution/integration/smo/common/.env +++ b/solution/integration/smo/common/.env @@ -14,7 +14,7 @@ # limitations under the License. # -COMPOSE_PROJECT_NAME=o-ran-sc-d-release +COMPOSE_PROJECT_NAME=o-ran-sc-e-release # Credentials diff --git a/solution/integration/smo/oam/docker-compose.yml b/solution/integration/smo/oam/docker-compose.yml index 14550a0..c73471a 100755 --- a/solution/integration/smo/oam/docker-compose.yml +++ b/solution/integration/smo/oam/docker-compose.yml @@ -87,6 +87,8 @@ services: - 8443:8443 volumes: - ./ves-collector/collector.properties:/opt/app/VESCollector/etc/collector.properties + - ./ves-collector/ves-dmaap-config.json:/opt/app/VESCollector/etc/ves-dmaap-config.json + - ./ves-collector/externalRepo:/opt/app/VESCollector/etc/externalRepo networks: smo: default: diff --git a/solution/integration/smo/oam/ves-collector/collector.properties b/solution/integration/smo/oam/ves-collector/collector.properties index ea4e2ac..a85f051 100644 --- a/solution/integration/smo/oam/ves-collector/collector.properties +++ b/solution/integration/smo/oam/ves-collector/collector.properties @@ -61,8 +61,8 @@ event.externalSchema.schemaRefPath=$.event.stndDefinedFields.schemaReference event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile -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.dmaapfile=./etc/DmaapConfig.json +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|o-ran-sc-du-hello-world-pm-streaming-oas3=ves-o-ran-sc-du-hello-world-pm-streaming-oas3 +collector.dmaapfile=etc/ves-dmaap-config.json ## Path to the file containing description of api versions collector.description.api.version.location=etc/api_version_description.json diff --git a/solution/integration/smo/oam/ves-collector/externalRepo/schema-map.json b/solution/integration/smo/oam/ves-collector/externalRepo/schema-map.json new file mode 100644 index 0000000..4e83711 --- /dev/null +++ b/solution/integration/smo/oam/ves-collector/externalRepo/schema-map.json @@ -0,0 +1,42 @@ +[ + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/faultMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/heartbeatNtf.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/PerDataFileReportMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/provMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel16/OpenAPI/faultMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/Rel16/OpenAPI/faultMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel16/OpenAPI/heartbeatNtf.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/Rel16/OpenAPI/heartbeatNtf.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel16/OpenAPI/fileDataReportingMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/Rel16/OpenAPI/fileDataReportingMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel16/OpenAPI/perfMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/Rel16/OpenAPI/perfMnS.yaml" + }, + { + "publicURL": "https://forge.3gpp.org/rep/sa5/MnS/blob/Rel16/OpenAPI/provMnS.yaml", + "localURL": "3gpp/rep/sa5/MnS/blob/Rel16/OpenAPI/provMnS.yaml" + }, + { + "publicURL": "https://gerrit.o-ran-sc.org/r/gitweb?p=scp/oam/modeling.git;a=blob_plain;f=data-model/oas3/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml", + "localURL": "o-ran-sc/experimental/o-ran-sc-du-hello-world-pm-streaming-oas3.yaml" + } +] \ No newline at end of file diff --git a/solution/integration/smo/oam/ves-collector/ves-dmaap-config.json b/solution/integration/smo/oam/ves-collector/ves-dmaap-config.json new file mode 100644 index 0000000..8653ac0 --- /dev/null +++ b/solution/integration/smo/oam/ves-collector/ves-dmaap-config.json @@ -0,0 +1,212 @@ +{ + "ves-syslog": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-statechange": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-thresholdCrossingAlert": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-heartbeat": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT/" + } + }, + "ves-other": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_OTHER_OUTPUT/" + } + }, + "ves-mobileflow": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-sipsignaling": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-voicequality": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-fault": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_FAULT_OUTPUT/" + } + }, + "ves-measurement": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT/" + } + }, + "ves-3gpp-fault-supervision": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT/" + } + }, + "ves-3gpp-provisioning": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT/" + } + }, + "ves-3gpp-heartbeat": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT/" + } + }, + "ves-3gpp-performance-assurance": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT/" + } + }, + "ves-syslog-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-statechange-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-thresholdCrossingAlert-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-heartbeat-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-other-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-mobileflow-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-sipsignaling-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTSves7_valid_ip_v4.json-DEV" + } + }, + "ves-voicequality-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-fault-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-measurement-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-3gpp-fault-supervision-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT" + } + }, + "ves-3gpp-provisioning-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT" + } + }, + "ves-3gpp-heartbeat-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-3gpp-performance-assurance-secondary": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/DCAE-SE-COLLECTOR-EVENTS-DEV" + } + }, + "ves-pnfRegistration": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_PNFREG_OUTPUT/" + } + }, + "ves-o-ran-sc-du-hello-world-pm-streaming-oas3": { + "type": "message_router", + "dmaap_info": { + "location": "mtl5", + "topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_O_RAN_SC_HELLO_WORLD_PM_STREAMING_OUTPUT/" + } + } +} \ No newline at end of file