diff options
Diffstat (limited to 'plans')
8 files changed, 156 insertions, 33 deletions
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json index 2fe128ba..47b215f5 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/assets/config.json +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/config.json @@ -1 +1,34 @@ -{"pm-mapper-filter": "{ \"filters\":[]}", "3GPP.schema.file": "{\"3GPP_Schema\":\"./etc/3GPP_relaxed_schema.xsd\"}", "streams_subscribes": {}, "streams_publishes": {"pm_mapper_handle_out": {"type": "message_router", "aaf_password": null, "dmaap_info": {"topic_url": "https://we-are-message-router.us:3905/events/some-topic", "client_role": null, "location": null, "client_id": null}, "aaf_username": null}}, "streams_subscribes.pm_mapper_handle_out.message_router_topic": "unauthenticated.PM_VES_OUTPUT", "streams_subscribes.pm_mapper_handle_in.feed_id": "1", "services_calls": {}}
\ No newline at end of file +{ + "pm-mapper-filter": "{ \"filters\":[]}", + "3GPP.schema.file": "{\"3GPP_Schema\":\"./etc/3GPP_relaxed_schema.xsd\"}", + "streams_subscribes": { + "dmaap_subscriber": { + "type": "data_router", + "aaf_username": null, + "aaf_password": null, + "dmaap_info": { + "location": "csit-pmmapper", + "delivery_url": "3gpppmmapper", + "username": "username", + "password": "password", + "subscriber_id": "subsriber_id" + } + } + }, + "streams_publishes": { + "pm_mapper_handle_out": { + "type": "message_router", + "aaf_password": null, + "dmaap_info": { + "topic_url": "https://message-router:3904/events/org.onap.dmaap.onapCSIT.pm_mapper", + "client_role": "org.onap.dmaap.client.pub", + "location": "csit-pmmapper", + "client_id": null + }, + "aaf_username": null + } + }, + "buscontroller_feed_id": "1", + "buscontroller_feed_subscription_endpoint": "http://dmaap-bc:8080/webapi/dr_subs", + "services_calls": {} +}
\ 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 new file mode 100644 index 00000000..6ec13797 --- /dev/null +++ b/plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf @@ -0,0 +1,7 @@ +# 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 ee1649be..ff1b517a 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml +++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml @@ -64,7 +64,12 @@ services: container_name: buscontroller image: nexus3.onap.org:10001/onap/dmaap/buscontroller ports: - - "18080:8080" - - "18443:8443" + - "18080:8080" + - "18443:8443" extra_hosts: - - "dmaap-dr-prov: dr-prov-ip"
\ No newline at end of file + - "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 diff --git a/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml new file mode 100644 index 00000000..de64b809 --- /dev/null +++ b/plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml @@ -0,0 +1,11 @@ +version: '2.1' +services: + pmmapper: + container_name: pmmapper + image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.pm-mapper:1.0-SNAPSHOT + environment: + CONFIG_BINDING_SERVICE_SERVICE_HOST: CBSIP + CONFIG_BINDING_SERVICE_SERVICE_PORT: 10000 + HOSTNAME: pmmapper + extra_hosts: + - "dmaap-bc: BUSIP"
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh b/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh index ffb1686c..bb8c6f26 100755 --- a/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh @@ -1,18 +1,61 @@ #!/bin/bash - # $1 is the IP address of the buscontroller # INITIALIZE: dmaap object -JSON=/tmp/prov.dmaap +JSON=/tmp/dmaap.json cat << EOF > $JSON { "version": "1", "topicNsRoot": "org.onap.dmaap", "drProvUrl": "https://dmaap-dr-prov:8443", -"dmaapName": "onapCSIT", +"dmaapName": "DataRouter", "bridgeAdminTopic": "MM_AGENT_PROV" } EOF echo "Initializing /dmaap endpoint" -curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap
\ No newline at end of file +curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dmaap + +# INITIALIZE: dcaeLocation object +JSON=/tmp/dcaeLocation.json +cat << EOF > $JSON +{ +"dcaeLocationName": "csit-pmmapper", +"dcaeLayer": "central-cloud", +"clli": "CSIT", +"zone": "zoneA" +} +EOF + +echo "Initializing /dcaeLocations endpoint" +curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/dcaeLocations + +# INITIALIZE: MR object in 1 site +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 + +echo "Initializing /mr_clusters endpoint" +curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/mr_clusters + +# CREATING: DR feed +JSON=/tmp/feed.json +cat << EOF > $JSON +{ +"feedName":"pmmapper", +"feedVersion": "1", +"feedDescription":"PM Mapper Feed", +"owner":"bulkpm", +"asprClassification": "unclassified" +} +EOF +echo "Initializing /feeds endpoint" +curl -v -X POST -d @${JSON} -H "Content-Type: application/json" http://$1:8080/webapi/feeds +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 5d8cce62..b50d155d 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/setup.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/setup.sh @@ -32,12 +32,10 @@ else fi done -# Get IP address of DMAAP, KAFKA, Zookeeper +# 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) -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -sleep 2 # Shutdown DMAAP Container docker kill $DMAAP @@ -50,7 +48,10 @@ docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d sleep 5 -# Clone DMaaP Data Router repo +# 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 mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master @@ -58,7 +59,8 @@ 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" @@ -72,38 +74,31 @@ sed -i 's/datarouter-mariadb/'$MARIADB'/g' $WORKSPACE/archives/dmaapdr/dataroute docker-compose up -d DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) docker kill buscontroller -sed -i 's/dr-prov-ip/'$DR_PROV_IP'/g' docker-compose.yml +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 +# 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 }}' mariadb) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \ + [ $(docker inspect --format '{{ .State.Running }}' buscontroller) ] then - echo "DR Service Running" + echo "Data Router, Consul, Config Binding Service, Buscontroller Services Running" break else echo sleep $i sleep $i fi done - sleep 5 - -# Get IP address of datarrouger-prov, datarouter-node, fileconsumer-node. -DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) +# 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) - -# Get IP address of DMAAP, KAFKA, Zookeeper, ConfigBindingService -DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP) -KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA) -ZOOKEEPER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $ZOOKEEPER) -CBS_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' cbs) - -# Data Router Configuration: -# Create default feed on data router 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" @@ -119,5 +114,32 @@ 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 +# PM Mapper startup and configuration +mkdir /tmp/docker-compose +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 +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) ] + then + echo "PM Mapper Service Running" + break + else + echo sleep $i + sleep $i + fi +done +PMMAPPER_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' pmmapper) +docker exec datarouter-prov /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 +curl -k https://$DR_PROV_IP:8443/internal/prov + #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-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 DR_SUBSCIBER_IP:${DR_SUBSCIBER_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-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}"
\ No newline at end of file diff --git a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh index 5b910121..08e1c770 100644 --- a/plans/dcaegen2-pmmapper/pmmapper/teardown.sh +++ b/plans/dcaegen2-pmmapper/pmmapper/teardown.sh @@ -7,4 +7,6 @@ kill-instance.sh datarouter-node kill-instance.sh datarouter-prov kill-instance.sh mariadb kill-instance.sh cbs -kill-instance.sh consul
\ No newline at end of file +kill-instance.sh consul +kill-instance.sh buscontroller +kill-instance.sh pmmapper
\ No newline at end of file diff --git a/plans/policy/api/setup.sh b/plans/policy/api/setup.sh index dcfcb9ea..5ba95e9a 100644 --- a/plans/policy/api/setup.sh +++ b/plans/policy/api/setup.sh @@ -28,4 +28,4 @@ for i in {1..10}; do sleep $i done -ROBOT_VARIABLES="-v POLICY_API_IP:${POLICY_API_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v POLICY_API_IP:${POLICY_API_IP}" |