enable sdnr csit

enable sdnr testplan

Issue-ID: SDNC-1794
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I8ce091fa6305c8b856d26ba86abc6a3db67dccc3
Signed-off-by: demskeq8 <alexander.dehn@highstreet-technologies.com>
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

Former-commit-id: 544da6ee98136c6949fc1a600e687f047d5a8ffa

6 files changed, 94 insertions, 33 deletions

diff --git a/csit/scripts/sdnr/docker-compose/.env b/csit/scripts/sdnr/docker-compose/.env
index fbe74215..e75351ae 100644
--- a/csit/scripts/sdnr/docker-compose/.env
+++ b/csit/scripts/sdnr/docker-compose/.env
@@ -20,6 +20,7 @@ SDN_CONTROLLER_PROTOCOL="http"
 SDNR_IP=172.40.0.21
 SDNRPORT=8181
 SDNR_DM=true
+SDNR_WEBSOCKET_PORT=8182
 
 # sdnrdb
 ES_VERSION=7.9.3
@@ -35,7 +36,7 @@ SDNC_WEB_PORT=8282
 
 
 # onap dependent components
-VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.8.0
+VESC_IMAGE=nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.10.3
 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
diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-onap-addons.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-onap-addons.yaml
index f931450b..e4e80a6e 100644
--- a/csit/scripts/sdnr/docker-compose/docker-compose-onap-addons.yaml
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-onap-addons.yaml
@@ -84,6 +84,9 @@ services:
       - "8443:8443"
     volumes:
       - ./vesc/collector.properties:/opt/app/VESCollector/etc/collector.properties
+      - ./vesc/ves-dmaap-config.json:/opt/app/VESCollector/etc/ves-dmaap-config.json
+      - ./vesc/externalRepo:/opt/app/VESCollector/etc/externalRepo
+
     networks:
       integration:
         ipv4_address: ${VESCOLLECTOR_IP}
diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
index b7c7e7b7..6b8d4648 100644
--- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
+++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml
@@ -6,6 +6,7 @@ services:
     ports:
       - "8181:8181"
       - "8101:8101"
+      - "${SDNR_WEBSOCKET_PORT}:${SDNR_WEBSOCKET_PORT}"
 #entrypoint: ["/bin/bash", "/opt/onap/sdnc/bin/startODL.oom.sh"]
     environment:
       - SDNC_CONFIG_DIR=/opt/onap/ccsdk/data/properties
@@ -19,6 +20,7 @@ services:
       - SDNRINIT=true
       - SDNRONLY=true
       - JAVA_OPTS=-Xms256m -Xmx2g
+      - SDNR_WEBSOCKET_PORT=${SDNR_WEBSOCKET_PORT}
     volumes:
       - ./sdnr/mountpoint-registrar.properties:/opt/opendaylight/etc/mountpoint-registrar.properties
       - ./sdnr/certs/certs.properties:${ODL_CERT_DIR}/certs.properties
diff --git a/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties b/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties
index df0b562e..87802fb0 100644
--- a/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties
+++ b/csit/scripts/sdnr/docker-compose/sdnr/mountpoint-registrar.properties
@@ -1,43 +1,44 @@
 [general]
-dmaapEnabled=true
 baseUrl=http://localhost:8181
 sdnrUser=admin
 sdnrPasswd=${ODL_ADMIN_PASSWORD}
 
+[strimzi-kafka]
+strimziEnabled=true
+bootstrapServers=kafka:9092
+securityProtocol=PLAINTEXT
+saslMechanism=PLAIN
+saslJaasConfig=PLAIN
+
+
 [fault]
-TransportType=HTTPNOAUTH
-Protocol=http
-username=${DMAAP_FAULT_TOPIC_USERNAME}
-password=${DMAAP_FAULT_TOPIC_PASSWORD}
-host=onap-dmaap:3904
 topic=unauthenticated.SEC_FAULT_OUTPUT
-contenttype=application/json
-group=myG
-id=C1
+consumerGroup=myG
+consumerID=C1
+timeout=20000
+limit=10000
+fetchPause=5000
+
+[provisioning]
+topic=unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
+consumerGroup=myG
+consumerID=C1
 timeout=20000
 limit=10000
 fetchPause=5000
-jersey.config.client.readTimeout=25000
-jersey.config.client.connectTimeout=25000
-jersey.config.client.proxy.username=${HTTP_PROXY_USERNAME}
-jersey.config.client.proxy.password=${HTTP_PROXY_PASSWORD}
-jersey.config.client.proxy.uri=${HTTP_PROXY_URI}
 
 [pnfRegistration]
-TransportType=HTTPNOAUTH
-Protocol=http
-username=${DMAAP_PNFREG_TOPIC_USERNAME}
-password=${DMAAP_PNFREG_TOPIC_PASSWORD}
-host=onap-dmaap:3904
 topic=unauthenticated.VES_PNFREG_OUTPUT
-contenttype=application/json
-group=myG
-id=C1
+consumerGroup=myG
+consumerID=C1
+timeout=20000
+limit=10000
+fetchPause=5000
+
+[stndDefinedFault]
+topic=unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
+consumerGroup=myG
+consumerID=C1
 timeout=20000
 limit=10000
 fetchPause=5000
-jersey.config.client.readTimeout=25000
-jersey.config.client.connectTimeout=25000
-jersey.config.client.proxy.username=${HTTP_PROXY_USERNAME}
-jersey.config.client.proxy.password=${HTTP_PROXY_PASSWORD}
-jersey.config.client.proxy.uri=${HTTP_PROXY_URI}
\ No newline at end of file
diff --git a/csit/scripts/sdnr/docker-compose/vesc/collector.properties b/csit/scripts/sdnr/docker-compose/vesc/collector.properties
index fd9bce5c..fff480cd 100644
--- a/csit/scripts/sdnr/docker-compose/vesc/collector.properties
+++ b/csit/scripts/sdnr/docker-compose/vesc/collector.properties
@@ -6,8 +6,6 @@
 ##
 ###############################################################################
 ##
-###############################################################################
-##
 ## HTTP(S) service
 ##
 ##      Normally:
@@ -19,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
@@ -51,14 +50,27 @@ collector.truststore.passwordfile=etc/trustpasswordfile
 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.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.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|o1-notify-pnf-registration=ves-o1-notify-pnf-registration
+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
 
 ## Event transformation Flag - when set expects configurable transformation
 ## defined under ./etc/eventTransform.json
 ## Enabled by default; to disable set to 0
-event.transform.flag=1
+event.transform.flag=0
 
 # Describes at what frequency (measured in minutes) should application try to fetch config from CBS
 collector.dynamic.config.update.frequency=5
diff --git a/csit/scripts/sdnr/docker-compose/vesc/ves-dmaap-config.json b/csit/scripts/sdnr/docker-compose/vesc/ves-dmaap-config.json
new file mode 100644
index 00000000..c928ee55
--- /dev/null
+++ b/csit/scripts/sdnr/docker-compose/vesc/ves-dmaap-config.json
@@ -0,0 +1,42 @@
+{
+    "ves-pnfRegistration": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_PNFREG_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-3gpp-fault-supervision": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-notification": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-3gpp-heartbeat": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-3gpp-performance-assurance": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-3gpp-provisioning": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-fault": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_FAULT_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-heartbeat": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-other": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.SEC_OTHER_OUTPUT"},
+        "type": "message_router"
+    },
+    "ves-measurement": {
+        "dmaap_info": {"topic_url": "http://onap-dmaap:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"},
+        "type": "message_router"
+    }
+}