diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/development/config-dmaap.sh | 8 | ||||
| -rw-r--r-- | tools/development/dr-mount/node.properties | 9 | ||||
| -rw-r--r-- | tools/development/dr-mount/provserver.properties | 6 | ||||
| -rw-r--r-- | tools/development/resources/addSubscriber.json | 5 | ||||
| -rw-r--r-- | tools/development/resources/mount_config.yaml | 2 | ||||
| -rwxr-xr-x | tools/development/send-meas-collec.sh | 2 | ||||
| -rwxr-xr-x | tools/development/send-meas-data.sh | 2 | ||||
| -rwxr-xr-x | tools/development/subscribe-pm-mapper.sh | 4 |
8 files changed, 20 insertions, 18 deletions
diff --git a/tools/development/config-dmaap.sh b/tools/development/config-dmaap.sh index a06d883..7b3a807 100755 --- a/tools/development/config-dmaap.sh +++ b/tools/development/config-dmaap.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. @@ -29,8 +29,8 @@ for i in $(seq 10); do done # Data Router Configuration. -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP" -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$GATEWAY_IP" +docker exec -i datarouter-prov sh -c "curl -X PUT http://$DR_PROV_IP:8080/internal/api/NODES?val=dmaap-dr-node\|$GATEWAY_IP" +docker exec -i datarouter-prov sh -c "curl -X PUT http://$DR_PROV_IP:8080/internal/api/PROV_AUTH_ADDRESSES?val=dmaap-dr-prov\|$GATEWAY_IP" # Create PM Mapper feed on data router -curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @./resources/createFeed.json --post301 --location-trusted -k https://localhost:8443 +curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.feed" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @./resources/createFeed.json --post301 --location-trusted -k http://localhost:8080 diff --git a/tools/development/dr-mount/node.properties b/tools/development/dr-mount/node.properties index ddd4ebc..dd796e7 100644 --- a/tools/development/dr-mount/node.properties +++ b/tools/development/dr-mount/node.properties @@ -3,6 +3,7 @@ # * org.onap.dmaap # * =========================================================================== # * Copyright � 2017 AT&T Intellectual Property. All rights reserved. +# * Copyright (C) 2022 Nokia Intellectual Property # * =========================================================================== # * Licensed under the Apache License, Version 2.0 (the "License"); # * you may not use this file except in compliance with the License. @@ -24,10 +25,10 @@ # Configuration parameters set at startup for the DataRouter node # # URL to retrieve dynamic configuration -ProvisioningURL = https://dmaap-dr-prov:8443/internal/prov +ProvisioningURL = http://dmaap-dr-prov:8080/internal/prov # # URL to upload PUB/DEL/EXP logs -LogUploadURL = https://dmaap-dr-prov:8443/internal/logs +LogUploadURL = http://dmaap-dr-prov:8080/internal/logs # # The port number for http as seen within the server IntHttpPort = 8080 @@ -84,4 +85,6 @@ AAFAction = publish CadiEnabled = false # # AAF Props file path -AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props
\ No newline at end of file +AAFPropsFilePath = /opt/app/osaaf/local/org.onap.dmaap-dr.props + +TlsEnabled = false diff --git a/tools/development/dr-mount/provserver.properties b/tools/development/dr-mount/provserver.properties index e242991..8caa52a 100644 --- a/tools/development/dr-mount/provserver.properties +++ b/tools/development/dr-mount/provserver.properties @@ -3,6 +3,7 @@ # * org.onap.dmaap # * =========================================================================== # * Copyright � 2017 AT&T Intellectual Property. All rights reserved. +# * Copyright (C) 2022 Nokia Intellectual Property # * =========================================================================== # * Licensed under the Apache License, Version 2.0 (the "License"); # * you may not use this file except in compliance with the License. @@ -23,7 +24,9 @@ #Jetty Server properties org.onap.dmaap.datarouter.provserver.http.port = 8080 +org.onap.dmaap.datarouter.nodeserver.http.port = 8080 org.onap.dmaap.datarouter.provserver.https.port = 8443 +org.onap.dmaap.datarouter.nodeserver.https.port = 8443 org.onap.dmaap.datarouter.provserver.https.relaxation = true org.onap.dmaap.datarouter.provserver.aafprops.path = /opt/app/osaaf/local/org.onap.dmaap-dr.props @@ -36,6 +39,7 @@ org.onap.dmaap.datarouter.provserver.logretention = 30 #DMAAP-597 (Tech Dept) REST request source IP auth # relaxation to accommodate OOM kubernetes deploy org.onap.dmaap.datarouter.provserver.isaddressauthenabled = false +org.onap.dmaap.datarouter.provserver.tlsenabled = false #Localhost address config org.onap.dmaap.datarouter.provserver.localhost = 127.0.0.1 @@ -57,4 +61,4 @@ org.onap.dmaap.datarouter.provserver.aaf.feed.type = org.onap.dmaap-dr.fe org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub org.onap.dmaap.datarouter.provserver.aaf.instance = legacy org.onap.dmaap.datarouter.provserver.aaf.action.publish = publish -org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe
\ No newline at end of file +org.onap.dmaap.datarouter.provserver.aaf.action.subscribe = subscribe diff --git a/tools/development/resources/addSubscriber.json b/tools/development/resources/addSubscriber.json index 4892251..0e60951 100644 --- a/tools/development/resources/addSubscriber.json +++ b/tools/development/resources/addSubscriber.json @@ -9,11 +9,6 @@ "metadataOnly": false, "suspend": false, "groupid": 0, - "links": { - "self": "https://dmaap-dr-prov/subscribe/1", - "log": "https://dmaap-dr-prov/feedlog/1", - "feed": "https://dmaap-dr-prov/feed/1" - }, "subscriber": "pmmapper", "decompress": true, "privilegedSubscriber": true diff --git a/tools/development/resources/mount_config.yaml b/tools/development/resources/mount_config.yaml index 8ca551a..59b7387 100644 --- a/tools/development/resources/mount_config.yaml +++ b/tools/development/resources/mount_config.yaml @@ -12,7 +12,7 @@ key_store_path: "/opt/app/pm-mapper/etc/certs/cert.jks" key_store_pass_path: "/opt/app/pm-mapper/etc/certs/jks.pass" trust_store_path: "/opt/app/pm-mapper/etc/certs/trust.jks" trust_store_pass_path: "/opt/app/pm-mapper/etc/certs/trust.pass" -dmaap_dr_delete_endpoint: "https://dmaap-dr-node:8443/delete" +dmaap_dr_delete_endpoint: "http://dmaap-dr-node:8080/delete" dmaap_dr_feed_name: "1" aaf_identity: "aaf_admin@people.osaaf.org" aaf_password: "demo123456!" diff --git a/tools/development/send-meas-collec.sh b/tools/development/send-meas-collec.sh index 75ef119..6f70bd7 100755 --- a/tools/development/send-meas-collec.sh +++ b/tools/development/send-meas-collec.sh @@ -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 --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 +docker exec -it files-publisher curl --post301 --location-trusted -v -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}" http://dmaap-dr-prov:8080/publish/1/Apm_TEST_REQUEST.xml.gz diff --git a/tools/development/send-meas-data.sh b/tools/development/send-meas-data.sh index 1462ea4..7c1a77b 100755 --- a/tools/development/send-meas-data.sh +++ b/tools/development/send-meas-data.sh @@ -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 --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 +docker exec -it files-publisher curl --post301 --location-trusted -v -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}" http://dmaap-dr-prov:8080/publish/1/Apm_TEST_REQUEST.xml.gz diff --git a/tools/development/subscribe-pm-mapper.sh b/tools/development/subscribe-pm-mapper.sh index bbc775e..1b8a532 100755 --- a/tools/development/subscribe-pm-mapper.sh +++ b/tools/development/subscribe-pm-mapper.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. @@ -18,4 +18,4 @@ source ./env/containers_ip # PM Mapper subscriber on data router -curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @./resources/addSubscriber.json --post301 --location-trusted -k https://localhost:8443/subscribe/1 +curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @./resources/addSubscriber.json --post301 --location-trusted -k http://localhost:8080/subscribe/1 |