diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2019-04-04 00:49:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-04 00:49:17 +0000 |
| commit | 82ca043a58fe62d9d3e17139f8a6d772b5f9fb5a (patch) | |
| tree | 75e3a2c84a85cfaa563a49f11724e610e04c8037 | |
| parent | 999743afc44f44a1a0dce38dd1ddc15a7655ab7d (diff) | |
| parent | 37452e4b088d18cdd47e8c85628b86d95db390f2 (diff) | |
Merge "Added support for publishing PM Mapper"
14 files changed, 234 insertions, 270 deletions
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json new file mode 100644 index 00000000..43a4a65c --- /dev/null +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json @@ -0,0 +1,20 @@ +{ + "delivery":{ + "url":"http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery", + "user":"username", + "password":"password", + "use100":true + }, + "follow_redirect":false, + "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 + }
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json index 79b32012..62e4f402 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json @@ -7,10 +7,10 @@ "aaf_password": null, "dmaap_info": { "location": "csit-pmmapper", - "delivery_url": "http://3gpppmmapper:8081/delivery", + "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery", "username": "username", "password": "password", - "subscriber_id": "subscriber_id" + "subscriber_id": "1" } } }, @@ -19,7 +19,7 @@ "type": "message_router", "aaf_password": null, "dmaap_info": { - "topic_url": "http://message-router:3904/events/topic.org.onap.dmaap.mr.test1", + "topic_url": "http://message-router:3904/events/PM_MAPPER", "client_role": "org.onap.dmaap.mr.topic", "location": "csit-pmmapper", "client_id": null @@ -27,8 +27,13 @@ "aaf_username": null } }, - "dmaap_dr_feed_id": "1", - "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", - "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete", - "services_calls": {} + "dmaap_dr_feed_name": "1", + "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", + "services_calls": {}, + "enable_http": true, + "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64", + "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass", + "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64", + "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass" + }
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json new file mode 100644 index 00000000..f93633dc --- /dev/null +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json @@ -0,0 +1,18 @@ +{ + "name": "PM Mapper Feed", + "version": "m1.0", + "description": "PM Mapper Feed", + "business_description": "PM Mapper", + "suspend": false, + "deleted": false, + "changeowner": true, + "authorization": { + "classification": "unclassified", + "endpoint_addrs": [], + "endpoint_ids": [ + { + "password": "pmmapper", + "id": "pmmapper" + }] + } + }
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json new file mode 100644 index 00000000..c1a296dc --- /dev/null +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json @@ -0,0 +1,5 @@ +{ + "topicName":"PM_MAPPER", + "topicDescription":"PM Mapper VES Event", + "owner":"pmmapper" +}
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf b/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf deleted file mode 100644 index 6ec13797..00000000 --- a/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf +++ /dev/null @@ -1,7 +0,0 @@ -# environment settings for Dmaap Bus Controller Integration Test. -DMAAPBC_INT_HTTPS_PORT=8443 -DMAAPBC_INSTANCE_NAME=ONAP-CSIT -DMAAPBC_MR_CNAME=DMAAPMR -DMAAPBC_DRPROV_FQDN=DMAAPDR -DMAAPBC_CSIT=Yes -DMAAPBC_PG_ENABLED=false
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml index 99361d40..c972bd7a 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml +++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml @@ -1,7 +1,7 @@ version: '2.1' services: datarouter-prov: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.0.1 + image: nexus3.onap.org:10001/onap/dmaap/datarouter-prov:2.0.2-SNAPSHOT-latest container_name: datarouter-prov hostname: dmaap-dr-prov ports: @@ -20,9 +20,12 @@ services: interval: 10s timeout: 10s retries: 5 + extra_hosts: + - "dmaap-dr-node:1.1.1.1" + - "dcae-pm-mapper.onap.svc.cluster.local:3.3.3.3" datarouter-node: - image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.1 + image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.2-SNAPSHOT-latest container_name: datarouter-node hostname: dmaap-dr-node ports: @@ -33,6 +36,9 @@ services: depends_on: datarouter-prov: condition: service_healthy + extra_hosts: + - "dmaap-dr-prov:2.2.2.2" + - "dcae-pm-mapper.onap.svc.cluster.local:3.3.3.3" mariadb_container: image: mariadb:10.2.14 @@ -58,18 +64,4 @@ services: container_name: cbs image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding.app-app:latest environment: - CONSUL_HOST: - - buscontroller: - container_name: buscontroller - image: nexus3.onap.org:10001/onap/dmaap/dmaap-bc:latest - ports: - - "18080:8080" - - "18443:8443" - extra_hosts: - - "dmaap-dr-prov:DMAAPDR" - - "message-router:DMAAPMR" - volumes: - - /tmp/docker-databus-controller.conf:/opt/app/config/conf - depends_on: - - datarouter-prov
\ No newline at end of file + CONSUL_HOST:
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml index a7f5b973..bf03d1f1 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml +++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml @@ -2,7 +2,7 @@ version: '2.1' services: pmmapper: container_name: pmmapper - image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper + image: dfarrelly/onap:csit ports: - "8081:8081" environment: @@ -10,6 +10,5 @@ services: CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000 HOSTNAME: pmmapper extra_hosts: - - "dmaap-bc:BUSIP" - - "dmaap-dr-node:DRNODEIP" - - "message-router:DMAAPMRIP" + - "dmaap-dr-node:1.1.1.1" + - "message-router:4.4.4.4" diff --git a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh b/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh deleted file mode 100755 index 14302589..00000000 --- a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/bash -# $1 is the IP address of the buscontroller - -# INITIALIZE: dmaap object -echo $'\nInitializing /dmaap endpoint' -JSON=/tmp/dmaap.json -cat << EOF > $JSON -{ -"version": "1", -"topicNsRoot": "topic.org.onap.dmaap", -"drProvUrl": "https://dmaap-dr-prov:8443", -"dmaapName": "mr", -"bridgeAdminTopic": "MM_AGENT_PROV" - -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap - -# INITIALIZE: dcaeLocation object -echo $'\nInitializing /dcaeLocations endpoint' -JSON=/tmp/dcaeLocation.json -cat << EOF > $JSON -{ -"dcaeLocationName": "csit-pmmapper", -"dcaeLayer": "central-cloud", -"clli": "CSIT", -"zone": "zoneA" -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dcaeLocations - -# INITIALIZE: MR object in 1 site -echo $'\nInitializing /mr_clusters endpoint' -DMAAP=$(docker ps -a -q --filter="name=dmaap_1") -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -JSON=/tmp/mr.json -cat << EOF > $JSON -{ -"dcaeLocationName": "csit-pmmapper", -"fqdn": "${DMAAP_MR_IP}", -"topicProtocol" : "http", -"topicPort": "3904" -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clusters - -# CREATING: DR feed -echo $'\nInitializing /feeds endpoint' -JSON=/tmp/feed.json -cat << EOF > $JSON -{ -"feedName":"pmmapper", -"feedVersion": "1", -"feedDescription":"PM Mapper Feed", -"owner":"bulkpm", -"asprClassification": "unclassified", -"pubs": [ - { - "dcaeLocationName": "csit-pmmapper", - "feedId": "1", - "lastMod": "2015-01-01T15:00:00.000Z", - "pubId": "10", - "status": "EMPTY", - "username": "pmmapper", - "userpwd": "pmmapper" - } - ] -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/feeds - -# CREATING: MR Topic -echo $'\nInitializing /topic endpoint' -JSON=/tmp/topic.json -cat << EOF > $JSON -{ -"topicName":"test1", -"topicDescription":"PM Mapper - VES Event", -"owner":"pmmapper" -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/topics - -# CREATING: MR Client -echo $'\nInitializing /mr_clients endpoint' -JSON=/tmp/mrclients.json -cat << EOF > $JSON -{ -"fqtn": "topic.org.onap.dmaap.mr.test1", -"dcaeLocationName": "csit-pmmapper", -"clientRole": "org.onap.dmaap.mr.topic", -"action": [ "pub", "view" ] -} -EOF -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clients -sleep 5
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/setup.sh b/plans/dcaegen2-pmmapper/pmmapper/setup.sh index 18d82373..5a0339ea 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh @@ -18,20 +18,6 @@ ZOOKEEPER=$(docker ps -a -q --filter="name=zookeeper_1") KAFKA=$(docker ps -a -q --filter="name=kafka_1") DMAAP=$(docker ps -a -q --filter="name=dmaap_1") -# Wait for initialization of Docker contaienr for DMaaP MR, Kafka and Zookeeper -for i in {1..10}; do -if [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \ -[ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ] -then - echo "DMaaP Service Running" - break -else - echo sleep $i - sleep $i -fi -done - # Get IP address of KAFKA, Zookeeper KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA) ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER) @@ -51,7 +37,7 @@ sleep 5 # Get IP address of DMAAP Message Router. DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -# Clone DMaaP Data Router repo and Initialization of Data Router, Consul, Config Binding Service and Buscontroller +# Clone DMaaP Data Router repo and Initialization of Data Router, Consul, Config Binding Service mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master @@ -59,13 +45,10 @@ cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/res mkdir docker-compose cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose/docker-compose.yml -cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf /tmp/ -sed -i 's/DMAAPMR/'$DMAAP_MR_IP'/g' /tmp/docker-databus-controller.conf docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d echo "Disregard the message ERROR: for datarouter-node Container 1234456 is unhealthy, this is expected behaiour at this stage" -docker kill datarouter-prov -docker kill datarouter-node +sleep 10 docker kill cbs CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul ) sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml @@ -73,46 +56,13 @@ MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddre sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/prov_data/provserver.properties docker-compose up -d DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) -docker kill buscontroller -sed -i 's/DMAAPDR/'$DR_PROV_IP'/g' docker-compose.yml -sed -i 's/DMAAPMR/'$DMAAP_MR_IP'/g' docker-compose.yml -docker-compose up -d -sed -i 's/DMAAPDR/'$DR_PROV_IP'/g' /tmp/docker-databus-controller.conf - -# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS, Buscontroller -for i in {1..10}; do - if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' buscontroller) ] - then - echo "Data Router, Consul, Config Binding Service, Buscontroller Services Running" - break - else - echo sleep $i - sleep $i - fi -done -sleep 15 -# Data Router Configuration. DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) -DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) -docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_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\|$DR_GATEWAY_IP" -docker exec datarouter-prov /bin/sh -c "echo '${DR_NODE_IP}' dmaap-dr-node >> /etc/hosts" -docker exec datarouter-node /bin/sh -c "echo '${DR_PROV_IP}' dmaap-dr-prov >> /etc/hosts" - -# Bus Controller Configuration -DMAAPBC_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' buscontroller) -$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh ${DMAAPBC_IP} # Consul Configuration for PM Mapper cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/cbs.json /tmp/cbs.json sed -i 's/ipaddress/'${CBS_IP}'/g' /tmp/cbs.json curl --request PUT --data @/tmp/cbs.json http://$CONSUL_IP:8500/v1/agent/service/register -curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/config.json +curl 'http://'$CONSUL_IP':8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/json' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/config.json # PM Mapper startup and configuration mkdir /tmp/docker-compose @@ -120,31 +70,58 @@ cd /tmp/docker-compose cp $WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml /tmp/docker-compose/docker-compose.yml CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs) sed -i 's/CBSIP/'$CBS_IP'/g' docker-compose.yml -sed -i 's/BUSIP/'$DMAAPBC_IP'/g' docker-compose.yml -sed -i 's/DRNODEIP/'$DR_NODE_IP'/g' docker-compose.yml -sed -i 's/DMAAPMRIP/'$DMAAP_MR_IP'/g' docker-compose.yml +sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml +sed -i 's/4.4.4.4/'$DMAAP_MR_IP'/g' docker-compose.yml docker-compose up -d -# Wait for initialization of Docker container for 3GPP PM Mapper -for i in {1..10}; do - if [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ] +cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources/docker-compose +PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) +docker kill datarouter-node +docker kill datarouter-prov +sed -i 's/1.1.1.1/'$DR_NODE_IP'/g' docker-compose.yml +sed -i 's/2.2.2.2/'$DR_PROV_IP'/g' docker-compose.yml +sed -i 's/3.3.3.3/'$PMMAPPER_IP'/g' docker-compose.yml +docker-compose up -d + +# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS +for i in {1..5}; do + if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' mariadb) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' pmmapper) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' $KAFKA) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' $ZOOKEEPER) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' $DMAAP) ] then - echo "PM Mapper Service Running" + echo "Message Router, Data Router, Consul, Config Binding Service Running and PM Mapper services are running healthy" break else echo sleep $i sleep $i fi done +# Data Router Configuration. +DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) +DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) +docker exec -i datarouter-prov sh -c "curl -k -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=dmaap-dr-node\|$DR_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\|$DR_GATEWAY_IP" + +# Create PM Mapper feed and create PM Mapper subscriber 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 @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443 +curl -v -X POST -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:pmmapper" --data-ascii @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json --post301 --location-trusted -k https://${DR_PROV_IP}:8443/subscribe/1 + +# Create PM Mapper tocic in Message Router +curl -v -X POST http://${DMAAP_MR_IP}:3904/topics/create -d @$WORKSPACE/plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json -H "Content-Type: application/json" PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) -docker exec datarouter-prov /bin/sh -c "echo '${PMMAPPER_IP}' 3gpppmmapper >> /etc/hosts" -docker exec datarouter-node /bin/sh -c "echo '${PMMAPPER_IP}' 3gpppmmapper >> /etc/hosts" -sleep 10 docker exec pmmapper /bin/sh -c "cat /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" > /tmp/pmmapper.log cat /tmp/pmmapper.log -docker exec buscontroller /bin/sh -c "cat /opt/app/dmaapbc/logs/ONAP/application.log" +docker exec -it datarouter-prov sh -c "curl http://dmaap-dr-node:8080/internal/fetchProv" +sleep 10 curl -k https://$DR_PROV_IP:8443/internal/prov -curl http://${DMAAP_MR_IP}:3904/events/topic.org.onap.dmaap.mr.test1/CG1/C1?timeout=1000 +curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v DMAAP_MR_IP:${DMAAP_MR_IP} -v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAPBC_IP:${DMAAPBC_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v CONSUL_IP:${CONSUL_IP} -v DR_PROV_IP:${DR_PROV_IP} -v DMAAP_MR_IP:${DMAAP_MR_IP} -v CBS_IP:${CBS_IP} -v PMMAPPER_IP:${PMMAPPER_IP} -v DR_NODE_IP:${DR_NODE_IP}" +export ROBOT_VARIABLES
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh index bcbcffff..45ef0d93 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh @@ -9,5 +9,4 @@ kill-instance.sh datarouter-prov kill-instance.sh mariadb kill-instance.sh cbs kill-instance.sh consul -kill-instance.sh buscontroller kill-instance.sh pmmapper
\ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml b/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml new file mode 100644 index 00000000..b6a3b436 --- /dev/null +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml @@ -0,0 +1,49 @@ +<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"> + <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" + fileFormatVersion="32.435 V10.0"> + <fileSender localDn="Dublin"/> + <measCollec beginTime="2018-10-02T12:00:00+01:00"/> + </fileHeader> + <measData> + <managedElement swVersion="r0.1" localDn="Dublin1"/> + <measInfo measInfoId="measInfoId1"> + <job jobId="jobId1"/> + <granPeriod endTime="2001-10-02T12:15:00Z" duration="PT100S"/> + <repPeriod duration="PT100S"/> + <measTypes>z1 a1 zz1 b1</measTypes> + <measValue measObjLdn="objLdn"> + <measResults>1 11 111 1111</measResults> + <suspect>false</suspect> + </measValue> + </measInfo> + </measData> + <measData> + <managedElement swVersion="r0.2" localDn="Dublin2"/> + <measInfo measInfoId="measInfoId2"> + <job jobId="jobId"/> + <granPeriod endTime="2002-10-02T12:15:00Z" duration="PT200S"/> + <repPeriod duration="PT200S"/> + <measTypes>z2 a2 zz2 b2</measTypes> + <measValue measObjLdn="objLdn"> + <measResults>2 22 222 2222</measResults> + <suspect>false</suspect> + </measValue> + </measInfo> + </measData> + <measData> + <managedElement swVersion="r0.3" localDn="Dublin3"/> + <measInfo measInfoId="measInfoId3"> + <job jobId="jobId"/> + <granPeriod endTime="2003-10-02T12:15:00Z" duration="PT300S"/> + <repPeriod duration="PT300S"/> + <measTypes>z3 a3 zz3 b3</measTypes> + <measValue measObjLdn="objLdn"> + <measResults>3 33 333 3333</measResults> + <suspect>false</suspect> + </measValue> + </measInfo> + </measData> + <fileFooter> + <measCollec endTime="2018-10-02T12:15:00+01:00"/> + </fileFooter> +</measCollecFile> diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json index 4bd48839..544b6980 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json @@ -14,10 +14,10 @@ "aaf_password": null, "dmaap_info": { "location": "csit-pmmapper", - "delivery_url": "http://3gpppmmapper:8081/delivery", + "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery", "username": "username", "password": "password", - "subscriber_id": "subscriber_id" + "subscriber_id": "1" } } }, @@ -26,7 +26,7 @@ "type": "message_router", "aaf_password": null, "dmaap_info": { - "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper", + "topic_url": "http://message-router:3904/events/PM_MAPPER", "client_role": "org.onap.dmaap.client.pub", "location": "csit-pmmapper", "client_id": null @@ -34,8 +34,12 @@ "aaf_username": null } }, - "dmaap_dr_feed_id": "1", - "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", - "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete", - "services_calls": {} + "dmaap_dr_feed_name": "1", + "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", + "services_calls": {}, + "enable_http": true, + "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64", + "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass", + "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64", + "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass" }
\ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json index fff43a15..64fefa48 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json +++ b/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json @@ -2,7 +2,7 @@ "pm-mapper-filter": { "filters":[{ "pmDefVsn": "1.0", - "nfType": "5G", + "nfType": "gnb", "vendor": "Ericsson", "measTypes": [] }] @@ -14,10 +14,10 @@ "aaf_password": null, "dmaap_info": { "location": "csit-pmmapper", - "delivery_url": "http://3gpppmmapper:8081/delivery", + "delivery_url": "http://dcae-pm-mapper.onap.svc.cluster.local:8081/delivery", "username": "username", "password": "password", - "subscriber_id": "subscriber_id" + "subscriber_id": "1" } } }, @@ -26,7 +26,7 @@ "type": "message_router", "aaf_password": null, "dmaap_info": { - "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper", + "topic_url": "http://message-router:3904/events/PM_MAPPER", "client_role": "org.onap.dmaap.client.pub", "location": "csit-pmmapper", "client_id": null @@ -34,8 +34,12 @@ "aaf_username": null } }, - "dmaap_dr_feed_id": "1", - "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", - "dmaap_dr_delete_endpoint": "http://dmaap-dr-node:8443/delete", - "services_calls": {} + "dmaap_dr_feed_name": "1", + "dmaap_dr_delete_endpoint": "https://dmaap-dr-node:8443/delete", + "services_calls": {}, + "enable_http": true, + "key_store_path": "/opt/app/pm-mapper/etc/cert/cert.jks.b64", + "key_store_pass_path": "/opt/app/pm-mapper/etc/cert/jks.pass", + "trust_store_path": "/opt/app/pm-mapper/etc/cert/trust.jks.b64", + "trust_store_pass_path": "/opt/app/pm-mapper/etc/cert/trust.pass" }
\ No newline at end of file diff --git a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot index cbb77f93..5d217513 100644 --- a/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot +++ b/tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot @@ -4,54 +4,52 @@ Library Collections Library OperatingSystem Library RequestsLibrary Library Process +Library String Test Setup Create Session mapper_session ${PMMAPPER_BASE_URL} Test Teardown Delete All Sessions *** Variables *** -${CLI_EXEC_CLI_CONFIG} { head -n 5 | tail -1;} < /tmp/pmmapper.log +${CLI_EXEC_CLI_CONFIG} { head -n 6 | tail -2;} < /tmp/pmmapper.log ${CLI_EXEC_CLI_SUBS} curl -k https://${DR_PROV_IP}:8443/internal/prov ${PMMAPPER_BASE_URL} http://${PMMAPPER_IP}:8081 ${DELIVERY_ENDPOINT} /delivery ${HEALTHCHECK_ENDPOINT} /healthcheck +${RECONFIGURE_ENDPOINT} /reconfigure ${NO_MANAGED_ELEMENT_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_managed_element.xml ${NO_MEASDATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A_no_measdata.xml ${VALID_METADATA_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/valid_metadata.json ${DIFF_VENDOR_METADATA} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/diff_vendor_metadata.json -${CLI_EXEC_CLI_PM_LOG} docker exec pmmapper /bin/sh -c "tail -5 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" -${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1/A20181002.0000-1000-0015-1000_5G.xml -${PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml +${CLI_EXEC_CLI_PM_LOG} docker exec pmmapper /bin/sh -c "tail -10 /var/log/ONAP/dcaegen2/services/pm-mapper/pm-mapper_output.log" +${PUBLISH_NODE_URL} https://${DR_NODE_IP}:8443/publish/1 +${TYPE-A_PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/A20181002.0000-1000-0015-1000_5G.xml +${TYPE-C_PM_DATA_FILE_PATH} %{WORKSPACE}/tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml ${PUBLISH_CONTENT_TYPE} application/octet-stream ${CLI_EXEC_VENDOR_FILTER} curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json ${CLI_EXEC_PM_FILTER} curl 'http://${CONSUL_IP}:8500/v1/kv/pmmapper?dc=dc1' -X PUT -H 'Accept: application/^Con' -H 'Content-Type: application/json' -H 'X-Requested-With: XMLHttpRequest' --data @$WORKSPACE/tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json ${CLI_RESTART_PMMAPPER} docker restart pmmapper ${CLI_DELETE_SUB1} curl -i -X DELETE -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:DGL" -k https://localhost:8443/subs/1 ${CLI_DELETE_SUB2} curl -i -X DELETE -H "Content-Type:application/vnd.dmaap-dr.subscription" -H "X-DMAAP-DR-ON-BEHALF-OF:DGL" -k https://localhost:8443/subs/2 -${CLI_MESSAGE_ROUTER_TOPIC} curl http://${DMAAP_MR_IP}:3904/events/topic.org.onap.dmaap.mr.test1/CG1/C1?timeout=2000 +${CLI_MESSAGE_ROUTER_TOPIC} curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 +${CLI_MR_EVENT_COUNT} curl http://${DMAAP_MR_IP}:3904/events/PM_MAPPER/CG1/C1?timeout=1000 | egrep -o 'measInfoId1|measInfoId2|measInfoId3' > /tmp/mr.log +${CLI_MR_LOG} cat /tmp/mr.log *** Test Cases *** - Verify PM Mapper Receive Configuraton From Config Binding Service [Tags] PM_MAPPER_01 [Documentation] Verify 3gpp pm mapper successfully receive config data from CBS CheckLog ${CLI_EXEC_CLI_CONFIG} Received pm-mapper configuration -Verify 3GPP PM Mapper Subscribes to Data Router - [Tags] PM_MAPPER_02 - [Documentation] Verify 3gpp pm mapper subscribes to data router - CheckLog ${CLI_EXEC_CLI_SUBS} 3gpppmmapper - CheckLog ${CLI_EXEC_CLI_SUBS} "privilegedSubscriber":true - Verify Health Check returns 200 when a REST GET request to healthcheck url - [Tags] PM_MAPPER_03 + [Tags] PM_MAPPER_02 [Documentation] Verify Health Check returns 200 when a REST GET request to healthcheck url [Timeout] 1 minute ${resp}= Get Request mapper_session ${HEALTHCHECK_ENDPOINT} VerifyResponse ${resp.status_code} 200 Verify 3GPP PM Mapper responds appropriately when no metadata is provided - [Tags] PM_MAPPER_04 + [Tags] PM_MAPPER_03 [Documentation] Verify 3GPP PM Mapper responds 400 with the message "Missing Metadata." when no metadata is provided [Timeout] 1 minute ${headers}= Create Dictionary X-ONAP-RequestID=1 Content-Type=application/xml @@ -61,7 +59,7 @@ Verify 3GPP PM Mapper responds appropriately when no metadata is provided CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=1 Verify 3GPP PM Mapper responds appropriately when invalid metadata is provided - [Tags] PM_MAPPER_05 + [Tags] PM_MAPPER_04 [Documentation] Verify 3GPP PM Mapper responds 400 with the message "Malformed Metadata." when invalid metadata is provided [Timeout] 1 minute ${headers}= Create Dictionary X-ONAP-RequestID=2 X-DMAAP-DR-META='not metadata' Content-Type=application/xml @@ -70,78 +68,75 @@ Verify 3GPP PM Mapper responds appropriately when invalid metadata is provided VerifyResponse ${resp.content} Malformed Metadata. CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=2 -Verify 3GPP PM Mapper received pushed PM data from data router and publishes to message router. - [Tags] PM_MAPPER_06 - [Documentation] Verify 3GPP PM Mapper received pushed PM data from data router and publishes to message router. +Verify 3GPP PM Mapper maps Type-A file and publish 3gpp perf VES evnets to message router + [Tags] PM_MAPPER_05 + [Documentation] Verify 3GPP PM Mapper maps Type-A file and publish 3gpp perf VES evnets to message router. [Timeout] 1 minute - ${PM_DATA}= Get File ${PM_DATA_FILE_PATH} - ${valid_metatdata} Get File ${VALID_METADATA_PATH} - ${resp}= PutCall ${PUBLISH_NODE_URL} 3 ${PM_DATA} ${PUBLISH_CONTENT_TYPE} ${valid_metatdata.replace("\n","")} pmmapper - VerifyResponse ${resp.status_code} 204 - Sleep 10s + SendToDatarouter ${TYPE-A_PM_DATA_FILE_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=3 CheckLog ${CLI_EXEC_CLI_PM_LOG} Successfully published VES events to messagerouter CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=3 Sleep 10s CheckLog ${CLI_MESSAGE_ROUTER_TOPIC} perf3gpp_gnb-Ericsson_pmMeasResult +Verify that PM Mapper maps Type-C xml file and publish 3gpp perf VES evnets to message router. + [Tags] PM_MAPPER_06 + [Documentation] Verify that PM Mapper maps Type-C xml file and publish 3gpp perf VES evnets to message router. + [Timeout] 1 minute + SendToDatarouter ${TYPE-C_PM_DATA_FILE_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=4 + CheckLog ${CLI_EXEC_CLI_PM_LOG} Successfully published VES events to messagerouter + CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=4 + Run Process ${CLI_MR_EVENT_COUNT} shell=yes + CheckLog ${CLI_MR_LOG} measInfoId1 + CheckLog ${CLI_MR_LOG} measInfoId2 + CheckLog ${CLI_MR_LOG} measInfoId3 + Verify that PM Mapper logs successful when a file that contains no measdata is provided [Tags] PM_MAPPER_07 [Documentation] Verify that PM Mapper logs successful when a file that contains no measdata is provided [Timeout] 1 minute - ${valid_no_measdata_content}= Get File ${NO_MEASDATA_PATH} - ${valid_metatdata} Get File ${VALID_METADATA_PATH} - ${headers}= Create Dictionary X-ONAP-RequestID=4 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=3 X-DMAAP-DR-META=${valid_metatdata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_no_measdata.xml data=${valid_no_measdata_content} headers=${headers} - VerifyResponse ${resp.status_code} 200 + SendToDatarouter ${NO_MEASDATA_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=5 CheckLog ${CLI_EXEC_CLI_PM_LOG} MeasData is empty - CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=4 + CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=5 Verify that PM Mapper throws Event failed validation against schema error when no managed element content is provided [Tags] PM_MAPPER_08 [Documentation] Verify 3gpp pm mapper responds with an error when no managed element content is provided [Timeout] 1 minute - ${no_managed_element_content}= Get File ${NO_MANAGED_ELEMENT_PATH} - ${valid_metatdata} Get File ${VALID_METADATA_PATH} - ${headers}= Create Dictionary X-ONAP-RequestID=5 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=2 X-DMAAP-DR-META=${valid_metatdata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A_no_managed_element.xml data=${no_managed_element_content} headers=${headers} - VerifyResponse ${resp.status_code} 200 + SendToDatarouter ${NO_MANAGED_ELEMENT_PATH} ${VALID_METADATA_PATH} X-ONAP-RequestID=6 CheckLog ${CLI_EXEC_CLI_PM_LOG} XML validation failed - CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=5 + CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=6 Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering. [Tags] PM_MAPPER_09 [Documentation] Verify that PM Mapper correctly identifies a file that should not be mapped based on metadata filtering. [Timeout] 1 minute - ${cli_cmd_output}= Run Process ${CLI_EXEC_VENDOR_FILTER} shell=yes - Should Be Equal As Strings ${cli_cmd_output.rc} 0 - ${cli_cmd_output}= Run Process ${CLI_DELETE_SUB1} shell=yes + ${cli_cmd_output}= Run Process ${CLI_EXEC_VENDOR_FILTER} shell=yes Should Be Equal As Strings ${cli_cmd_output.rc} 0 - ${cli_cmd_output}= Run Process ${CLI_RESTART_PMMAPPER} shell=yes - Sleep 10s - ${pm_data}= Get File ${PM_DATA_FILE_PATH} - ${diff_vendor_metadata}= Get File ${DIFF_VENDOR_METADATA} - ${headers}= Create Dictionary X-ONAP-RequestID=6 Content-Type=application/xml X-DMAAP-DR-PUBLISH-ID=2 X-DMAAP-DR-META=${diff_vendor_metadata.replace("\n","")} - ${resp}= Put Request mapper_session ${DELIVERY_ENDPOINT}/A20181002.0000-1000-0015-1000_5G.xml data=${pm_data} headers=${headers} - CheckLog ${CLI_EXEC_CLI_PM_LOG} Metadata does not match any filters, - CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=6 - + ${resp}= Get Request mapper_session ${RECONFIGURE_ENDPOINT} + Sleep 5s + SendToDatarouter ${TYPE-A_PM_DATA_FILE_PATH} ${DIFF_VENDOR_METADATA} X-ONAP-RequestID=7 + CheckLog ${CLI_EXEC_CLI_PM_LOG} Metadata does not match any filters + CheckLog ${CLI_EXEC_CLI_PM_LOG} RequestID=7 *** Keywords *** -PostCall - [Arguments] ${url} ${data} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests - [Return] ${resp} +SendToDatarouter + [Arguments] ${filepath} ${metadatapath} ${request_id} + ${pmdata}= Get File ${filepath} + ${metatdata} Get File ${metadatapath} + ${filename} Fetch From Right ${filepath} / + ${resp}= PutCall ${PUBLISH_NODE_URL}/${filename} ${request_id} ${pmdata} ${metatdata.replace("\n","")} pmmapper + VerifyResponse ${resp.status_code} 204 + Sleep 10s PutCall - [Arguments] ${url} ${request_id} ${data} ${content_type} ${meta} ${user} - ${headers}= Create Dictionary X-ONAP-RequestID=${request_id} X-DMAAP-DR-META=${meta} Content-Type=${content_type} X-DMAAP-DR-ON-BEHALF-OF=${user} Authorization=Basic cG1tYXBwZXI6cG1tYXBwZXI= - ${resp}= Evaluate requests.put('${url}', data="""${data}""", headers=${headers}, verify=False, allow_redirects=False) requests - [Return] ${resp} + [Arguments] ${url} ${request_id} ${data} ${meta} ${user} + ${headers}= Create Dictionary X-ONAP-RequestID=${request_id} X-DMAAP-DR-META=${meta} Content-Type=application/octet-stream X-DMAAP-DR-ON-BEHALF-OF=${user} Authorization=Basic cG1tYXBwZXI6cG1tYXBwZXI= + ${resp}= Evaluate requests.put('${url}', data="""${data}""", headers=${headers}, verify=False, allow_redirects=False) requests + [Return] ${resp} CheckLog - [Arguments] ${cli_exec_log_Path} ${string_to_check_in_log} + [Arguments] ${cli_exec_log_Path} ${string_to_check_in_log} ${cli_cmd_output}= Run Process ${cli_exec_log_Path} shell=yes Log ${cli_cmd_output.stdout} Should Be Equal As Strings ${cli_cmd_output.rc} 0 |