Merge "CSIT for SDNC Netconf Configuration"
authorGary Wu <gary.i.wu@huawei.com>
Thu, 4 Apr 2019 18:49:59 +0000 (18:49 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 4 Apr 2019 18:49:59 +0000 (18:49 +0000)
39 files changed:
plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json [new file with mode: 0644]
plans/dcaegen2-pmmapper/pmmapper/assets/config.json
plans/dcaegen2-pmmapper/pmmapper/assets/createFeed.json [new file with mode: 0644]
plans/dcaegen2-pmmapper/pmmapper/assets/createTopic.json [new file with mode: 0644]
plans/dcaegen2-pmmapper/pmmapper/assets/docker-databus-controller.conf [deleted file]
plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-e2e.yml
plans/dcaegen2-pmmapper/pmmapper/composefile/docker-compose-pmmapper.yml
plans/dcaegen2-pmmapper/pmmapper/dmaapbc.sh [deleted file]
plans/dcaegen2-pmmapper/pmmapper/setup.sh
plans/dcaegen2-pmmapper/pmmapper/teardown.sh
plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml
plans/usecases/5G-bulkpm/setup.sh
plans/usecases/5G-bulkpm/teardown.sh
plans/vfc-gvnfm-vnflcm/sanity-check/teardown.sh
plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh [new file with mode: 0755]
plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh [new file with mode: 0755]
plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt [new file with mode: 0644]
scripts/dmaap-buscontroller/dmaapbc-launch.sh
scripts/dmaap-buscontroller/start-mock.sh
scripts/dmaap-message-router/dmaap-mr-launch.sh
tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py [new file with mode: 0644]
tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
tests/dcaegen2-pmmapper/pmmapper/assets/C20190328.0000-0015.xml [new file with mode: 0644]
tests/dcaegen2-pmmapper/pmmapper/assets/pm_filter_config.json
tests/dcaegen2-pmmapper/pmmapper/assets/vendor_filter_config.json
tests/dcaegen2-pmmapper/pmmapper/pmmapper.robot
tests/multicloud-k8s/data/create_rbdefinition.json
tests/multicloud-k8s/data/create_rbprofile.json [new file with mode: 0644]
tests/multicloud-k8s/multicloud-k8s-test.robot
tests/usecases/5G-bulkpm/BulkpmE2E.robot
tests/vfc/gvnfm-vnflcm/test.robot
tests/vfc/gvnfm-vnfmgr/test.robot [new file with mode: 0644]
tests/vfc/gvnfm-vnfres/test.robot
tests/vfc/nfvo-catalog/test.robot

index bbb5493..a5a0a4f 100755 (executable)
@@ -33,7 +33,7 @@ export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
 export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
 export HV_VES_HOSTNAME="dcae-hv-ves-collector"
 export HV_VES_COLLECTOR_NAMESPACE="onap"
-export HV_VES_HEALTHCHECK_CMD=$(curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061)
+export HV_VES_HEALTHCHECK_CMD="curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061"
 export HV_VES_VERSION="1.1-SNAPSHOT"
 export HV_VES_IMAGE="hv-collector-main"
 export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
index afe8a54..280f0c4 100755 (executable)
@@ -33,11 +33,9 @@ export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
 export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
 export HV_VES_HOSTNAME="dcae-hv-ves-collector"
 export HV_VES_COLLECTOR_NAMESPACE="onap"
-export HV_VES_HEALTHCHECK_CMD=$(curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061)
+export HV_VES_HEALTHCHECK_CMD="curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061"
 export HV_VES_VERSION="latest"
 export HV_VES_IMAGE="hv-collector-main"
 export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
 export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator"
 
-
-
index 06eaf54..73fdbc2 100755 (executable)
@@ -21,14 +21,15 @@ set -euo pipefail
 
 RUN_CSIT_LOCAL=${RUN_CSIT_LOCAL:-false}
 
+echo "Replacing obsolete 'docker-py' with 'docker' package"
+pip uninstall -y docker-py
+pip install docker
+
 if ${RUN_CSIT_LOCAL} ; then
-  echo "Building locally - assuming all dependencies are installed"
+  echo "Local run"
   source env_local.sh
 else
-  echo "Default run - install all dependencies"
-  pip uninstall -y docker-py
-  pip install docker
-
+  echo "Default (CI) run"
   COMPOSE_VERSION=1.23.2
   COMPOSE_LOCATION='/usr/local/bin/docker-compose'
   sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION}
index 787f811..50b8a91 100755 (executable)
@@ -33,6 +33,9 @@ fi
 
 set +e
 
+METRICS_FILE=${WORKSPACE}/archives/containers_logs/hv-ves-metrics.dump
+docker-compose exec hv-ves-collector curl -qs localhost:6060/monitoring/prometheus > ${METRICS_FILE}
+
 COMPOSE_LOGS_FILE=${WORKSPACE}/archives/containers_logs/docker-compose.log
 docker-compose logs > ${COMPOSE_LOGS_FILE}
 docker-compose down
diff --git a/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json b/plans/dcaegen2-pmmapper/pmmapper/assets/addSubscriber.json
new file mode 100644 (file)
index 0000000..43a4a65
--- /dev/null
@@ -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
index 79b3201..62e4f40 100644 (file)
@@ -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
             "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 (file)
index 0000000..f93633d
--- /dev/null
@@ -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 (file)
index 0000000..c1a296d
--- /dev/null
@@ -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 (file)
index 6ec1379..0000000
+++ /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
index 99361d4..c972bd7 100644 (file)
@@ -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
index a7f5b97..bf03d1f 100644 (file)
@@ -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 (executable)
index 1430258..0000000
+++ /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
index 18d8237..5a0339e 100644 (file)
@@ -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
index bcbcfff..45ef0d9 100644 (file)
@@ -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
index f3c47bb..4f6c4da 100644 (file)
@@ -20,6 +20,8 @@ services:
       interval: 10s
       timeout: 10s
       retries: 5
+    extra_hosts:
+      - "dmaap-dr-node:1.1.1.1"
 
   datarouter-node:
     image: nexus3.onap.org:10001/onap/dmaap/datarouter-node:2.0.2-SNAPSHOT-latest
@@ -33,6 +35,8 @@ services:
     depends_on:
       datarouter-prov:
         condition: service_healthy
+    extra_hosts:
+      - "dmaap-dr-prov:2.2.2.2"
 
   datarouter-subscriber:
       image: nexus3.onap.org:10001/onap/dmaap/datarouter-subscriber:2.0.2-SNAPSHOT-latest
@@ -90,18 +94,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
+       CONSUL_HOST:
\ No newline at end of file
index 3d3a9ef..5d99b1c 100644 (file)
@@ -76,10 +76,9 @@ 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
 docker kill vescollector
 docker kill cbs
+sleep 10
 CONSUL_IP=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' consul )
 sed -i -e '/CONSUL_HOST:/ s/:.*/: '$CONSUL_IP'/' docker-compose.yml
 HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
@@ -87,6 +86,23 @@ sed -i -e '/DMAAPHOST:/ s/:.*/: '$HOST_IP'/' docker-compose.yml
 MARIADB=$(docker inspect '--format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mariadb )
 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
+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)
+DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
+DR_SUBSCIBER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' fileconsumer-node)
+DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
+
+echo DR_PROV_IP=${DR_PROV_IP}
+echo DR_NODE_IP=${DR_NODE_IP}
+echo DR_GATEWAY_IP=${DR_GATEWAY_IP}
+echo DR_SUBSCIBER_IP=${DR_SUBSCIBER_IP}
+
+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
+docker-compose up -d
 
 # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb
 for i in {1..10}; do
@@ -103,23 +119,12 @@ for i in {1..10}; do
 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)
-DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node)
-DR_SUBSCIBER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' fileconsumer-node)
-DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov)
-
-echo DR_PROV_IP=${DR_PROV_IP}
-echo DR_NODE_IP=${DR_NODE_IP}
-echo DR_GATEWAY_IP=${DR_GATEWAY_IP}
-echo DR_SUBSCIBER_IP=${DR_SUBSCIBER_IP}
 
 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"
 docker exec datarouter-node /bin/sh -c "echo '${DR_SUBSCIBER_IP}' dmaap-dr-subscriber >> /etc/hosts"
 
+
 # Get IP address of DMAAP, KAFKA, Zookeeper
 DMAAP_MR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $DMAAP)
 KAFKA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $KAFKA)
@@ -131,11 +136,6 @@ export VESC_IP=${VESC_IP}
 export HOST_IP=${HOST_IP}
 export DMAAP_MR_IP=${DMAAP_MR_IP}
 
-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
 
 # Data File Collector configuration :
 sed -i 's/DR_NODE_IP/'$DR_NODE_IP'/g' docker-compose.yml
@@ -156,13 +156,12 @@ docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: WA
 docker restart dfc
 sleep 2
 
-# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS, Buscontroller
+# Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb, Consul, CBS
 for i in {1..10}; do
     if  [ $(docker inspect --format '{{ .State.Running }}' consul) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] && \
-        [ $(docker inspect --format '{{ .State.Running }}' buscontroller) ]
+        [ $(docker inspect --format '{{ .State.Running }}' cbs) ] 
     then
-        echo "Data Router, Consul, Config Binding Service, Buscontroller Services Running"
+        echo "Data Router, Consul, Config Binding Service Services Running"
         break
     else
         echo sleep $i
index 7a99941..78de759 100644 (file)
@@ -15,5 +15,4 @@ kill-instance.sh mariadb
 kill-instance.sh dfc
 kill-instance.sh sftp
 kill-instance.sh cbs
-kill-instance.sh consul
-kill-instance.sh buscontroller
\ No newline at end of file
+kill-instance.sh consul
\ No newline at end of file
index aebb252..8d50350 100755 (executable)
 # limitations under the License.
 #
 
+# print log for vfc-vnflcm
+docker cp vfc-vnflcm:/service/vfc/gvnfm/vnflcm/lcm/logs/runtime_lcm.log ./
+cat runtime_lcm.log
+
 # This script is sourced by run-csit.sh after Robot test completion.
 kill-instance.sh msb_internal_apigateway
 kill-instance.sh msb_discovery
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh
new file mode 100755 (executable)
index 0000000..0c4efcc
--- /dev/null
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# Copyright 2019 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Place the scripts in run order:
+# Start all process required for executing test case
+
+source ${SCRIPTS}/common_functions.sh
+
+
+#start msb
+docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
+MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
+echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
+docker run -d  -p 10081:10081  -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
+echo MSB_DISCOVERY_IP=${MSB_DISCOVERY_IP}
+docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
+echo MSB_IAG_IP=${MSB_IAG_IP}
+
+docker run -d -p 3306:3306 --name vfc-db nexus3.onap.org:10001/onap/vfc/db
+VFC_DB_IP=`get-instance-ip.sh vfc-db`
+echo VFC_DB_IP=${VFC_DB_IP}
+
+# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway)
+for i in {1..10}; do
+    curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break
+    echo sleep $i
+    sleep $i
+done
+
+# Wait for initialization(3306 DB)
+for i in {1..3}; do
+    curl -sS -m 1 ${VFC_DB_IP}:3306 && break
+    echo sleep $i
+    sleep $i
+done
+
+# wait for container initalization
+echo sleep 60
+sleep 60
+# start vfc-vnfres
+docker run -d --name vfc-vnfmgr -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnfmgr
+VNFMGR_IP=`get-instance-ip.sh vfc-vnfmgr`
+
+# Wait for initialization
+for i in {1..10}; do
+    curl -sS ${VNFMGR_IP}:8803 && break
+    echo sleep $i
+    sleep $i
+done
+
+# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v VNFMGR_IP:${VNFMGR_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh
new file mode 100755 (executable)
index 0000000..09db55b
--- /dev/null
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Copyright 2017 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script is sourced by run-csit.sh after Robot test completion.
+kill-instance.sh msb_internal_apigateway
+kill-instance.sh msb_discovery
+kill-instance.sh msb_consul
+kill-instance.sh vfc-db
+kill-instance.sh vfc-vnfres
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt
new file mode 100644 (file)
index 0000000..ac51e67
--- /dev/null
@@ -0,0 +1,3 @@
+# Test suites are relative paths under [integration/csit.git]/tests/.
+# Place the suites in run order.
+vfc/gvnfm-vnfres/test.robot
index 079b664..0a653fa 100755 (executable)
@@ -24,6 +24,9 @@ function dmaapbc_launch() {
        docker run -d $ADDHOSTS --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG
        IP=`get-instance-ip.sh ${CONTAINER_NAME}`
 
+    source ${SCRIPTS}/common_functions.sh
+    bypass_ip_adress ${IP}
+
        # Wait for initialization
        for i in {1..10}; do
        curl -sS ${IP}:8080 && break
index d50125a..cd98606 100755 (executable)
@@ -31,6 +31,9 @@ function start_mock() {
        docker run --name ${app}-mock -d jamesdbloom/mockserver /opt/mockserver/run_mockserver.sh -logLevel INFO -serverPort ${port} -proxyPort 1090
        IP=`get-instance-ip.sh ${app}-mock`
 
+    source ${SCRIPTS}/common_functions.sh
+    bypass_ip_adress ${IP}
+
        # Wait for initialization
        for i in {1..10}; do
        curl -sS ${IP}:${port} && break
index e7ea9a9..4fef682 100755 (executable)
@@ -116,6 +116,11 @@ function dmaap_mr_launch() {
                echo KAFKA_IP=${KAFKA_IP}
                echo ZOOKEEPER_IP=${ZOOKEEPER_IP}
 
+        source ${SCRIPTS}/common_functions.sh
+        bypass_ip_adress ${DMAAP_MR_IP}
+        bypass_ip_adress ${KAFKA_IP}
+        bypass_ip_adress ${ZOOKEEPER_IP}
+
                # Wait for initialization of docker services
                for i in {1..50}; do
                        curl -sS -m 1 ${DMAAP_MR_IP}:3904/events/TestTopic && break 
diff --git a/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py b/tests/dcaegen2-collectors-hv-ves/testcases/libraries/KafkaLibrary.py
new file mode 100644 (file)
index 0000000..e262ff0
--- /dev/null
@@ -0,0 +1,61 @@
+# ============LICENSE_START====================================
+# csit-dcaegen2-collectors-hv-ves
+# =========================================================
+# Copyright (C) 2019 Nokia. All rights reserved.
+# =========================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=====================================
+
+import docker
+from robot.api import logger
+
+KAFKA_IMAGE_FULL_NAME = "wurstmeister/kafka"
+KAFKA_ADDRESS = "kafka:9092"
+ZOOKEEPER_ADDRESS = "zookeeper:2181"
+
+LIST_TOPICS_COMMAND = "kafka-topics.sh --list --zookeeper %s" % ZOOKEEPER_ADDRESS
+TOPIC_STATUS_COMMAND = "kafka-run-class.sh kafka.tools.GetOffsetShell --broker-list " + KAFKA_ADDRESS + " --topic %s --time -1"
+DELETE_TOPIC_COMMAND = "kafka-topics.sh --zookeeper " + ZOOKEEPER_ADDRESS + " --delete --topic %s"
+
+
+class KafkaLibrary:
+
+    def log_kafka_status(self):
+        dockerClient = docker.from_env()
+        kafka = dockerClient.containers.list(filters={"ancestor": KAFKA_IMAGE_FULL_NAME}, all=True)[0]
+
+        topics = self.get_topics(kafka)
+        logger.info("Topics initialized in Kafka cluster: " + str(topics))
+        for topic in topics:
+            if topic == "__consumer_offsets":
+                # kafka-internal topic, ignore it
+                continue
+
+            self.log_topic_status(kafka, topic)
+            self.reset_topic(kafka, topic)
+
+        dockerClient.close()
+
+    def get_topics(self, kafka):
+        exitCode, output = kafka.exec_run(LIST_TOPICS_COMMAND)
+        return output.splitlines()
+
+    def log_topic_status(self, kafka, topic):
+        _, topic_status = kafka.exec_run(TOPIC_STATUS_COMMAND % topic)
+        logger.info("Messages on topic: " + str(topic_status))
+
+    def reset_topic(self, kafka, topic):
+        logger.info("Removing topic " + str(
+            topic) + " (note that it will be recreated by dcae-app-simulator/hv-ves-collector, however the offset will be reseted)")
+        _, output = kafka.exec_run(DELETE_TOPIC_COMMAND % topic)
+        logger.info(str(output))
index 2fab329..985c379 100644 (file)
@@ -31,8 +31,7 @@ Test Teardown     VES-HV Collector Test Shutdown
 *** Keywords ***
 Message Routing Suite Setup
     Log   Started Suite: VES-HV Message Routing
-    ${XNF_PORTS_LIST}=    Create List    7000
-    Configure xNF Simulators Using Valid Certificates On Ports    ${XNF_PORTS_LIST}
+    Configure Single xNF Simulator
     Log   Suite setup finished
 
 *** Test Cases ***
@@ -40,7 +39,6 @@ Correct Messages Routing
     [Documentation]   VES-HV Collector should route all valid messages to topics specified in configuration
     ...               and do not change message payload generated in XNF simulator
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_FIXED_PAYLOAD_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -51,7 +49,6 @@ Correct Messages Routing
 Too big payload message handling
     [Documentation]   VES-HV Collector should interrupt the stream when encountered message with too big payload
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_TOO_BIG_PAYLOAD_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -62,7 +59,6 @@ Too big payload message handling
 Invalid wire frame message handling
     [Documentation]  VES-HV Collector should skip messages with invalid wire frame
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_INVALID_WIRE_FRAME_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -73,7 +69,6 @@ Invalid wire frame message handling
 Invalid GPB data message handling
     [Documentation]   VES-HV Collector should skip messages with invalid GPB data
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_INVALID_GPB_DATA_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
@@ -84,7 +79,6 @@ Invalid GPB data message handling
 Unsupported domain message handling
     [Documentation]   VES-HV Collector should skip messages with unsupported domain
 
-    ${XNF_SIMULATOR}=   Get xNF Simulators Using Valid Certificates
     Send Messages From xNF Simulators   ${XNF_SIMULATOR}   ${XNF_UNSUPPORTED_DOMAIN_REQUEST}
 
     Wait until keyword succeeds   60 sec   5 sec
index 3a37c9b..07e886a 100644 (file)
@@ -1,7 +1,7 @@
 # ============LICENSE_START=======================================================
 # csit-dcaegen2-collectors-hv-ves
 # ================================================================================
-# Copyright (C) 2018 NOKIA
+# Copyright (C) 2018-2019 NOKIA
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 *** Settings ***
 Library       XnfSimulatorLibrary
 Library       VesHvContainersUtilsLibrary
+Library       KafkaLibrary
 Library       Collections
 
 *** Keywords ***
+Configure Single xNF Simulator
+    ${XNF_PORTS_LIST}=    Create List    7000
+    ${XNF_SIMULATORS_ADDRESSES}=   Configure xNF Simulators   ${XNF_PORTS_LIST}
+    ${XNF_SIMULATOR}=   Get Slice From List   ${XNF_SIMULATORS_ADDRESSES}   0   1
+    Set Suite Variable   ${XNF_SIMULATOR}
+
 Configure xNF Simulators Using Valid Certificates On Ports
     [Arguments]    ${XNF_PORTS_LIST}
     ${VALID_XNF_SIMULATORS_ADDRESSES}=   Configure xNF Simulators   ${XNF_PORTS_LIST}
@@ -57,6 +64,7 @@ VES-HV Collector Test Shutdown
 
 
 VES-HV Collector Suite Teardown
+    Log Kafka Status
     Stop And Remove All Xnf Simulators   ${SUITE NAME}
 
 *** Variables ***
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 (file)
index 0000000..b6a3b43
--- /dev/null
@@ -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>
index 4bd4883..544b698 100644 (file)
             "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
             "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
index fff43a1..64fefa4 100644 (file)
@@ -2,7 +2,7 @@
     "pm-mapper-filter": { 
         "filters":[{
             "pmDefVsn": "1.0",
-            "nfType": "5G",
+            "nfType": "gnb",
             "vendor": "Ericsson",
             "measTypes": []
         }]
             "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
             "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
index cbb77f9..5d21751 100644 (file)
@@ -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
index 370c3c7..0373113 100644 (file)
@@ -1,7 +1,9 @@
 {
-    "uuid": "7eb09e38-4363-9942-1234-3beb2e95fd85",
-    "name": "test-rbdef",
+    "rb-name": "test-rbdef",
+    "rb-version": "v1",
     "chart-name": "testchart",
     "description": "testing resource bundle definition api",
-    "service-type": "firewall"
+    "labels": {
+        "vnf_customization_module_uuid": "7eb09e38-4363-9942-1234-3beb2e95fd85"
+    }
 }
\ No newline at end of file
diff --git a/tests/multicloud-k8s/data/create_rbprofile.json b/tests/multicloud-k8s/data/create_rbprofile.json
new file mode 100644 (file)
index 0000000..72111a4
--- /dev/null
@@ -0,0 +1,11 @@
+{
+    "rb-name": "test-rbdef",
+    "rb-version": "v1",
+    "profile-name": "profile1",
+    "release-name": "testrelease",
+    "namespace": "testnamespace",
+    "kubernetes-version": "1.12.3",
+    "labels": {
+        "vnf_customization_module_uuid": "7eb09e38-4363-9942-1234-3beb2e95fd85"
+    }
+}
index 36d4e66..f81ef01 100644 (file)
@@ -12,12 +12,24 @@ Create Definition
 
 Get Definition
     [Template]  Get template
-    /v1/rb/definition
-    /v1/rb/definition/7eb09e38-4363-9942-1234-3beb2e95fd85
+    /v1/rb/definition/test-rbdef
+    /v1/rb/definition/test-rbdef/v1
+
+Create Profile
+    [Template]      Post template
+    /v1/rb/definition/test-rbdef/v1/profile      create_rbprofile.json
+
+Get Profile
+    [Template]  Get template
+    /v1/rb/definition/test-rbdef/v1/profile/profile1
+
+Delete Profile
+    [Template]  Delete template
+    /v1/rb/definition/test-rbdef/v1/profile/profile1
 
 Delete Definition
     [Template]  Delete template
-    /v1/rb/definition/7eb09e38-4363-9942-1234-3beb2e95fd85
+    /v1/rb/definition/test-rbdef/v1
 
 *** Keywords ***
 Created session
index f8ba0fb..dcf9721 100644 (file)
@@ -20,9 +20,9 @@ ${CLI_EXEC_CLI}                          curl -k https://${DR_PROV_IP}:8443/inte
 ${CLI_EXEC_CLI_FILECONSUMER}             docker exec fileconsumer-node /bin/sh -c "ls /opt/app/subscriber/delivery | grep .xml"
 ${CLI_EXEC_CLI_DFC_LOG}                  docker exec dfc /bin/sh -c "cat /var/log/ONAP/application.log" > /tmp/dfc_docker.log.robot
 ${CLI_EXEC_CLI_DFC_LOG_GREP}             grep "Publish to DR successful!" /tmp/dfc_docker.log.robot
+${CLI_EXEC_CLI_FILECONSUMER_CP}          docker cp fileconsumer-node:/opt/app/subscriber/delivery/xNF.pm.xml.M %{WORKSPACE}
+${CLI_EXEC_RENAME_METADATA}              mv %{WORKSPACE}/xNF.pm.xml.M  %{WORKSPACE}/metadata.json
 
-${CLI_EXEC_CLI_FILECONSUMER_CP}          docker cp fileconsumer-node:/opt/app/subscriber/delivery/oteNB5309_xNF.pm.xml.M %{WORKSPACE}
-${CLI_EXEC_RENAME_METADATA}              mv %{WORKSPACE}/oteNB5309_xNF.pm.xml.M  %{WORKSPACE}/metadata.json
 ${metadataSchemaPath}                    %{WORKSPACE}/tests/usecases/5G-bulkpm/assets/metadata.schema.json
 ${metadataJsonPath}                      %{WORKSPACE}/metadata.json
 
@@ -86,7 +86,7 @@ Verify Fileconsumer Receive PM file from Data Router
     ${cli_cmd_output}=              Run Process                     ${CLI_EXEC_CLI_FILECONSUMER}        shell=yes
     Log                             ${cli_cmd_output.stdout}
     Should Be Equal As Strings      ${cli_cmd_output.rc}            0
-    Should Contain                  ${cli_cmd_output.stdout}        oteNB5309_xNF.pm.xml
+    Should Contain                  ${cli_cmd_output.stdout}        xNF.pm.xml
 
 Verify File Consumer Receive valid metadata from Data Router
     [Tags]                          Bulk_PM_E2E_06
@@ -94,7 +94,7 @@ Verify File Consumer Receive valid metadata from Data Router
     ${cli_cmd_output}=              Run Process                     ${CLI_EXEC_CLI_FILECONSUMER}        shell=yes
     Log                             ${cli_cmd_output.stdout}
     Should Be Equal As Strings      ${cli_cmd_output.rc}            0
-    Should Contain                  ${cli_cmd_output.stdout}        oteNB5309_xNF.pm.xml.M
+    Should Contain                  ${cli_cmd_output.stdout}        xNF.pm.xml.M
     ${cli_cmd_output}=              Run Process                     ${CLI_EXEC_CLI_FILECONSUMER_CP}     shell=yes
     ${cli_cmd_output}=              Run Process                     ${CLI_EXEC_RENAME_METADATA}         shell=yes
     ${validation_result}=           Validate                        ${metadataSchemaPath}    ${metadataJsonPath}
index cf3d12b..97463ac 100644 (file)
@@ -11,6 +11,7 @@ Library     HttpLibrary.HTTP
 ${queryswagger_url}    /api/vnflcm/v1/swagger.json
 ${create_vnf_url}    /api/vnflcm/v1/vnf_instances
 ${delete_vnf_url}    /api/vnflcm/v1/vnf_instances
+${healthcheck_url}   /api/vnflcm/v1/health_check
 
 #json files
 ${create_vnf_json}    ${SCRIPTS}/../tests/vfc/gvnfm-vnflcm/jsoninput/create_vnf.json
@@ -29,3 +30,14 @@ VnflcmSwaggerTest
     ${response_json}    json.loads    ${resp.content}
     ${swagger_version}=    Convert To String      ${response_json['swagger']}
     Should Be Equal    ${swagger_version}    2.0
+
+VnflcmHealthCheckTest
+    [Documentation]    check health for vnflcm by MSB
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VNFLCM_IP}:8801    headers=${headers}
+    ${resp}=  Get Request    web_session    ${healthcheck_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${health_status}=    Convert To String      ${response_json['status']}
+    Should Be Equal    ${health_status}    active
diff --git a/tests/vfc/gvnfm-vnfmgr/test.robot b/tests/vfc/gvnfm-vnfmgr/test.robot
new file mode 100644 (file)
index 0000000..773d83a
--- /dev/null
@@ -0,0 +1,33 @@
+*** settings ***
+Library     Collections
+Library     RequestsLibrary
+Library     OperatingSystem
+Library     json
+
+*** Variables ***
+@{return_ok_list}=   200  201  202
+${queryswagger_url}    /api/vnfmgr/v1/swagger.json
+${healthcheck_url}   /api/vnfmgr/v1/health_check
+
+*** Test Cases ***
+VnfMgrSwaggerTest
+    [Documentation]    query vnfmgr swagger info rest test
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VNFMGR_IP}:8802    headers=${headers}
+    ${resp}=  Get Request    web_session    ${queryswagger_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${swagger_version}=    Convert To String      ${response_json['swagger']}
+    Should Be Equal    ${swagger_version}    2.0
+
+VnfMgrHealthCheckTest
+    [Documentation]    check health for vnfmgr by MSB
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VNFMGR_IP}:8803    headers=${headers}
+    ${resp}=  Get Request    web_session    ${healthcheck_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${health_status}=    Convert To String      ${response_json['status']}
+    Should Be Equal    ${health_status}    active
index fb87435..6498de1 100644 (file)
@@ -7,6 +7,7 @@ Library     json
 *** Variables ***
 @{return_ok_list}=   200  201  202
 ${queryswagger_url}    /api/vnfres/v1/swagger.json
+${healthcheck_url}   /api/vnfres/v1/health_check
 
 *** Test Cases ***
 VnfresSwaggerTest
@@ -19,3 +20,14 @@ VnfresSwaggerTest
     ${response_json}    json.loads    ${resp.content}
     ${swagger_version}=    Convert To String      ${response_json['swagger']}
     Should Be Equal    ${swagger_version}    2.0
+
+VnfResHealthCheckTest
+    [Documentation]    check health for vnfres by MSB
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${VNFRES_IP}:8802    headers=${headers}
+    ${resp}=  Get Request    web_session    ${healthcheck_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${health_status}=    Convert To String      ${response_json['status']}
+    Should Be Equal    ${health_status}    active
index 99dff9b..b83bee4 100644 (file)
@@ -9,6 +9,7 @@ Library     json
 ${queryswagger_url}        /api/catalog/v1/swagger.json
 ${queryVNFPackage_url}     /api/catalog/v1/vnfpackages
 ${queryNSPackages_url}     /api/catalog/v1/nspackages
+${healthcheck_url}         /api/catalog/v1/health_check
 
 *** Test Cases ***
 GetVNFPackages
@@ -17,3 +18,14 @@ GetVNFPackages
     ${resp}=              Get Request          web_session                      ${queryVNFPackage_url}
     ${responese_code}=    Convert To String    ${resp.status_code}
     List Should Contain Value    ${return_ok_list}   ${responese_code}
+
+CatalogHealthCheckTest
+    [Documentation]    check health for catalog by MSB
+    ${headers}    Create Dictionary    Content-Type=application/json    Accept=application/json
+    Create Session    web_session    http://${CATALOG_IP}:8806    headers=${headers}
+    ${resp}=  Get Request    web_session    ${healthcheck_url}
+    ${responese_code}=     Convert To String      ${resp.status_code}
+    List Should Contain Value    ${return_ok_list}   ${responese_code}
+    ${response_json}    json.loads    ${resp.content}
+    ${health_status}=    Convert To String      ${response_json['status']}
+    Should Be Equal    ${health_status}    active