From 22c42c557015b9a6760d9ed666c36ffd5fc26a6a Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Tue, 29 Mar 2022 17:52:14 +0200 Subject: Bump DR version in CSIT to 2.1.11 Issue-ID: DCAEGEN2-3127 Signed-off-by: Tomasz Wrobel Change-Id: I40c3958e90d38efc5e04e4930631da705026e9ff --- csit/plans/filesprocessingconfigpmmapper/docker-compose.yml | 4 ++-- csit/plans/pmmapper/docker-compose.yml | 4 ++-- tools/development/docker-compose.yml | 4 ++-- tools/development/send-meas-collec.sh | 4 ++-- tools/development/send-meas-data.sh | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml index e343233..2606b1e 100644 --- a/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml +++ b/csit/plans/filesprocessingconfigpmmapper/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.11 container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -26,7 +26,7 @@ services: - "dcae-pm-mapper:$PMMAPPER_IP" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.11 container_name: datarouter-node hostname: dmaap-dr-node ports: diff --git a/csit/plans/pmmapper/docker-compose.yml b/csit/plans/pmmapper/docker-compose.yml index b3c59b6..8a7e06d 100644 --- a/csit/plans/pmmapper/docker-compose.yml +++ b/csit/plans/pmmapper/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.11 container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -28,7 +28,7 @@ services: - "dcae-pm-mapper:$PMMAPPER_IP" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.11 container_name: datarouter-node hostname: dmaap-dr-node ports: diff --git a/tools/development/docker-compose.yml b/tools/development/docker-compose.yml index 86334a7..3ac9b0a 100644 --- a/tools/development/docker-compose.yml +++ b/tools/development/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.1.11 container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -26,7 +26,7 @@ services: - "dcae-pm-mapper:$PMMAPPER_IP" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.10-STAGING-latest + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.1.11 container_name: datarouter-node hostname: dmaap-dr-node ports: diff --git a/tools/development/send-meas-collec.sh b/tools/development/send-meas-collec.sh index 3358eda..75ef119 100755 --- a/tools/development/send-meas-collec.sh +++ b/tools/development/send-meas-collec.sh @@ -1,6 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# Copyright (C) 2021 NOKIA +# Copyright (C) 2021-2022 NOKIA # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,6 @@ PUBLISH_FILE_NAME=$1 MEAS_COLLEC_META_DATA_HEADER="X-DMAAP-DR-META:{\"productName\":\"gnb\",\"vendorName\":\"Nokia\",\"lastEpochMicrosec\":\"1538478000000\",\"sourceName\":\"oteNB5309\",\"startEpochMicrosec\":\"1538478900000\",\"timeZoneOffset\":\"UTC+05.00\",\"location\":\"ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz\",\"compression\":\"gzip\",\"fileFormatType\":\"org.3GPP.32.435#measCollec\",\"fileFormatVersion\":\"V9\"}" -docker exec -it files-publisher curl -v -L -k -X PUT -H "Content-Type:application/octet-stream" -H "X-ONAP-RequestID:X-ONAP-RequestID=15" -H "${MEAS_COLLEC_META_DATA_HEADER}" -H "X-DMAAP-DR-ON-BEHALF-OF:pm-mapper" -H "Authorization:Basic cG1tYXBwZXI6cG1tYXBwZXI=" --data-binary @"/files/${PUBLISH_FILE_NAME}" https://dmaap-dr-node:8443/publish/1/Apm_TEST_REQUEST.xml.gz +docker exec -it files-publisher curl --post301 --location-trusted -v -k -X PUT -H "Content-Type:application/octet-stream" -H "X-ONAP-RequestID:X-ONAP-RequestID=15" -H "${MEAS_COLLEC_META_DATA_HEADER}" -H "X-DMAAP-DR-ON-BEHALF-OF:pm-mapper" -H "Authorization:Basic cG1tYXBwZXI6cG1tYXBwZXI=" --data-binary @"/files/${PUBLISH_FILE_NAME}" https://dmaap-dr-node:8443/publish/1/Apm_TEST_REQUEST.xml.gz diff --git a/tools/development/send-meas-data.sh b/tools/development/send-meas-data.sh index 79e0939..1462ea4 100755 --- a/tools/development/send-meas-data.sh +++ b/tools/development/send-meas-data.sh @@ -1,6 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# Copyright (C) 2021 NOKIA +# Copyright (C) 2021-2022 NOKIA # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,6 +17,6 @@ PUBLISH_FILE_NAME=$1 MEAS_DATA_META_DATA_HEADER="X-DMAAP-DR-META:{\"productName\":\"gnb\",\"vendorName\":\"Nokia\",\"lastEpochMicrosec\":\"1538478000000\",\"sourceName\":\"oteNB5309\",\"startEpochMicrosec\":\"1538478900000\",\"timeZoneOffset\":\"UTC+05.00\",\"location\":\"ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz\",\"compression\":\"gzip\",\"fileFormatType\":\"org.3GPP.28.532#measData\",\"fileFormatVersion\":\"V9\"}" -docker exec -it files-publisher curl -v -L -k -X PUT -H "Content-Type:application/octet-stream" -H "X-ONAP-RequestID:X-ONAP-RequestID=15" -H "${MEAS_DATA_META_DATA_HEADER}" -H "X-DMAAP-DR-ON-BEHALF-OF:pm-mapper" -H "Authorization:Basic cG1tYXBwZXI6cG1tYXBwZXI=" --data-binary @"/files/${PUBLISH_FILE_NAME}" https://dmaap-dr-node:8443/publish/1/Apm_TEST_REQUEST.xml.gz +docker exec -it files-publisher curl --post301 --location-trusted -v -k -X PUT -H "Content-Type:application/octet-stream" -H "X-ONAP-RequestID:X-ONAP-RequestID=15" -H "${MEAS_DATA_META_DATA_HEADER}" -H "X-DMAAP-DR-ON-BEHALF-OF:pm-mapper" -H "Authorization:Basic cG1tYXBwZXI6cG1tYXBwZXI=" --data-binary @"/files/${PUBLISH_FILE_NAME}" https://dmaap-dr-node:8443/publish/1/Apm_TEST_REQUEST.xml.gz -- cgit 1.2.3-korg