From 63423756a1c068146a0291737a8edbc65c5b594a Mon Sep 17 00:00:00 2001 From: demx8as6 Date: Fri, 26 Mar 2021 21:58:48 +0100 Subject: [PATCH] Update docker-compose and its configurations The image version and configuration were updated to SDNC 2.1.1 and VES-Collector 1.9.0. Update VES client scripts supporting https Port numbers and basicAuth were updated. IssueID: OAM-173, OAM-175 Change-Id: I0c70921800faa7c3635379f6d41600e4c5420b23 Signed-off-by: demx8as6 --- .../client-scripts-ves-v7/config | 7 +++---- solution/integration/smo/.env | 11 ++++++----- solution/integration/smo/docker-compose.yml | 7 ++++--- solution/integration/smo/vesc/collector.properties | 23 ++++++++++++++++++++-- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/config b/solution/dev/ves-test-collector/client-scripts-ves-v7/config index d11dc5c..db1a28f 100644 --- a/solution/dev/ves-test-collector/client-scripts-ves-v7/config +++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/config @@ -1,6 +1,5 @@ ################################################################################ -# -# Copyright 2019 highstreet technologies GmbH and others +# Copyright 2021 highstreet technologies GmbH and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,8 +19,8 @@ ################################################################################ # DCAE VES Collector communication end point -urlVes=http://localhost:30007/eventListener/v7 -basicAuthVes=will:pill +urlVes=https://localhost:8443/eventListener/v7 +basicAuthVes=sample1:sample1 ################################################################################ # common generated event settings, please dont touch diff --git a/solution/integration/smo/.env b/solution/integration/smo/.env index c14546f..b2cd3f9 100644 --- a/solution/integration/smo/.env +++ b/solution/integration/smo/.env @@ -1,5 +1,5 @@ ################################################################################ -# Copyright 2020 highstreet technologies and others +# Copyright 2021 highstreet technologies and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -23,17 +23,18 @@ GATEWAY_IP=172.40.0.1 SDNR_IP=172.40.0.21 ODL_CERT_DIR=/opt/opendaylight/current/certs ODL_ADMIN_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.0.3 -SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.6.1 +SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.1 + +SDNRDB_IMAGE=docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.3 ESDB_IP=172.40.0.30 # dependent components -VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:latest +VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.9.0 DMAAP_IMAGE=nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.18 KAFKA_IMAGE=nexus3.onap.org:10001/onap/dmaap/kafka111:1.0.4 ZOOKEEPER_IMAGE=nexus3.onap.org:10001/onap/dmaap/zookeeper:6.0.3 ZOOKEEPER_IP=172.40.0.60 KAFKA_IP=172.40.0.70 DMAAP_IP=172.40.0.80 -VESCOLLECTOR_IP=172.40.0.90 \ No newline at end of file +VESCOLLECTOR_IP=172.40.0.90 diff --git a/solution/integration/smo/docker-compose.yml b/solution/integration/smo/docker-compose.yml index 8bc84c6..4e9bc59 100755 --- a/solution/integration/smo/docker-compose.yml +++ b/solution/integration/smo/docker-compose.yml @@ -1,5 +1,5 @@ ################################################################################ -# Copyright 2020 highstreet technologies and others +# Copyright 2021 highstreet technologies and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -30,7 +30,6 @@ services: ports: - "8181:8181" - "8101:8101" -#entrypoint: ["/bin/bash", "/opt/onap/sdnc/bin/startODL.oom.sh"] environment: - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties - ODL_CERT_DIR=${ODL_CERT_DIR} @@ -42,6 +41,8 @@ services: - SDNRINIT=true - SDNRONLY=true - SDNRDBURL=http://sdnrdb:9200 + - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD} + - JAVA_OPTS=-Xms256m -Xmx2g volumes: - ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties @@ -148,4 +149,4 @@ networks: driver: default config: - subnet: ${NETWORK_SUBNET} - gateway: ${GATEWAY_IP} \ No newline at end of file + gateway: ${GATEWAY_IP} diff --git a/solution/integration/smo/vesc/collector.properties b/solution/integration/smo/vesc/collector.properties index 6f40eb7..ea4e2ac 100644 --- a/solution/integration/smo/vesc/collector.properties +++ b/solution/integration/smo/vesc/collector.properties @@ -1,3 +1,8 @@ +############################################################################### +## +## Collector Server config +## +## - Default values are shown as commented settings. ## ############################################################################### ## @@ -12,6 +17,7 @@ ## ## #collector.service.port=8080 + ## Authentication is only supported via secure port ## When enabled - require valid keystore defined collector.service.secure.port=8443 @@ -42,12 +48,25 @@ collector.truststore.passwordfile=etc/trustpasswordfile ## default no validation checkflag (-1) ## If enabled (1) - schemafile location must be specified collector.schema.checkflag=1 -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.1.1.json\"} +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.1_ONAP.json\"} + +## Schema StndDefinedFields Validation checkflag +## default no validation checkflag (-1) +## If enabled (1) - schema files locations must be specified, mapping file path must be specified, schema reference path +## in event json must be specified, path to stndDefined data field in event json must be specified +collector.externalSchema.checkflag=1 +collector.externalSchema.schemasLocation=./etc/externalRepo/ +collector.externalSchema.mappingFileLocation=./etc/externalRepo/schema-map.json +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 +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 +## Path to the file containing description of api versions +collector.description.api.version.location=etc/api_version_description.json + ## Event transformation Flag - when set expects configurable transformation ## defined under ./etc/eventTransform.json ## Enabled by default; to disable set to 0 -- 2.16.6