Merge "Remove the dependency on the MSB"
authorGary Wu <gary.i.wu@huawei.com>
Thu, 6 Sep 2018 14:23:10 +0000 (14:23 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 6 Sep 2018 14:23:10 +0000 (14:23 +0000)
86 files changed:
deployment/heat/onap-oom/onap-oom.yaml
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml [new file with mode: 0644]
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh [new file with mode: 0755]
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile [new file with mode: 0644]
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md [new file with mode: 0644]
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh [new file with mode: 0755]
test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt [new file with mode: 0644]
test/csit/plans/dcaegen2/prh-testsuites/setup.sh
test/csit/plans/dmaap-buscontroller/with_dr/setup.sh [new file with mode: 0755]
test/csit/plans/dmaap-buscontroller/with_dr/teardown.sh [new file with mode: 0755]
test/csit/plans/dmaap-buscontroller/with_dr/testplan.txt [new file with mode: 0755]
test/csit/plans/dmaap-datarouter/dr-suite/setup.sh
test/csit/plans/dmaap-datarouter/dr-suite/teardown.sh
test/csit/plans/music/music-test-plan/setup.sh
test/csit/plans/music/music-test-plan/teardown.sh
test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh
test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh
test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh
test/csit/scripts/dmaap-buscontroller/dr-launch.sh [new file with mode: 0644]
test/csit/scripts/externalapi-nbi/start_nbi_containers.sh
test/csit/scripts/optf-has/has/has-properties/conductor.conf.onap
test/csit/scripts/optf-has/has/has_script.sh
test/csit/scripts/optf-has/has/music_script.sh
test/csit/scripts/policy/script1.sh
test/csit/scripts/vid/start_vid_containers.sh
test/csit/tests/clamp/UIs/01__Create_Holmes_model.robot
test/csit/tests/clamp/UIs/02__Create_TCA_model.robot
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json [new file with mode: 0644]
test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json [new file with mode: 0644]
test/csit/tests/dcaegen2/prh-testcases/__init__.robot
test/csit/tests/dcaegen2/prh-testcases/prh_tests.robot
test/csit/tests/dcaegen2/prh-testcases/resources/PrhLibrary.py
test/csit/tests/dcaegen2/prh-testcases/resources/docker-compose.yml
test/csit/tests/dcaegen2/prh-testcases/resources/prh_library.robot
test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
test/csit/tests/dcaegen2/prh-testcases/resources/simulator/AAI_simulator
test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py
test/csit/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP_simulator
test/csit/tests/dmaap-buscontroller/with_dr/orig [new file with mode: 0755]
test/csit/tests/dmaap-buscontroller/with_dr/test1.robot [new file with mode: 0644]
test/csit/tests/music/music-suite/music-test.robot
test/csit/tests/optf-has/has/optf_has_test.robot
test/csit/tests/policy/suite1/global_properties.robot
test/csit/tests/vid/resources/docker-compose.yml [new file with mode: 0644]
test/csit/tests/vid/resources/simulators/SDC.py [new file with mode: 0644]
test/csit/tests/vid/resources/simulators/SDC_simulator [new file with mode: 0644]
test/csit/tests/vid/resources/simulators/cert.pem [new file with mode: 0644]
test/csit/tests/vid/resources/simulators/key.pem [new file with mode: 0644]
test/csit/tests/vid/resources/simulators/sdc_get_response.json [new file with mode: 0644]
test/ete/labs/gwu/onap-openstack-template.env
test/ete/labs/huawei/onap-openstack-template.env
test/ete/labs/tlab/onap-openstack-template.env
test/ete/labs/windriver/onap-openstack-template.env
test/ete/scripts/deploy-onap.sh
test/mocks/pnfsimulator/README.md
test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml [new file with mode: 0644]
test/mocks/pnfsimulator/docker-compose.yml
test/mocks/pnfsimulator/json_schema/output_validator.json [deleted file]
test/mocks/pnfsimulator/json_schema/output_validator_ves_schema_30.0.1.json [new file with mode: 0644]
test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java
test/mocks/pnfsimulator/ssh/ssh_host_rsa_key [new file with mode: 0644]
test/mocks/pnfsimulator/ssh/ssh_host_rsa_key.pub [new file with mode: 0644]
version-manifest/src/main/resources/docker-manifest-staging.csv
version-manifest/src/main/resources/docker-manifest.csv

index 5c99bdb..227e884 100644 (file)
@@ -201,14 +201,12 @@ resources:
               get_attr: [k8s_2_floating_ip, floating_ip_address],
               get_attr: [k8s_3_floating_ip, floating_ip_address],
               get_attr: [k8s_4_floating_ip, floating_ip_address],
-              get_attr: [k8s_5_floating_ip, floating_ip_address],
             ]
             __k8s_private_ips__: [
               get_attr: [k8s_1_floating_ip, fixed_ip_address],
               get_attr: [k8s_2_floating_ip, fixed_ip_address],
               get_attr: [k8s_3_floating_ip, fixed_ip_address],
               get_attr: [k8s_4_floating_ip, fixed_ip_address],
-              get_attr: [k8s_5_floating_ip, fixed_ip_address],
             ]
   k8s_1_private_port:
     type: OS::Neutron::Port
@@ -350,41 +348,6 @@ resources:
           template:
             get_file: k8s_vm_entrypoint.sh
 
-  k8s_5_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_network }
-      fixed_ips: [{"subnet": { get_resource: oam_subnet }}]
-      security_groups:
-      - { get_resource: onap_sg }
-
-  k8s_5_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: k8s_5_private_port }
-
-  k8s_5_vm:
-    type: OS::Nova::Server
-    properties:
-      name: k8s_5
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: k8s_vm_flavor }
-      key_name: { get_param: key_name }
-      networks:
-      - port: { get_resource: k8s_5_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __docker_proxy__: { get_param: docker_proxy }
-            __apt_proxy__: { get_param: apt_proxy }
-            __docker_version__: { get_param: docker_version }
-            __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
-            __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] }
-          template:
-            get_file: k8s_vm_entrypoint.sh
-
 outputs:
   rancher_vm_ip:
     description: The IP address of the rancher instance
@@ -406,7 +369,3 @@ outputs:
     description: The IP address of the k8s_4 instance
     value: { get_attr: [k8s_4_floating_ip, floating_ip_address] }
 
-  k8s_5_vm_ip:
-    description: The IP address of the k8s_5 instance
-    value: { get_attr: [k8s_5_floating_ip, floating_ip_address] }
-
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml
new file mode 100644 (file)
index 0000000..66cbde2
--- /dev/null
@@ -0,0 +1,78 @@
+version: "3"
+
+networks:
+  ves-hv-default:
+    external:
+      name: $CONTAINERS_NETWORK
+
+services:
+  zookeeper:
+    image: wurstmeister/zookeeper
+    ports:
+      - "2181:2181"
+    networks:
+      - ves-hv-default
+
+  kafka:
+    image: wurstmeister/kafka
+    ports:
+      - "9092:9092"
+    environment:
+      KAFKA_ADVERTISED_HOST_NAME: "kafka"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181"
+      KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - zookeeper
+    networks:
+      - ves-hv-default
+
+  consul:
+    image: progrium/consul
+    ports:
+      - "8500:8500"
+    environment:
+      - CONSUL_BIND_INTERFACE=eth0
+    networks:
+      ves-hv-default:
+        aliases:
+           - consul
+    command: ["-server", "-bootstrap"]
+
+  ves-hv-collector:
+    image: $DOCKER_REGISTRY/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest
+    ports:
+      - "6060:6060"
+      - "6061:6061/tcp"
+    entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"]
+    command: ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config"]
+    healthcheck:
+      interval: 10s
+      timeout: 5s
+      retries: 2
+      test: "curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061"
+    depends_on:
+      - kafka
+    volumes:
+      - ./ssl/:/etc/ves-hv/
+    networks:
+      - ves-hv-default
+
+  dcae-app-simulator:
+    image: $DOCKER_REGISTRY/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:latest
+    ports:
+      - "6063:6063/tcp"
+    command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"]
+    healthcheck:
+      interval: 10s
+      timeout: 5s
+      retries: 2
+      test: "curl --request GET --fail --silent --show-error localhost:6063/healthcheck"
+    depends_on:
+      - kafka
+    networks:
+      ves-hv-default:
+        aliases:
+           - dcae-app-simulator
\ No newline at end of file
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/setup.sh
new file mode 100755 (executable)
index 0000000..6b527fc
--- /dev/null
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+pip uninstall -y docker-py
+pip install docker
+
+COMPOSE_VERSION=1.22.0
+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}
+sudo chmod +x ${COMPOSE_LOCATION}
+
+
+echo "Removing not used docker networks"
+docker network prune -f
+
+export CONTAINERS_NETWORK=ves-hv-default
+echo "Creating network for containers: ${CONTAINERS_NETWORK}"
+docker network create ${CONTAINERS_NETWORK}
+
+cd ssl
+make FILE=client
+make FILE=server
+make FILE=invalid_client CA=invalid_trust
+cd ..
+
+export DOCKER_REGISTRY="nexus3.onap.org:10001"
+docker-compose up -d
+
+mkdir ${WORKSPACE}/archives/containers_logs
+
+export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries"
\ No newline at end of file
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/Makefile
new file mode 100644 (file)
index 0000000..5fddc6b
--- /dev/null
@@ -0,0 +1,32 @@
+FILE=sample
+CA_PASSWD=onap
+SUBJ=/C=PL/ST=DL/L=Wroclaw/O=Nokia/OU=MANO
+CA=trust
+
+sign: $(FILE).crt
+
+clean:
+       rm -f *.crt *.key *.srl *.csr
+
+generate-ca-certificate: $(CA).crt
+
+generate-private-key: $(FILE).key
+
+create-public-key: $(FILE).pub
+
+create-sign-request: $(FILE).csr
+
+$(CA).crt:
+       openssl req -new -x509 -keyout $(CA).key -out $(CA).crt -days 365 -passout pass:$(CA_PASSWD) -subj "$(SUBJ)"
+
+$(FILE).key:
+       openssl genpkey -algorithm RSA -out $(FILE).key -pkeyopt rsa_keygen_bits:2048
+
+$(FILE).pub: $(FILE).key
+       openssl x509 -req -days 360 -in client.csr -CA $(CA).crt -CAkey $(CA).key -CAcreateserial -out client.crt
+
+$(FILE).csr: $(FILE).key
+       openssl req -new -sha256 -key $(FILE).key -out $(FILE).csr -subj "$(SUBJ)"
+
+$(FILE).crt: $(CA).crt $(FILE).csr
+       openssl x509 -req -days 360 -in $(FILE).csr -CA $(CA).crt -CAkey $(CA).key -out $(FILE).crt -CAcreateserial -passin pass:$(CA_PASSWD)
\ No newline at end of file
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/README.md
new file mode 100644 (file)
index 0000000..174c166
--- /dev/null
@@ -0,0 +1,18 @@
+# Generating SSL certificates
+
+Typical usage:
+
+```shell
+make FILE=client
+make FILE=server
+```
+
+Will generate CA certificate and signed client and server certificates.
+
+More "low-level" usage:
+
+```shell
+make generate-ca-certificate
+make generate-private-key FILE=client
+make sign FILE=client
+```
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/teardown.sh
new file mode 100755 (executable)
index 0000000..84d3666
--- /dev/null
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+cd ssl
+make clean
+cd ..
+
+docker-compose logs > ${WORKSPACE}/archives/containers_logs/docker-compose.log
+docker-compose down
+docker-compose rm -f
+
+docker network rm ${CONTAINERS_NETWORK}
\ No newline at end of file
diff --git a/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt b/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/testplan.txt
new file mode 100644 (file)
index 0000000..e9a7f63
--- /dev/null
@@ -0,0 +1,4 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+dcaegen2-collectors-hv-ves/testcases
+
index a5ce48b..52167bf 100644 (file)
@@ -8,26 +8,11 @@ export AAI_SIMULATOR="aai_simulator"
 
 cd ${WORKSPACE}/test/csit/tests/dcaegen2/prh-testcases/resources/
 
-docker login -u docker -p docker nexus3.onap.org:10001
 pip uninstall -y docker-py
 pip uninstall -y docker
 pip install -U docker
 docker-compose up -d --build
 
-# Wait for initialization of Docker containers
-for i in {1..10}; do
-       if [ $(docker inspect --format '{{ .State.Running }}' ${PRH_SERVICE}) ] && \
-         [ $(docker inspect --format '{{ .State.Running }}' ${DMAAP_SIMULATOR}) ] && \
-         [ $(docker inspect --format '{{ .State.Running }}' ${AAI_SIMULATOR}) ]
-       then
-               echo "dmaap_simulator, aai_simulator and prh services are running"
-               break                   
-       else 
-               echo sleep ${i}
-               sleep ${i}
-       fi
-done
-
 PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE})
 DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR})
 AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR})
@@ -47,12 +32,5 @@ for i in {1..10}; do
     sleep ${i}
 done
 
-docker stop prh
-docker cp prh:/config/prh_endpoints.json ${WORKDIR}
-sed -i -e 's/"dmaapHostName":.*/"dmaapHostName": "'${DMAAP_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json
-sed -i -e 's/"aaiHost":.*/"aaiHost": "'${AAI_SIMULATOR_IP}'",/g' ${WORKDIR}/prh_endpoints.json
-docker cp ${WORKDIR}/prh_endpoints.json prh:/config/
-docker start prh
-
 # #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v DMAAP_SIMULATOR:${DMAAP_SIMULATOR_IP}:2222 -v AAI_SIMULATOR:${AAI_SIMULATOR_IP}:3333 -v PRH:${PRH_IP}:8100"
diff --git a/test/csit/plans/dmaap-buscontroller/with_dr/setup.sh b/test/csit/plans/dmaap-buscontroller/with_dr/setup.sh
new file mode 100755 (executable)
index 0000000..7cefa72
--- /dev/null
@@ -0,0 +1,57 @@
+#!/bin/bash
+# 
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. 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=========================================================
+# 
+#
+
+source ${SCRIPTS}/common_functions.sh
+
+
+if [ "$USE_EXISTING_DMAAP" = "Y" ]
+then
+       ROBOT_VARIABLES="-v AAF_IP:0.0.0 -v MRC_IP:0.0.0.0 -v DRPS_IP:172.17.0.3 -v DMAAPBC_IP:172.17.0.4"
+else
+
+       # Place the scripts in run order:
+       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dr-launch.sh
+       dmaap_dr_launch
+       DRPS_IP=${IP}
+
+       #source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/start-mock.sh
+       #start_mock "aaf" 
+       #AAF_IP=${IP}
+       AAF_IP=0.0.0.0
+       #start_mock "drps" 
+       #DRPS_IP=${IP}
+       MRC_IP=0.0.0.0
+
+       source ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-launch.sh 
+       dmaapbc_launch $AAF_IP $MRC_IP $DRPS_IP
+       DMAAPBC_IP=${IP}
+
+
+       echo "AAF_IP=$AAF_IP MRC_IP=$MRC_IP DRPS_IP=$DRPS_IP DMAAPBC_IP=$DMAAPBC_IP"
+
+       # Pass any variables required by Robot test suites in ROBOT_VARIABLES
+       ROBOT_VARIABLES="-v AAF_IP:${AAF_IP} -v MRC_IP:${MRC_IP} -v DRPS_IP:${DRPS_IP} -v DMAAPBC_IP:${DMAAPBC_IP}"
+       set -x
+       ${WORKSPACE}/test/csit/scripts/dmaap-buscontroller/dmaapbc-init.sh ${DMAAPBC_IP} ${DRPS_IP} ${MRC_IP} https
+       set +x
+fi
+
diff --git a/test/csit/plans/dmaap-buscontroller/with_dr/teardown.sh b/test/csit/plans/dmaap-buscontroller/with_dr/teardown.sh
new file mode 100755 (executable)
index 0000000..23ae60a
--- /dev/null
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# ============LICENSE_START=======================================================
+# org.onap.dmaap
+# ================================================================================
+# Copyright (C) 2018 AT&T Intellectual Property. 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=========================================================
+
+if [ "$KEEP_DMAAP" != "Y" ]
+then
+kill-instance.sh dmaapbc
+cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
+docker-compose down -v
+fi
diff --git a/test/csit/plans/dmaap-buscontroller/with_dr/testplan.txt b/test/csit/plans/dmaap-buscontroller/with_dr/testplan.txt
new file mode 100755 (executable)
index 0000000..04c6838
--- /dev/null
@@ -0,0 +1,2 @@
+# Place the suites in run order.
+dmaap-buscontroller/with_dr
index d72fe1f..e5debfc 100755 (executable)
@@ -9,10 +9,11 @@ cd $WORKSPACE/archives/dmaapdr
 git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
 cd datarouter
 git pull
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/
+cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
 
+sed -i 's/10003/10001/g' docker-compose.yml
 # start DMaaP DR containers with docker compose and configuration from docker-compose.yml
-docker login -u docker -p docker nexus3.onap.org:10003
+docker login -u docker -p docker nexus3.onap.org:10001
 docker-compose up -d
 
 # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb
@@ -37,8 +38,8 @@ echo DR_PROV_IP=${DR_PROV_IP}
 echo DR_NODE_IP=${DR_NODE_IP}
 echo DR_GATEWAY_IP=${DR_GATEWAY_IP}
 
-docker exec -i datarouter-prov sh -c "curl -k  -X PUT https://$DR_PROV_IP:8443/internal/api/NODES?val=node.datarouternew.com\|$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=prov.datarouternew.com\|$DR_GATEWAY_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"
 
 #Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP}"
index e5a7f25..033a001 100755 (executable)
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/
+cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
 docker-compose down -v
index ddfdfc0..ce5d108 100755 (executable)
@@ -27,7 +27,7 @@ source ${WORKSPACE}/test/csit/scripts/music/music-scripts/music_script.sh
 echo "# music configuration step";
 
 CASS_IMG=nexus3.onap.org:10001/onap/music/cassandra_music:latest
-TOMCAT_IMG=nexus3.onap.org:10001/library/tomcat:8.0
+TOMCAT_IMG=nexus3.onap.org:10001/library/tomcat:8.5
 ZK_IMG=nexus3.onap.org:10001/library/zookeeper:3.4
 MUSIC_IMG=nexus3.onap.org:10001/onap/music/music:latest
 WORK_DIR=/tmp/music
@@ -38,6 +38,8 @@ MUSIC_PROPERTIES=/tmp/music/properties
 MUSIC_LOGS=/tmp/music/logs
 mkdir -p ${MUSIC_PROPERTIES}
 mkdir -p ${MUSIC_LOGS}
+mkdir -p ${MUSIC_LOGS}/MUSIC
+
 
 cp ${MUSIC_SOURCE_PROPERTIES}/* ${WORK_DIR}/properties
 
@@ -77,6 +79,19 @@ echo "TOMCAT_IP=${TOMCAT_IP}"
 
 ${WORKSPACE}/test/csit/scripts/music/music-scripts/wait_for_port.sh ${TOMCAT_IP} 8080
 
+sleep 20;
+echo "get the tomcat logs to make sure its running music properly"
+echo "======== TOMCAT Logs =============="
+docker logs music-tomcat
+# Needed only if we need to look at localhost logs.
+#echo "===== MUSIC localhost Log ===================="
+#docker exec music-tomcat /bin/bash -c "cat /usr/local/tomcat/logs/localhost*"
+
+echo "===== MUSIC Log ===================="
+ls -al $MUSIC_LOGS/MUSIC
+docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
+echo "===== MUSIC error log =================="
+docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
 
 echo "inspect docker things for tracing purpose"
 docker inspect music-db
@@ -89,6 +104,7 @@ docker network inspect music-net
 echo "dump music content just after music is started"
 docker exec music-db /usr/bin/nodetool status
 docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM system_schema.keyspaces'
+docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'DESCRIBE keyspace admin'
 docker exec music-db /usr/bin/cqlsh -unelson24 -pwinman123 -e 'SELECT * FROM admin.keyspace_master'
 
 
index e9982ae..a5f7423 100755 (executable)
 #
 # add here below the killing of all docker containers used for music CSIT testing
 #
+echo "dump music.log files"
+ls -alF /tmp/music
+ls -alFR /tmp/music
+ls -alF /tmp/music/properties
+cat /tmp/music/properties/music.properties
+echo "===== MUSIC log =================="
+docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/music.log"
+#cat /tmp/music/logs/MUSIC/music.log
+echo "===== MUSIC error log =================="
+docker exec music-tomcat /bin/bash -c "cat /opt/app/music/logs/MUSIC/error.log"
+#cat /tmp/music/logs/MUSIC/error.log
+
 echo "##########################################################";
 echo "#";
 echo "# music scripts docker containers killing";
@@ -39,13 +51,6 @@ sleep 5;
 
 docker volume rm music-vol
 
-echo "dump music.log files"
-ls -alF /tmp/music
-ls -alF /tmp/music/properties
-cat /tmp/music/properties/music.properties
-cat /tmp/music/logs/MUSIC/music.log
-cat /tmp/music/logs/MUSIC/error.log
-
 #rm -Rf /tmp/music
 
 
index 6e4e8a8..7a739ba 100755 (executable)
@@ -71,5 +71,15 @@ for i in {1..10}; do
     sleep $i
 done
 
+curl http://${NSLCM_IP}:8403/api/nslcm/v1/swagger.json
+
+docker logs -f vfc-nslcm > 3.txt &
+cat 3.txt
+
+docker cp vfc-nslcm:/service/vfc/nfvo/lcm/logs/runtime_lcm.log ./
+cat runtime_lcm.log
+
+
+
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
 ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v NSLCM_IP:${NSLCM_IP} -v SCRIPTS:${SCRIPTS}"
index baffc17..e564e63 100755 (executable)
 
 echo "This is ${WORKSPACE}/test/csit/scripts/clamp/clone_clamp_and_change_dockercompose.sh"
 
+firefox --version
+which firefox
+
+
 # Clone Clamp repo to get extra folder that has all needed to run docker with docker-compose to start DB and Clamp
 mkdir -p $WORKSPACE/archives/clamp-clone
 cd $WORKSPACE/archives/clamp-clone
@@ -34,7 +38,7 @@ cd clamp/extra/docker/clamp/
 sed -i '/image: onap\/clamp/c\    image: nexus3.onap.org:10001\/onap\/clamp' docker-compose.yml
 
 # Change config to take third_party_proxy:8085 for SDC, Policy and DCAE simulator
-sed -i 's/}/,\"clamp.config.policy.pdpUrl1\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.pdpUrl2\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.papUrl\":\"http:\/\/third_party_proxy:8085\/pap\/ , testpap, alpha123\",\"clamp.config.policy.clientId\":\"python\",\"clamp.config.policy.clientKey\":\"dGVzdA==\",\"clamp.config.sdc.catalog.url\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/\",\"clamp.config.sdc.hostUrl\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.sdc.serviceUrl\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/services\",\"clamp.config.dcae.inventory.url\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.dcae.dispatcher.url\":\"http:\/\/third_party_proxy:8085\",\"spring.profiles.active\":\"clamp-default,clamp-default-user,clamp-sdc-controller\"}/g' clamp.env
+sed -i 's/}/,\"clamp.config.policy.pdpUrl1\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.pdpUrl2\":\"http:\/\/third_party_proxy:8085\/pdp\/ , testpdp, alpha123\",\"clamp.config.policy.papUrl\":\"http:\/\/third_party_proxy:8085\/pap\/ , testpap, alpha123\",\"clamp.config.policy.clientId\":\"python\",\"clamp.config.policy.clientKey\":\"dGVzdA==\",\"clamp.config.sdc.catalog.url\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/\",\"clamp.config.sdc.hostUrl\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.sdc.serviceUrl\":\"http:\/\/third_party_proxy:8085\/sdc\/v1\/catalog\/services\",\"clamp.config.dcae.inventory.url\":\"http:\/\/third_party_proxy:8085\",\"clamp.config.dcae.dispatcher.url\":\"http:\/\/third_party_proxy:8085\",\"spring.profiles.active\":\"clamp-default,clamp-default-user,clamp-sdc-controller\",\"server.ssl.client-auth\":\"want\"}/g' clamp.env
 
 # Add the sql to create template so it is played by docker-compose later
 cp ../../../src/test/resources/sql/four_templates_only.sql ../../sql/bulkload/
index c7cf03e..804603f 100755 (executable)
@@ -25,7 +25,7 @@ cat << EOF > $JSON
 {
        "version": "1",
        "topicNsRoot": "org.onap.dmaap",
-       "drProvUrl": "http://${2}:${DRPORT}",
+       "drProvUrl": "${PROTO}://dmaap-dr-prov:${DRPORT}",
        "dmaapName": "onapCSIT",
        "bridgeAdminTopic": "MM_AGENT_PROV"
 
index 688ce7d..317c17f 100755 (executable)
@@ -12,7 +12,16 @@ function dmaapbc_launch() {
 
        TMP_CFG=/tmp/docker-databus-controller.conf
        . ./onapCSIT.env > $TMP_CFG
-       docker run -d --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG
+       ADDHOSTS=""
+       if [ ! -z "$2" ]
+       then
+               ADDHOSTS="$ADDHOSTS --add-host=message-router:$2"
+       fi
+       if [ ! -z "$3" ]
+       then
+               ADDHOSTS="$ADDHOSTS --add-host=dmaap-dr-prov:$3"
+       fi
+       docker run -d $ADDHOSTS --name $CONTAINER_NAME -v $TMP_CFG:/opt/app/config/conf $TAG
        IP=`get-instance-ip.sh ${CONTAINER_NAME}`
 
        # Wait for initialization
diff --git a/test/csit/scripts/dmaap-buscontroller/dr-launch.sh b/test/csit/scripts/dmaap-buscontroller/dr-launch.sh
new file mode 100644 (file)
index 0000000..abc0aae
--- /dev/null
@@ -0,0 +1,59 @@
+
+#!/bin/bash
+
+#!/bin/bash
+
+# script to launch DMaaP DR  docker containers
+# sets global var IP with assigned IP address of DR Prov
+
+function dmaap_dr_launch() {
+        IP=""
+
+
+       # This next section was copied from scripts/dmaap-datarouter/dr-suite/setup.sh
+       # and slightly modified...
+
+       # Clone DMaaP Data Router repo
+       mkdir -p $WORKSPACE/archives/dmaapdr
+       cd $WORKSPACE/archives/dmaapdr
+
+       git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master
+       cd datarouter
+       git pull
+       cd $WORKSPACE/archives/dmaapdr/datarouter/docker-compose/
+
+       sed -i 's/10003/10001/g' docker-compose.yml
+       # start DMaaP DR containers with docker compose and configuration from docker-compose.yml
+       docker login -u docker -p docker nexus3.onap.org:10001
+       docker-compose up -d
+
+       # Wait for initialization of Docker container for datarouter-node, datarouter-prov and mariadb
+       for i in {1..50}; do
+           if [ $(docker inspect --format '{{ .State.Running }}' datarouter-node) ] && \
+               [ $(docker inspect --format '{{ .State.Running }}' datarouter-prov) ] && \
+               [ $(docker inspect --format '{{ .State.Running }}' mariadb) ]
+           then
+               echo "DR Service Running"
+               break
+           else
+               echo sleep $i
+               sleep $i
+           fi
+       done
+
+       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_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}
+
+       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"
+
+       #Pass any variables required by Robot test suites in ROBOT_VARIABLES
+       ROBOT_VARIABLES="-v DR_PROV_IP:${DR_PROV_IP} -v DR_NODE_IP:${DR_NODE_IP}"
+
+        IP=${DR_GATEWAY_IP}
+}
index 61026d7..1d1d0fd 100644 (file)
@@ -16,8 +16,8 @@
 
 NEXUS_USERNAME=docker
 NEXUS_PASSWD=docker
-NEXUS_DOCKER_REPO=nexus3.onap.org:10001
-DOCKER_IMAGE_VERSION=latest
+export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
+export DOCKER_IMAGE_VERSION=latest
 
 echo "This is ${WORKSPACE}/test/csit/scripts/externalapi-nbi/start_nbi_containers.sh"
 
index a8e8484..1f64426 100644 (file)
@@ -252,7 +252,7 @@ music_new_version = True
 # Base URL for Music REST API without a trailing slash. (string value)
 server_url = http://localhost:8080/MUSIC/rest/v2
 version = v2
-music_version = "2.4.22"
+music_version = "3.0.3"
 aafuser = conductor
 aafpass = c0nduct0r
 aafns = conductor
index ee5479e..08bf0bc 100755 (executable)
@@ -63,6 +63,10 @@ echo "MULTICLOUDSIM_IP=${MULTICLOUDSIM_IP}"
 sed  -i -e "s%msb.onap.org:8082/%${MULTICLOUDSIM_IP}:8082/%g" /tmp/conductor/properties/conductor.conf
 
 #onboard conductor into music
+echo "Query MUSIC to check for reachability. Query Version"
+curl -vvvvv --noproxy "*" --request GET http://${MUSIC_IP}:8080/MUSIC/rest/v2/version -H "Content-Type: application/json"
+echo "Onboard conductor into music"
 curl -vvvvv --noproxy "*" --request POST http://${MUSIC_IP}:8080/MUSIC/rest/v2/admin/onboardAppWithMusic -H "Content-Type: application/json" --data @${WORKSPACE}/test/csit/tests/optf-has/has/data/onboard.json
 
 docker run -d --name cond-cont -v ${COND_CONF}:/usr/local/bin/conductor.conf -v ${LOG_CONF}:/usr/local/bin/log.conf ${IMAGE_NAME}:latest python /usr/local/bin/conductor-controller --config-file=/usr/local/bin/conductor.conf
index fdd9a3e..1e978c2 100755 (executable)
@@ -51,10 +51,10 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001"
 CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db`
 echo "CASSANDRA_IP=${CASSA_IP}"
 ${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042
-
+sleep 60
 # Start Music war
 docker run -d --name music-war -v music-vol:/app ${MUSIC_IMG};
-
+sleep 15
 # Start Zookeeper
 docker run -d --name music-zk --network music-net -p "2181:2181" -p "2888:2888" -p "3888:3888" ${ZK_IMG};
 #ZOO_IP=`docker inspect --format '{{ .NetworkSettings.Networks.bridge.IPAddress}}' music-zk`
@@ -80,7 +80,7 @@ echo "TOMCAT_IP=${TOMCAT_IP}"
 ${WORKSPACE}/test/csit/scripts/optf-has/has/wait_for_port.sh ${TOMCAT_IP} 8080
 
 # wait a while to make sure music is totally up and configured
-sleep 10
+sleep 60
 
 echo "inspect docker things for tracing purpose"
 docker inspect music-db
index d2229aa..7bb9731 100755 (executable)
@@ -160,7 +160,7 @@ INTERVAL=20
 TIME=0 
 while [ "$TIME" -lt "$TIME_OUT" ]; do 
        
-       curl -i -v -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'ClientAuth: cHl0aG9uOnRlc3Q=' -H 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' -H 'Environment: TEST' -X POST -d '{"policyName": ".*"}' http://${PDP_IP}:8081/pdp/api/getConfig && break
+       curl -k -i -v -H 'Content-Type: application/json' -H 'Accept: application/json' -H 'ClientAuth: cHl0aG9uOnRlc3Q=' -H 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' -H 'Environment: TEST' -X POST -d '{"policyName": ".*"}' https://${PDP_IP}:8081/pdp/api/getConfig && break
        
 echo Sleep: $INTERVAL seconds before testing if Policy is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds 
   sleep $INTERVAL 
index a6a8a6b..c4bdae2 100644 (file)
 # ============LICENSE_END============================================
 # ===================================================================
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
 
 echo "This is ${WORKSPACE}/test/csit/scripts/vid/start_vid_containers.sh"
 
-
-RELEASE=vid:latest
-CONFIG_PATH=${WORKSPACE}/data/clone/vid/lf_config
-
 export IP=`ifconfig eth0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'`
-export PREFIX='nexus3.onap.org:10001/onap'
-
-#start Maria-DB
-docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v ${CONFIG_PATH}/vid-my.cnf:/etc/mysql/my.cnf -v ${CONFIG_PATH}/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10
-
-#start VID server
 
-docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d nexus3.onap.org:10001/onap/${RELEASE}
+cd ${WORKSPACE}/test/csit/tests/vid/resources
+docker-compose up -d --build
 
 # WAIT 5 minutes maximum and test every 5 seconds if VID up using HealthCheck API
 
index 305044c..e8b1429 100644 (file)
@@ -60,6 +60,7 @@ Set Properties for HolmesModel1
     Select From List By Label       id=vf      vFirewall 0
     Select From List By Label       id=actionSet      VNF
     Select From List By Label       id=location      Data Center 2      Data Center 3
+    Input Text      locator=deployParameters       text={}
     Click Button    locator=Save
 
 Set Policy Box properties for HolmesModel1
index 0dc0a8a..bdc537e 100644 (file)
@@ -53,6 +53,7 @@ Set Properties for TCAModel1
     Select From List By Label       id=vf       vLoadBalancer 0
     Select From List By Label       id=actionSet      VNF
     Select From List By Label       id=location      Data Center 1      Data Center 3
+    Input Text      locator=deployParameters       text={}
     Click Button    locator=Save
 
 Set Policy Box properties for TCAModel1
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/__init__.robot
new file mode 100644 (file)
index 0000000..c0a96db
--- /dev/null
@@ -0,0 +1,56 @@
+*** Settings ***
+Library       DcaeAppSimulatorLibrary
+Library       ConsulLibrary
+Library       VesHvContainersUtilsLibrary
+
+Suite Setup       HV-VES Collector Suites Setup
+
+*** Keywords ***
+HV-VES Collector Suites Setup
+    Log   Started Suite: HV-VES
+    Configure collector
+    Configure Dcae App
+    Log   Suite setup finished
+
+
+Configure collector
+    ${CONSUL_API_ACCESS}=   Get Consul Api Access Url   ${HTTP_METHOD_URL}   ${CONSUL_CONTAINER_HOST}   ${CONSUL_CONTAINER_PORT}
+    ${CONSUL_API_URL}=  Catenate   SEPARATOR=   ${CONSUL_API_ACCESS}   ${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}
+    Publish HV VES Configuration In Consul    ${CONSUL_API_URL}   ${VES_HV_CONFIGURATION_JSON_FILEPATH}
+
+Configure Dcae App
+    ${DCAE_APP_API_ACCESS}=   Get Dcae App Api Access Url   ${HTTP_METHOD_URL}   ${DCAE_APP_CONTAINER_HOST}   ${DCAE_APP_CONTAINER_PORT}
+
+    ${DCAE_APP_API_MESSAGE_RESET_URL}=   Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_RESET_PATH}
+    Set Suite Variable    ${DCAE_APP_API_MESSAGE_RESET_URL}    children=True
+
+    ${DCAE_APP_API_MESSAGES_COUNT_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_COUNT_PATH}
+    Set Suite Variable    ${DCAE_APP_API_MESSAGES_COUNT_URL}    children=True
+
+    ${DCAE_APP_API_MESSAGES_VALIDATION_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_MESSAGES_VALIDATION_PATH}
+    Set Suite Variable    ${DCAE_APP_API_MESSAGES_VALIDATION_URL}    children=True
+
+    ${DCAE_APP_API_TOPIC_CONFIGURATION_URL}=  Catenate   SEPARATOR=   ${DCAE_APP_API_ACCESS}   ${DCAE_APP_API_TOPIC_CONFIGURATION_PATH}
+    Wait until keyword succeeds   10 sec   5 sec
+    ...    Configure Dcae App Simulator To Consume Messages From Topics   ${DCAE_APP_API_TOPIC_CONFIGURATION_URL}  ${ROUTED_MESSAGES_TOPIC}
+
+
+*** Variables ***
+${HTTP_METHOD_URL}                             http://
+
+${CONSUL_CONTAINER_HOST}                       consul
+${CONSUL_CONTAINER_PORT}                       8500
+${CONSUL_VES_HV_CONFIGURATION_KEY_PATH}        /v1/kv/veshv-config
+
+${DCAE_APP_CONTAINER_HOST}                     dcae-app-simulator
+${DCAE_APP_CONTAINER_PORT}                     6063
+${DCAE_APP_API_TOPIC_CONFIGURATION_PATH}       /configuration/topics
+${DCAE_APP_API_MESSAGES_RESET_PATH}            /messages
+${DCAE_APP_API_MESSAGES_PATH}                  /messages/all
+${DCAE_APP_API_MESSAGES_COUNT_PATH}            ${DCAE_APP_API_MESSAGES_PATH}/count
+${DCAE_APP_API_MESSAGES_VALIDATION_PATH}       ${DCAE_APP_API_MESSAGES_PATH}/validate
+
+${ROUTED_MESSAGES_TOPIC}                       test-hv-ran-meas
+
+${VES_HV_RESOURCES}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources
+${VES_HV_CONFIGURATION_JSON_FILEPATH}          ${VES_HV_RESOURCES}/ves-hv-configuration.json
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/authorization.robot
new file mode 100644 (file)
index 0000000..1b832f2
--- /dev/null
@@ -0,0 +1,35 @@
+*** Settings ***
+Library       DcaeAppSimulatorLibrary
+
+Resource      resources/common-keywords.robot
+
+Suite Setup       Client Authorization Suite Setup
+Suite Teardown    VES-HV Collector Suite Teardown
+Test Teardown     VES-HV Collector Test Shutdown
+
+*** Keywords ***
+Client Authorization Suite Setup
+    Log   Started Suite: VES-HV Client Authorization
+    ${XNF_PORTS_LIST}=    Create List    7000
+    Configure Invalid xNF Simulators On Ports    ${XNF_PORTS_LIST}
+    Log   Suite setup finished
+
+
+*** Test Cases ***
+Authorization
+    [Documentation]   VES-HV Collector should not authorize XNF with invalid certificate and not route any message
+    ...               to topics
+
+    ${SIMULATORS_LIST}=   Get Invalid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_VALID_MESSAGES_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...     Assert Dcae App Consumed   ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_0}
+
+
+*** Variables ***
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+
+${XNF_VALID_MESSAGES_REQUEST}                  ${VES_HV_SCENARIOS}/authorization/xnf-valid-messages-request.json
+
+${AMOUNT_0}                                    0
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/ConsulLibrary.py
new file mode 100644 (file)
index 0000000..52d7e0e
--- /dev/null
@@ -0,0 +1,16 @@
+from robot.api import logger
+import HttpRequests
+
+CONSUL_NAME = "Consul"
+
+class ConsulLibrary:
+
+    def publish_hv_ves_configuration_in_consul(self, consul_url, consul_configuration_filepath):
+        logger.info("Reading consul configuration file from: " + consul_configuration_filepath)
+        file = open(consul_configuration_filepath, "rb")
+        data = file.read()
+        file.close()
+
+        logger.info("PUT at: " + consul_url)
+        resp = HttpRequests.session_without_env().put(consul_url, data=data, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, CONSUL_NAME)
\ No newline at end of file
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/DcaeAppSimulatorLibrary.py
new file mode 100644 (file)
index 0000000..ab3b1e2
--- /dev/null
@@ -0,0 +1,46 @@
+import HttpRequests
+from robot.api import logger
+
+DCAE_APP_NAME = "DCAE App"
+
+
+class DcaeAppSimulatorLibrary:
+
+    def configure_dcae_app_simulator_to_consume_messages_from_topics(self, app_url, topics):
+        logger.info("PUT at: " + app_url)
+        resp = HttpRequests.session_without_env().put(app_url, data={'topics': topics}, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
+
+    def assert_DCAE_app_consumed(self, app_url, expected_messages_amount):
+        logger.info("GET at: " + app_url)
+        resp = HttpRequests.session_without_env().get(app_url, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
+
+        assert resp.content == expected_messages_amount, \
+            "Messages consumed by simulator: " + resp.content + " expecting: " + expected_messages_amount
+
+    def assert_DCAE_app_consumed_less_equal_than(self, app_url, messages_threshold):
+        logger.info("GET at: " + app_url)
+        resp = HttpRequests.session_without_env().get(app_url, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
+
+        logger.debug("Messages consumed by simulator: " + resp.content +
+                     " expecting more than 0 and less/equal than " + messages_threshold)
+
+        assert 0 < int(resp.content) <= int(messages_threshold), \
+            "Messages consumed by simulator: " + resp.content + \
+            " expecting more than 0 and less/equal than " + messages_threshold
+
+    def reset_DCAE_app_simulator(self, app_url):
+        logger.info("DELETE at: " + app_url)
+        resp = HttpRequests.session_without_env().delete(app_url, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
+
+    def assert_DCAE_app_consumed_proper_messages(self, app_url, message_filepath):
+        logger.info("POST at: " + app_url)
+        file = open(message_filepath, "rb")
+        data = file.read()
+        file.close()
+
+        resp = HttpRequests.session_without_env().post(app_url, data=data, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, DCAE_APP_NAME)
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/HttpRequests.py
new file mode 100644 (file)
index 0000000..0d1d928
--- /dev/null
@@ -0,0 +1,12 @@
+import requests
+from robot.api import logger
+
+def session_without_env():
+    session = requests.Session()
+    session.trust_env = False
+    return session
+
+def checkStatusCode(status_code, server_name):
+    if status_code != 200:
+        logger.error("Response status code from " + server_name + ": " + str(status_code))
+        raise (Exception(server_name + " returned status code " + status_code))
\ No newline at end of file
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/VesHvContainersUtilsLibrary.py
new file mode 100644 (file)
index 0000000..989a796
--- /dev/null
@@ -0,0 +1,69 @@
+from time import time
+
+from robot.api import logger
+import os.path
+import docker
+from io import BytesIO
+from os.path import basename
+from tarfile import TarFile, TarInfo
+
+LOCALHOST = "localhost"
+
+
+class VesHvContainersUtilsLibrary:
+
+    def get_consul_api_access_url(self, method, image_name, port):
+        return self.create_url(
+            method,
+            self.get_instance_address(image_name, port)
+        )
+
+    def get_xnf_sim_api_access_url(self, method, host):
+        if is_running_inside_docker():
+            return self.create_url(method, host)
+        else:
+            logger.info("File `/.dockerenv` not found. Assuming local environment and using localhost.")
+            port_from_container_name = str(host)[-4:]
+            return self.create_url(method, LOCALHOST + ":" + port_from_container_name)
+
+    def get_dcae_app_api_access_url(self, method, image_name, port):
+        return self.create_url(
+            method,
+            self.get_instance_address(image_name, port)
+        )
+
+    def get_instance_address(self, image_name, port):
+        if is_running_inside_docker():
+            return image_name + ":" + port
+        else:
+            logger.info("File `/.dockerenv` not found. Assuming local environment and using localhost.")
+            return LOCALHOST + ":" + port
+
+    def create_url(self, method, host_address):
+        return method + host_address
+
+def is_running_inside_docker():
+    return os.path.isfile("/.dockerenv")
+
+def copy_to_container(container_id, filepaths, path='/etc/ves-hv'):
+    with create_archive(filepaths) as archive:
+        docker.APIClient('unix:///var/run/docker.sock') \
+            .put_archive(container=container_id, path=(path), data=archive)
+
+
+def create_archive(filepaths):
+    tarstream = BytesIO()
+    tarfile = TarFile(fileobj=tarstream, mode='w')
+    for filepath in filepaths:
+        file = open(filepath, 'r')
+        file_data = file.read()
+
+        tarinfo = TarInfo(name=basename(file.name))
+        tarinfo.size = len(file_data)
+        tarinfo.mtime = time()
+
+        tarfile.addfile(tarinfo, BytesIO(file_data))
+
+    tarfile.close()
+    tarstream.seek(0)
+    return tarstream
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/libraries/XnfSimulatorLibrary.py
new file mode 100644 (file)
index 0000000..b2466d7
--- /dev/null
@@ -0,0 +1,126 @@
+from VesHvContainersUtilsLibrary import copy_to_container
+import HttpRequests
+import os
+import docker
+from robot.api import logger
+from time import sleep
+
+XNF_SIMULATOR_NAME = "xNF Simulator"
+SIMULATOR_IMAGE_NAME = "onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-xnf-simulator"
+SIMULATOR_IMAGE_FULL_NAME = os.getenv("DOCKER_REGISTRY") + "/" + SIMULATOR_IMAGE_NAME + ":latest"
+WORKSPACE_ENV = os.getenv("WORKSPACE")
+certificates_dir_path = WORKSPACE_ENV + "/test/csit/plans/dcaegen2-collectors-hv-ves/testsuites/ssl/"
+collector_certs_lookup_dir = "/etc/ves-hv/"
+ONE_SECOND_IN_NANOS = 10 ** 9
+
+
+class XnfSimulatorLibrary:
+
+    def start_xnf_simulators(self, list_of_ports, valid_certs=True):
+        logger.info("Creating " + str(len(list_of_ports)) + " xNF Simulator containers")
+        dockerClient = docker.from_env()
+        cert_name_prefix = "" if valid_certs else "invalid_"
+        self.pullImageIfAbsent(dockerClient)
+        logger.info("Using image: " + SIMULATOR_IMAGE_FULL_NAME)
+        simulators_addresses = self.create_simulators(dockerClient, list_of_ports, cert_name_prefix)
+        self.assert_containers_startup_was_successful(dockerClient)
+        dockerClient.close()
+        return simulators_addresses
+
+    def pullImageIfAbsent(self, dockerClient):
+        try:
+            dockerClient.images.get(SIMULATOR_IMAGE_FULL_NAME)
+        except:
+            logger.console("Image " + SIMULATOR_IMAGE_FULL_NAME + " will be pulled from repository. "
+                                                                  "This can take a while.")
+            dockerClient.images.pull(SIMULATOR_IMAGE_FULL_NAME)
+
+    def create_simulators(self, dockerClient, list_of_ports, cert_name_prefix):
+        simulators_addresses = []
+        for port in list_of_ports:
+            container = self.run_simulator(dockerClient, port,
+                                           collector_certs_lookup_dir + cert_name_prefix + "client.crt",
+                                           collector_certs_lookup_dir + cert_name_prefix + "client.key",
+                                           collector_certs_lookup_dir + cert_name_prefix + "trust.crt"
+                                           )
+
+            logger.info("Started container: " + container.name + "  " + container.id)
+            simulators_addresses.append(container.name + ":" + port)
+        return simulators_addresses
+
+    def run_simulator(self, dockerClient, port, client_crt_path, client_key_path, client_trust_store):
+        xNF_startup_command = ["--listen-port", port,
+                               "--ves-host", "ves-hv-collector",
+                               "--ves-port", "6061",
+                               "--cert-file", client_crt_path,
+                               "--private-key-file", client_key_path,
+                               "--trust-cert-file", client_trust_store]
+        xNF_healthcheck_command = {
+            "interval": 5 * ONE_SECOND_IN_NANOS,
+            "timeout": 3 * ONE_SECOND_IN_NANOS,
+            "retries": 1,
+            "test": ["CMD", "curl", "--request", "GET",
+                     "--fail", "--silent", "--show-error",
+                     "localhost:" + port + "/healthcheck"]
+        }
+        logger.info("Startup command: " + str(xNF_startup_command))
+        logger.info("Healthcheck command: " + str(xNF_healthcheck_command))
+        return dockerClient.containers.run(SIMULATOR_IMAGE_FULL_NAME,
+                                           command=xNF_startup_command,
+                                           healthcheck=xNF_healthcheck_command,
+                                           detach=True,
+                                           network="ves-hv-default",
+                                           ports={port + "/tcp": port},
+                                           volumes=self.container_volumes(),
+                                           name="ves-hv-collector-xnf-simulator" + port)
+
+    def container_volumes(self):
+        return {certificates_dir_path: {"bind": collector_certs_lookup_dir, "mode": 'rw'}}
+
+    def assert_containers_startup_was_successful(self, dockerClient):
+        checks_amount = 6
+        check_interval_in_seconds = 5
+        for _ in range(checks_amount):
+            sleep(check_interval_in_seconds)
+            all_containers_healthy = True
+            for container in self.get_simulators_list(dockerClient):
+                all_containers_healthy = all_containers_healthy and self.is_container_healthy(container)
+            if (all_containers_healthy):
+                return
+        raise ContainerException("One of xNF simulators containers did not pass the healthcheck.")
+
+    def is_container_healthy(self, container):
+        container_health = container.attrs['State']['Health']['Status']
+        return container_health == 'healthy' and container.status == 'running'
+
+    def stop_and_remove_all_xnf_simulators(self, suite_name):
+        dockerClient = docker.from_env()
+        for container in self.get_simulators_list(dockerClient):
+            logger.info("Stopping and removing container: " + container.id)
+            log_filename = WORKSPACE_ENV + "/archives/containers_logs/" + \
+                           suite_name.split(".")[-1] + "_" + container.name + ".log"
+            file = open(log_filename, "w+")
+            file.write(container.logs())
+            file.close()
+            container.stop()
+            container.remove()
+        dockerClient.close()
+
+    def get_simulators_list(self, dockerClient):
+        return dockerClient.containers.list(filters={"ancestor": SIMULATOR_IMAGE_FULL_NAME}, all=True)
+
+    def send_messages(self, simulator_url, message_filepath):
+        logger.info("Reading message to simulator from: " + message_filepath)
+
+        file = open(message_filepath, "rb")
+        data = file.read()
+        file.close()
+
+        logger.info("POST at: " + simulator_url)
+        resp = HttpRequests.session_without_env().post(simulator_url, data=data, timeout=5)
+        HttpRequests.checkStatusCode(resp.status_code, XNF_SIMULATOR_NAME)
+
+
+class ContainerException(Exception):
+    def __init__(self, message):
+        super(ContainerException, self).__init__(message)
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/message-routing.robot
new file mode 100644 (file)
index 0000000..6153afa
--- /dev/null
@@ -0,0 +1,93 @@
+*** Settings ***
+Library       DcaeAppSimulatorLibrary
+Library       XnfSimulatorLibrary
+Library       VesHvContainersUtilsLibrary
+Library       Collections
+
+Resource      resources/common-keywords.robot
+
+Suite Setup       Message Routing Suite Setup
+Suite Teardown    VES-HV Collector Suite Teardown
+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 Valid xNF Simulators On Ports    ${XNF_PORTS_LIST}
+    Log   Suite setup finished
+
+*** Test Cases ***
+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
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_FIXED_PAYLOAD_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed   ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_25000}
+    Assert Dcae App Consumed Proper Messages   ${DCAE_APP_API_MESSAGES_VALIDATION_URL}   ${DCAE_FIXED_PAYLOAD_REQUEST}
+
+
+Too big payload message handling
+    [Documentation]   VES-HV Collector should interrupt the stream when encountered message with too big payload
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_TOO_BIG_PAYLOAD_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed Less Equal Than   ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_25000}
+
+
+Invalid wire frame message handling
+    [Documentation]  VES-HV Collector should skip messages with invalid wire frame
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_INVALID_WIRE_FRAME_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed   ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_50000}
+    Assert Dcae App Consumed Proper Messages   ${DCAE_APP_API_MESSAGES_VALIDATION_URL}   ${DCAE_INVALID_WIRE_FRAME_REQUEST}
+
+
+Invalid GPB data message handling
+    [Documentation]   VES-HV Collector should skip messages with invalid GPB data
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_INVALID_GPB_DATA_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed   ${DCAE_APP_API_MESSAGES_COUNT_URL}  ${AMOUNT_50000}
+    Assert Dcae App Consumed Proper Messages   ${DCAE_APP_API_MESSAGES_VALIDATION_URL}   ${DCAE_INVALID_GPB_DATA_REQUEST}
+
+
+Unsupported domain message handling
+    [Documentation]   VES-HV Collector should skip messages with unsupported domain
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   1
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_UNSUPPORTED_DOMAIN_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...    Assert Dcae App Consumed  ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_50000}
+    Assert Dcae App Consumed Proper Messages   ${DCAE_APP_API_MESSAGES_VALIDATION_URL}   ${DCAE_UNSUPPORTED_DOMAIN_REQUEST}
+
+*** Variables ***
+${HTTP_METHOD_URL}                             http://
+
+${XNF_SIM_API_PATH}                            /simulator/async
+
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+${XNF_FIXED_PAYLOAD_REQUEST}                   ${VES_HV_SCENARIOS}/fixed-payload/xnf-fixed-payload-request.json
+${XNF_TOO_BIG_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/too-big-payload/xnf-too-big-payload-request.json
+${XNF_INVALID_WIRE_FRAME_REQUEST}              ${VES_HV_SCENARIOS}/invalid-wire-frame/xnf-invalid-wire-frame-request.json
+${XNF_INVALID_GPB_DATA_REQUEST}                ${VES_HV_SCENARIOS}/invalid-gpb-data/xnf-invalid-gpb-data-request.json
+${XNF_UNSUPPORTED_DOMAIN_REQUEST}              ${VES_HV_SCENARIOS}/unsupported-domain/xnf-unsupported-domain-request.json
+
+${DCAE_FIXED_PAYLOAD_REQUEST}                  ${VES_HV_SCENARIOS}/fixed-payload/dcae-fixed-payload-request.json
+${DCAE_INVALID_WIRE_FRAME_REQUEST}             ${VES_HV_SCENARIOS}/invalid-wire-frame/dcae-invalid-wire-frame-request.json
+${DCAE_INVALID_GPB_DATA_REQUEST}               ${VES_HV_SCENARIOS}/invalid-gpb-data/dcae-invalid-gpb-data-request.json
+${DCAE_UNSUPPORTED_DOMAIN_REQUEST}             ${VES_HV_SCENARIOS}/unsupported-domain/dcae-unsupported-domain-request.json
+
+${AMOUNT_25000}                                25000
+${AMOUNT_50000}                                50000
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/multiple-clients.robot
new file mode 100644 (file)
index 0000000..862a2bc
--- /dev/null
@@ -0,0 +1,35 @@
+*** Settings ***
+Library       DcaeAppSimulatorLibrary
+
+Resource      resources/common-keywords.robot
+
+Suite Setup       Multiple Clients Handling Suite Setup
+Suite Teardown    VES-HV Collector Suite Teardown
+Test Teardown     VES-HV Collector Test Shutdown
+
+*** Keywords ***
+Multiple Clients Handling Suite Setup
+    Log   Started Suite: VES-HV Multiple Clients Handling
+    ${XNF_PORTS_LIST}=    Create List    7000   7001   7002
+    Configure Valid xNF Simulators On Ports    ${XNF_PORTS_LIST}
+    Log   Suite setup finished
+
+*** Test Cases ***
+Handle Multiple Connections
+    [Documentation]   VES-HV Collector should handle multiple incoming transmissions
+
+    ${SIMULATORS_LIST}=   Get Valid xNF Simulators   3
+    Send Messages From xNF Simulators   ${SIMULATORS_LIST}   ${XNF_SMALLER_PAYLOAD_REQUEST}
+
+    Wait until keyword succeeds   60 sec   5 sec
+    ...     Assert Dcae App Consumed   ${DCAE_APP_API_MESSAGES_COUNT_URL}   ${AMOUNT_15000}
+    Assert Dcae App Consumed Proper Messages   ${DCAE_APP_API_MESSAGES_VALIDATION_URL}   ${DCAE_SMALLER_PAYLOAD_REQUEST}
+
+
+*** Variables ***
+${VES_HV_SCENARIOS}                            %{WORKSPACE}/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios
+
+${XNF_SMALLER_PAYLOAD_REQUEST}                 ${VES_HV_SCENARIOS}/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json
+${DCAE_SMALLER_PAYLOAD_REQUEST}                ${VES_HV_SCENARIOS}/multiple-simulators-payload/dcae-smaller-valid-request.json
+
+${AMOUNT_15000}                                15000
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/common-keywords.robot
new file mode 100644 (file)
index 0000000..bc03de2
--- /dev/null
@@ -0,0 +1,50 @@
+*** Settings ***
+Library       XnfSimulatorLibrary
+Library       VesHvContainersUtilsLibrary
+Library       Collections
+
+*** Keywords ***
+Configure Valid xNF Simulators On Ports
+    [Arguments]    ${XNF_PORTS_LIST}
+    ${VALID_XNF_SIMULATORS_ADDRESSES}=   Start Xnf Simulators    ${XNF_PORTS_LIST}    ${true}
+    Set Suite Variable    ${VALID_XNF_SIMULATORS_ADDRESSES}
+
+
+Configure Invalid xNF Simulators On Ports
+    [Arguments]    ${XNF_PORTS_LIST}
+    ${INVALID_XNF_SIMULATORS_ADDRESSES}=   Start Xnf Simulators    ${XNF_PORTS_LIST}    ${false}
+    Set Suite Variable    ${INVALID_XNF_SIMULATORS_ADDRESSES}
+
+
+Get Valid xNF Simulators
+    [Arguments]  ${AMOUNT}
+    ${SIMULATORS}=   Get Slice From List   ${VALID_XNF_SIMULATORS_ADDRESSES}   0   ${AMOUNT}
+    [Return]   ${SIMULATORS}
+
+
+Get Invalid xNF Simulators
+    [Arguments]  ${AMOUNT}
+    ${SIMULATORS}=   Get Slice From List   ${INVALID_XNF_SIMULATORS_ADDRESSES}   0   ${AMOUNT}
+    [Return]   ${SIMULATORS}
+
+
+Send Messages From xNF Simulators
+    [Arguments]    ${XNF_HOSTS_LIST}   ${MESSAGE_FILEPATH}
+    :FOR   ${HOST}   IN    @{XNF_HOSTS_LIST}
+    \    ${XNF_SIM_API_ACCESS}=   Get xNF Sim Api Access Url   ${HTTP_METHOD_URL}   ${HOST}
+    \    ${XNF_SIM_API_URL}=  Catenate   SEPARATOR=   ${XNF_SIM_API_ACCESS}   ${XNF_SIM_API_PATH}
+    \    Send messages   ${XNF_SIM_API_URL}   ${MESSAGE_FILEPATH}
+
+
+VES-HV Collector Test Shutdown
+    Reset DCAE App Simulator  ${DCAE_APP_API_MESSAGE_RESET_URL}
+
+
+VES-HV Collector Suite Teardown
+    Stop And Remove All Xnf Simulators   ${SUITE NAME}
+
+*** Variables ***
+${HTTP_METHOD_URL}                             http://
+
+${XNF_SIM_API_PATH}                            /simulator/async
+
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/authorization/xnf-valid-messages-request.json
new file mode 100644 (file)
index 0000000..c71793d
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 500000
+  }
+]
\ No newline at end of file
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/dcae-fixed-payload-request.json
new file mode 100644 (file)
index 0000000..fb53f50
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "FIXED_PAYLOAD",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/fixed-payload/xnf-fixed-payload-request.json
new file mode 100644 (file)
index 0000000..fb53f50
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "FIXED_PAYLOAD",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/dcae-invalid-gpb-data-request.json
new file mode 100644 (file)
index 0000000..772b03b
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 50000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-gpb-data/xnf-invalid-gpb-data-request.json
new file mode 100644 (file)
index 0000000..d9cb4c2
--- /dev/null
@@ -0,0 +1,65 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "INVALID_GPB_DATA",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/dcae-invalid-wire-frame-request.json
new file mode 100644 (file)
index 0000000..772b03b
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 50000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/invalid-wire-frame/xnf-invalid-wire-frame-request.json
new file mode 100644 (file)
index 0000000..88d4e32
--- /dev/null
@@ -0,0 +1,65 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "INVALID_WIRE_FRAME",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/dcae-smaller-valid-request.json
new file mode 100644 (file)
index 0000000..9d34a7e
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "FIXED_PAYLOAD",
+    "messagesAmount": 15000
+  }
+]
\ No newline at end of file
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/multiple-simulators-payload/xnf-simulator-smaller-valid-request.json
new file mode 100644 (file)
index 0000000..625737e
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "FIXED_PAYLOAD",
+    "messagesAmount": 5000
+  }
+]
\ No newline at end of file
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/too-big-payload/xnf-too-big-payload-request.json
new file mode 100644 (file)
index 0000000..b1c727a
--- /dev/null
@@ -0,0 +1,65 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "TOO_BIG_PAYLOAD",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/dcae-unsupported-domain-request.json
new file mode 100644 (file)
index 0000000..772b03b
--- /dev/null
@@ -0,0 +1,23 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 50000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/scenarios/unsupported-domain/xnf-unsupported-domain-request.json
new file mode 100644 (file)
index 0000000..e37e20d
--- /dev/null
@@ -0,0 +1,65 @@
+[
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "FAULT",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 100
+  },
+  {
+    "commonEventHeader": {
+      "version": "sample-version",
+      "domain": "HVRANMEAS",
+      "sequence": 1,
+      "priority": 1,
+      "eventId": "sample-event-id",
+      "eventName": "sample-event-name",
+      "eventType": "sample-event-type",
+      "startEpochMicrosec": 120034455,
+      "lastEpochMicrosec": 120034455,
+      "nfNamingCode": "sample-nf-naming-code",
+      "nfcNamingCode": "sample-nfc-naming-code",
+      "reportingEntityId": "sample-reporting-entity-id",
+      "reportingEntityName": "sample-reporting-entity-name",
+      "sourceId": "sample-source-id",
+      "sourceName": "sample-source-name"
+    },
+    "messageType": "VALID",
+    "messagesAmount": 25000
+  }
+]
diff --git a/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json b/test/csit/tests/dcaegen2-collectors-hv-ves/testcases/resources/ves-hv-configuration.json
new file mode 100644 (file)
index 0000000..3235a0c
--- /dev/null
@@ -0,0 +1,9 @@
+{
+  "kafkaBootstrapServers": "kafka:9092",
+  "routing": [
+    {
+      "fromDomain": 11,
+      "toTopic": "test-hv-ran-meas"
+    }
+  ]
+}
\ No newline at end of file
index e69de29..f13ba6d 100644 (file)
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation    Integration - PRH suite
\ No newline at end of file
index b7013c4..5150a4b 100644 (file)
@@ -10,7 +10,7 @@ Resource          resources/prh_library.robot
 ${DMAAP_SIMULATOR_URL}    http://${DMAAP_SIMULATOR}
 ${AAI_SIMULATOR_URL}    http://${AAI_SIMULATOR}
 ${PRH_URL}        http://${PRH}
-${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
+${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}    {"event": {"commonEventHeader": {"sourceName":"NOK6061ZW1"}, "pnfRegistrationFields": {"oamV4IpAddress":"10.16.123.234", "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
 ${Not_json_format}    ""
 
 *** Test Cases ***
@@ -19,28 +19,18 @@ Valid DMaaP event can be converted to PNF_READY notification
     [Tags]    PRH    Valid event
     [Template]    Valid event processing
     ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"QTFCOC540002G", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"QTFCOC540002F", "pnfOamIpv4Address":"", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"Ericsson", "pnfSerialNumber":"QTFCOC5400000", "pnfOamIpv4Address":"", "pnfOamIpv6Address":"2001:0db8:85b3:0000:0000:8a2e:0370:7334"}}}
+    {"event": {"commonEventHeader": {"sourceName":"NOK6061ZW2"}, "pnfRegistrationFields": {"oamV4IpAddress":"10.17.123.234", "oamV6IpAddress":""}}}
+    {"event": {"commonEventHeader": {"sourceName":"ERI6061ZW3"}, "pnfRegistrationFields": {"oamV4IpAddress":"", "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2e:0370:7334"}}}
 
 Invalid DMaaP event cannot be converted to PNF_READY notification
     [Documentation]    PRH get invalid event from DMaaP with missing required fields - PRH does not produce PNF_READY notification
     [Tags]    PRH    Invalid event
     [Template]    Invalid event processing
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"", "pnfOamIpv4Address":"", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"Nokia", "pnfSerialNumber":"", "pnfOamIpv4Address":"", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"QTFCOC540002E", "pnfOamIpv4Address":"", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":""}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"", "pnfOamIpv4Address":"", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}}
-    {"event": {"otherFields": {"pnfVendorName":"", "pnfSerialNumber":"", "pnfOamIpv4Address":"", "pnfOamIpv6Address":""}}}
-    ${Not_json_format}
+    {"event": {"commonEventHeader": {"sourceName":"NOK6061ZW4"}, "pnfRegistrationFields": {"oamV4IpAddress":"", "oamV6IpAddress":""}}}
+    {"event": {"commonEventHeader": {"sourceName":""}, "pnfRegistrationFields": {"oamV4IpAddress":"10.18.123.234", "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8a2a:0370:7334"}}}
+    {"event": {"commonEventHeader": {"sourceName":""}, "pnfRegistrationFields": {"oamV4IpAddress":"10.17.163.234", "oamV6IpAddress":""}}}
+    {"event": {"commonEventHeader": {"sourceName":""}, "pnfRegistrationFields": {"oamV4IpAddress":"", "oamV6IpAddress":"2001:0db8:85a3:0000:0000:8b2f:0370:7334"}}}
+    {"event": {"commonEventHeader": {"sourceName":""}, "pnfRegistrationFields": {"oamV4IpAddress":"", "oamV6IpAddress":""}}}
 
 Get valid event from DMaaP and record in AAI does not exist
     [Documentation]    PRH get valid event from DMaaP with all required fields and in AAI record doesn't exist - PRH does not produce PNF_READY notification
@@ -48,7 +38,13 @@ Get valid event from DMaaP and record in AAI does not exist
     [Timeout]    30s
     Set PNF name in AAI    wrong_aai_record
     Set event in DMaaP    ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
-    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    org.onap.dcaegen2.services.prh.exceptions.AAINotFoundException: Incorrect response code for continuation of tasks workflow
+    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.io.IOException: Connection closed prematurely
+
+Event in DMaaP is not JSON format
+    [Documentation]    PRH get not JSON format event from DMaaP - PRH does not produce PNF_READY notification
+    [Tags]    PRH
+    Set event in DMaaP    ${Not_json_format}
+    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    |java.lang.IllegalStateException: Not a JSON Array:
 
 Get valid event from DMaaP and AAI is not responding
     [Documentation]    PRH get valid event from DMaaP with all required fields and AAI is not responding - PRH does not produce PNF_READY notification
@@ -56,4 +52,4 @@ Get valid event from DMaaP and AAI is not responding
     [Timeout]    180s
     Stop AAI
     Set event in DMaaP    ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
-    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.NoRouteToHostException: Host is unreachable (Host unreachable)
+    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.UnknownHostException: aai
index ac3fba4..c2a8b78 100644 (file)
@@ -21,16 +21,18 @@ class PrhLibrary(object):
     @staticmethod
     def create_pnf_ready_notification(json_file):
         json_to_python = json.loads(json_file)
-        ipv4 = json_to_python["event"]["otherFields"]["pnfOamIpv4Address"]
-        ipv6 = json_to_python["event"]["otherFields"]["pnfOamIpv6Address"]
-        pnf_name = _create_pnf_name(json_file)
-        str_json = '{"pnf-name":"' + pnf_name + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '"}'
+        ipv4 = json_to_python["event"]["pnfRegistrationFields"]["oamV4IpAddress"]
+        ipv6 = json_to_python["event"]["pnfRegistrationFields"]["oamV6IpAddress"]
+        header = json_to_python["event"]["commonEventHeader"]["sourceName"]
+        str_json = '{"sourceName":"' + header + '","ipaddress-v4-oam":"' + ipv4 + '","ipaddress-v6-oam":"' + ipv6 + '"}'
         python_to_json = json.dumps(str_json)
         return python_to_json.replace("\\", "")[1:-1]
 
     @staticmethod
     def create_pnf_name(json_file):
-        return _create_pnf_name(json_file)
+        json_to_python = json.loads(json_file)
+        header = json_to_python["event"]["commonEventHeader"]["sourceName"]
+        return header
 
     @staticmethod
     def stop_aai():
@@ -38,9 +40,7 @@ class PrhLibrary(object):
         container = client.containers.get('aai_simulator')
         container.stop()
 
-
-def _create_pnf_name(json_file):
-    json_to_python = json.loads(json_file)
-    vendor = json_to_python["event"]["otherFields"]["pnfVendorName"]
-    serial_number = json_to_python["event"]["otherFields"]["pnfSerialNumber"]
-    return vendor[:3].upper() + serial_number
+    def create_invalid_notification(self, json_file):
+        return self.create_pnf_ready_notification(json_file).replace("\":", "\": ")\
+            .replace("ipaddress-v4-oam", "oamV4IpAddress").replace("ipaddress-v6-oam", "oamV6IpAddress")\
+            .replace("}", "\\\\n}")
index b1f84fd..67921e8 100644 (file)
@@ -1,12 +1,15 @@
 version: '3'
 services:
   prh:
-    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server
+    image: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.prh.prh-app-server:latest
     command: >
-          --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
-          --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222
-          --aai.aaiClientConfiguration.aaiHostPortNumber=3333
-          --aai.aaiClientConfiguration.aaiProtocol=http
+        --dmaap.dmaapConsumerConfiguration.dmaapHostName=dmaap
+        --dmaap.dmaapConsumerConfiguration.dmaapPortNumber=2222
+        --dmaap.dmaapProducerConfiguration.dmaapHostName=dmaap
+        --dmaap.dmaapProducerConfiguration.dmaapPortNumber=2222
+        --aai.aaiClientConfiguration.aaiHostPortNumber=3333
+        --aai.aaiClientConfiguration.aaiHost=aai
+        --aai.aaiClientConfiguration.aaiProtocol=http
     entrypoint:
       - java
       - -Dspring.profiles.active=dev
@@ -18,10 +21,10 @@ services:
       - "8433:8433"
     container_name: prh
     depends_on:
-     - dmaap_simulator
-     - aai_simulator
+     - dmaap
+     - aai
 
-  dmaap_simulator:
+  dmaap:
     build:
       context: simulator
       dockerfile: DMaaP_simulator
@@ -29,7 +32,7 @@ services:
       - "2222:2222"
     container_name: dmaap_simulator
 
-  aai_simulator:
+  aai:
      build:
        context: simulator
        dockerfile: AAI_simulator
index 10bc26c..fa8c0d0 100644 (file)
@@ -1,6 +1,7 @@
 *** Settings ***
 Library           RequestsLibrary
 Library           Collections
+Library           PrhLibrary.py
 
 *** Keywords ***
 Create header
@@ -17,8 +18,10 @@ Invalid event processing
     [Arguments]    ${input_invalid_event_in_dmaap}
     [Timeout]    30s
     Set event in DMaaP    ${input_invalid_event_in_dmaap}
-    Wait Until Keyword Succeeds    100x    100ms    Check PRH log    INFO 1 --- [pool-2-thread-1] o.o.d.s.prh.tasks.DmaapConsumerTaskImpl \ : Consumed model from DmaaP: ${input_invalid_event_in_dmaap}
-
+    ${invalid_notification}=    Create invalid notification    ${input_invalid_event_in_dmaap}
+    ${notification}=     Catenate        SEPARATOR= \\\\n        |org.onap.dcaegen2.services.prh.exceptions.DmaapNotFoundException: Incorrect json, consumerDmaapModel can not be created:        ${invalid_notification}
+    Wait Until Keyword Succeeds    100x    100ms    Check PRH log       ${notification}
+    
 Valid event processing
     [Arguments]    ${input_valid_event_in_dmaap}
     [Timeout]    30s
index e70d8d3..c57903c 100644 (file)
@@ -7,6 +7,7 @@ pnfs = 'Empty'
 
 
 class AAIHandler(BaseHTTPRequestHandler):
+
     def do_PUT(self):
         if re.search('/set_pnfs', self.path):
             global pnfs
index 013cd0a..89a266e 100644 (file)
@@ -1,4 +1,12 @@
-FROM python:3
+FROM alpine:3.8
+
+RUN apk add --no-cache python3 && \
+    python3 -m ensurepip && \
+    rm -r /usr/lib/python*/ensurepip && \
+    pip3 install --upgrade pip setuptools && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
+    if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
+       rm -r /root/.cache
 
 ADD AAI.py /
 
index 2103784..96e22a1 100644 (file)
@@ -8,6 +8,7 @@ received_event_to_get_method = 'Empty'
 
 
 class DMaaPHandler(BaseHTTPRequestHandler):
+
     def do_PUT(self):
         if re.search('/set_get_event', self.path):
             global received_event_to_get_method
@@ -27,7 +28,7 @@ class DMaaPHandler(BaseHTTPRequestHandler):
         return
 
     def do_GET(self):
-        if re.search('/events/unauthenticated.SEC_OTHER_OUTPUT/OpenDcae-c12/c12', self.path):
+        if re.search('/events/unauthenticated.VES_PNFREG_OUTPUT/OpenDcae-c12/c12', self.path):
             _header_200_and_json(self)
             self.wfile.write(received_event_to_get_method)
         elif re.search('/events/pnfReady', self.path):
index cf4160c..9cf21dc 100644 (file)
@@ -1,4 +1,12 @@
-FROM python:3
+FROM alpine:3.8
+
+RUN apk add --no-cache python3 && \
+    python3 -m ensurepip && \
+    rm -r /usr/lib/python*/ensurepip && \
+    pip3 install --upgrade pip setuptools && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
+    if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
+       rm -r /root/.cache
 
 ADD DMaaP.py /
 
diff --git a/test/csit/tests/dmaap-buscontroller/with_dr/orig b/test/csit/tests/dmaap-buscontroller/with_dr/orig
new file mode 100755 (executable)
index 0000000..fcac202
--- /dev/null
@@ -0,0 +1,116 @@
+*** Settings ***
+Library           OperatingSystem
+Library           RequestsLibrary
+Library           requests
+Library           Collections
+Library           String
+
+*** Variables ***
+${TARGET_URL}                   https://${DR_PROV_IP}:8443
+${TARGET_URL_FEED}              https://${DR_PROV_IP}:8443/feed/1
+${TARGET_URL_SUBSCRIBE}         https://${DR_PROV_IP}:8443/subscribe/1
+${TARGET_URL_SUBSCRIPTION}      https://${DR_PROV_IP}:8443/subs/1
+${TARGET_URL_PUBLISH}           https://${DR_NODE_IP}:8443/publish/1/csit_test
+${CREATE_FEED_DATA}             {"name": "CSIT_Test", "version": "m1.0", "description": "CSIT_Test", "business_description": "CSIT_Test", "suspend": false, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": [],  "endpoint_ids": [{"password": "rs873m", "id": "rs873m"}]}}
+${UPDATE_FEED_DATA}             {"name": "CSIT_Test", "version": "m1.0", "description": "UPDATED-CSIT_Test", "business_description": "CSIT_Test", "suspend": true, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": [],  "endpoint_ids": [{"password": "rs873m", "id": "rs873m"}]}}
+${SUBSCRIBE_DATA}               {"delivery":{ "url":"https://${DR_PROV_IP}:8080/",  "user":"rs873m", "password":"rs873m", "use100":true}, "metadataOnly":false, "suspend":false, "groupid":29, "subscriber":"sg481n"}
+${UPDATE_SUBSCRIPTION_DATA}     {"delivery":{ "url":"https://${DR_PROV_IP}:8080/",  "user":"sg481n", "password":"sg481n", "use100":true}, "metadataOnly":false, "suspend":true, "groupid":29, "subscriber":"sg481n"}
+${FEED_CONTENT_TYPE}            application/vnd.att-dr.feed
+${SUBSCRIBE_CONTENT_TYPE}       application/vnd.att-dr.subscription
+${PUBLISH_FEED_CONTENT_TYPE}    application/octet-stream
+
+*** Test Cases ***
+Run Feed Creation
+    [Documentation]                 Feed Creation
+    [Timeout]                       1 minute
+    ${resp}=                        PostCall                         ${TARGET_URL}         ${CREATE_FEED_DATA}    ${FEED_CONTENT_TYPE}    rs873m
+    log                             ${TARGET_URL}
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              201
+    log                             'JSON Response Code:'${resp}
+
+Run Subscribe to Feed
+    [Documentation]                 Subscribe to Feed
+    [Timeout]                       1 minute
+    ${resp}=                        PostCall                         ${TARGET_URL_SUBSCRIBE}    ${SUBSCRIBE_DATA}      ${SUBSCRIBE_CONTENT_TYPE}    sg481n
+    log                             ${TARGET_URL_SUBSCRIBE}
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              201
+    log                             'JSON Response Code:'${resp}
+
+Run Publish Feed
+    [Documentation]                 Publish to Feed
+    [Timeout]                       1 minute
+    Sleep                           10s                              Behaviour was noticed where feed was not created in time for publish to be sent
+    ${resp}=                        PutCall                          ${TARGET_URL_PUBLISH}    ${CREATE_FEED_DATA}      ${PUBLISH_FEED_CONTENT_TYPE}    rs873m
+    log                             ${TARGET_URL_PUBLISH}
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              204
+    log                             'JSON Response Code:'${resp}
+
+Run Update Subscription
+    [Documentation]                 Update Subscription to suspend and change delivery credentials
+    [Timeout]                       1 minute
+    ${resp}=                        PutCall                          ${TARGET_URL_SUBSCRIPTION}    ${UPDATE_SUBSCRIPTION_DATA}      ${SUBSCRIBE_CONTENT_TYPE}    sg481n
+    log                             ${TARGET_URL_SUBSCRIPTION}
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              200
+    log                             'JSON Response Code:'${resp}
+    ${resp}=                        GetCall                          ${TARGET_URL_SUBSCRIPTION}    ${SUBSCRIBE_CONTENT_TYPE}    sg481n
+    log                             ${resp.text}
+    Should Contain                  ${resp.text}                     "password":"sg481n","user":"sg481n"
+    log                             'JSON Response Code:'${resp}
+
+Run Update Feed
+    [Documentation]                 Update Feed description and suspend
+    [Timeout]                       1 minute
+    ${resp}=                        PutCall                          ${TARGET_URL_FEED}    ${UPDATE_FEED_DATA}      ${FEED_CONTENT_TYPE}    rs873m
+    log                             ${TARGET_URL_FEED}
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              200
+    log                             'JSON Response Code:'${resp}
+    ${resp}=                        GetCall                          ${TARGET_URL_FEED}    ${FEED_CONTENT_TYPE}    rs873m
+    log                             ${resp.text}
+    Should Contain                  ${resp.text}                     "UPDATED-CSIT_Test"
+    log                             'JSON Response Code:'${resp}
+
+Run Delete Subscription
+    [Documentation]                 Delete Subscription
+    [Timeout]                       1 minute
+    ${resp}=                        DeleteCall                       ${TARGET_URL_SUBSCRIPTION}    sg481n
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              204
+    log                             'JSON Response Code:'${resp}
+
+Run Delete Feed
+    [Documentation]                 Delete Feed
+    [Timeout]                       1 minute
+    ${resp}=                        DeleteCall                       ${TARGET_URL_FEED}    rs873m
+    log                             ${resp.text}
+    Should Be Equal As Strings      ${resp.status_code}              204
+    log                             'JSON Response Code:'${resp}
+
+*** Keywords ***
+PostCall
+    [Arguments]      ${url}              ${data}            ${content_type}        ${user}
+    ${headers}=      Create Dictionary   X-ATT-DR-ON-BEHALF-OF=${user}    Content-Type=${content_type}
+    ${resp}=         Evaluate            requests.post('${url}',data='${data}', headers=${headers},verify=False)    requests
+    [Return]         ${resp}
+
+PutCall
+    [Arguments]      ${url}              ${data}            ${content_type}        ${user}
+    ${headers}=      Create Dictionary   X-ATT-DR-ON-BEHALF-OF=${user}    Content-Type=${content_type}    Authorization=Basic cnM4NzNtOnJzODczbQ==
+    ${resp}=         Evaluate            requests.put('${url}',data='${data}', headers=${headers},verify=False)    requests
+    [Return]         ${resp}
+
+GetCall
+    [Arguments]      ${url}              ${content_type}        ${user}
+    ${headers}=      Create Dictionary   X-ATT-DR-ON-BEHALF-OF=${user}    Content-Type=${content_type}
+    ${resp}=         Evaluate            requests.get('${url}', headers=${headers},verify=False)    requests
+    [Return]         ${resp}
+
+DeleteCall
+    [Arguments]      ${url}              ${user}
+    ${headers}=      Create Dictionary   X-ATT-DR-ON-BEHALF-OF=${user}
+    ${resp}=         Evaluate            requests.delete('${url}', headers=${headers},verify=False)    requests
+    [Return]         ${resp}
diff --git a/test/csit/tests/dmaap-buscontroller/with_dr/test1.robot b/test/csit/tests/dmaap-buscontroller/with_dr/test1.robot
new file mode 100644 (file)
index 0000000..a3aef42
--- /dev/null
@@ -0,0 +1,143 @@
+*** Settings ***
+Resource          ../../common.robot
+Library           Collections
+Library           json
+Library           OperatingSystem
+Library           RequestsLibrary
+Library           HttpLibrary.HTTP
+Library           String
+
+
+*** Variables ***
+${MESSAGE}    Hello, world!
+${DBC_URI}    webapi
+${DBC_URL}    http://${DMAAPBC_IP}:8080/${DBC_URI}
+${LOC}          csit-sanfrancisco
+${PUB_CORE}     "dcaeLocationName": "${LOC}", "clientRole": "org.onap.dmaap.client.pub", "action": [ "pub", "view" ] 
+${SUB_CORE}     "dcaeLocationName": "${LOC}", "clientRole": "org.onap.dmaap.client.sub", "action": [ "sub", "view" ] 
+${PUB}          { ${PUB_CORE} }
+${SUB}          { ${SUB_CORE} }
+${FEED1_DATA}  { "feedName":"feed1", "feedVersion": "csit", "feedDescription":"generated for CSIT", "owner":"dgl", "asprClassification": "unclassified" }
+${FEED2_DATA}  { "feedName":"feed2", "feedVersion": "csit", "feedDescription":"generated for CSIT", "owner":"dgl", "asprClassification": "unclassified" }
+${PUB2_DATA}   { "dcaeLocationName": "${LOC}", "username": "pub2", "userpwd": "topSecret123", "feedId": "2" }
+${SUB2_DATA}   { "dcaeLocationName": "${LOC}", "username": "sub2", "userpwd": "someSecret123", "deliveryURL": "https://${DMAAPBC_IP}:8443/webapi/noURI", "feedId": "2" }
+${TOPIC2_DATA}  { "topicName":"singleMRtopic2", "topicDescription":"generated for CSIT", "owner":"dgl", "clients": [ ${PUB}, ${SUB}] }
+${TOPIC3_DATA}  { "topicName":"singleMRtopic3", "topicDescription":"generated for CSIT", "owner":"dgl"}
+#${PUB3_DATA}    { "fqtn": "${TOPIC_NS}.singleMRtopic3", ${PUB_CORE} }
+#${SUB3_DATA}    { "fqtn": "${TOPIC_NS}.singleMRtopic3", ${SUB_CORE} }
+
+
+
+*** Test Cases ***
+Url Test
+    [Documentation]    Check if www.onap.org can be reached
+    Create Session     sanity          http://onap.readthedocs.io
+    ${resp}=           Get Request   sanity    /  
+    Should Be Equal As Integers  ${resp.status_code}  200
+
+(DMAAP-441c1)
+    [Documentation]        Create Feed w no clients POST ${DBC_URI}/feeds endpoint
+    ${resp}=         PostCall    ${DBC_URL}/feeds    ${FEED1_DATA}
+    Should Be Equal As Integers  ${resp.status_code}  200   
+
+(DMAAP-441c2)
+    [Documentation]        Create Feed w clients POST ${DBC_URI}/feeds endpoint
+    ${resp}=         PostCall    ${DBC_URL}/feeds    ${FEED2_DATA}
+    Should Be Equal As Integers  ${resp.status_code}  200   
+
+(DMAAP-441c3)
+    [Documentation]        Add Publisher to existing feed
+    ${resp}=         PostCall    ${DBC_URL}/dr_pubs    ${PUB2_DATA}
+    Should Be Equal As Integers  ${resp.status_code}  201   
+    ${tmp}=          Get Json Value      ${resp.text}           /pubId
+    ${tmp}=          Remove String       ${tmp}         \"
+    Set Suite Variable          ${pubId}    ${tmp}
+
+(DMAAP-441c4)
+    [Documentation]        Add Subscriber to existing feed
+    ${resp}=         PostCall    ${DBC_URL}/dr_subs    ${SUB2_DATA}
+    Should Be Equal As Integers  ${resp.status_code}  201   
+    ${tmp}=          Get Json Value      ${resp.text}           /subId
+    ${tmp}=          Remove String       ${tmp}         \"
+    Set Suite Variable          ${subId}    ${tmp}
+
+(DMAAP-443)
+    [Documentation]        List existing feeds
+    Create Session     get          ${DBC_URL}
+    ${resp}=         Get Request    get       /feeds
+    Should Be Equal As Integers  ${resp.status_code}  200
+
+(DMAAP-444)
+    [Documentation]        Delete existing subscriber
+    ${resp}=         DelCall    ${DBC_URL}/dr_subs/${subId}
+    Should Be Equal As Integers  ${resp.status_code}  204
+
+(DMAAP-445)
+    [Documentation]        Delete existing publisher
+    ${resp}=         DelCall    ${DBC_URL}/dr_pubs/${pubId}
+    Should Be Equal As Integers  ${resp.status_code}  204
+
+#(DMAAP-294)
+#    [Documentation]        Create Topic w pub and sub clients POST ${DBC_URI}/topics endpoint
+#    ${resp}=         PostCall    ${DBC_URL}/topics    ${TOPIC2_DATA}
+#    Should Be Equal As Integers  ${resp.status_code}  201
+#
+#(DMAAP-295)
+#    [Documentation]        Create Topic w no clients and then add a client POST ${DBC_URI}/mr_clients endpoint
+#    ${resp}=         PostCall    ${DBC_URL}/topics    ${TOPIC3_DATA}
+#    Should Be Equal As Integers  ${resp.status_code}  201   
+#    ${resp}=         PostCall    ${DBC_URL}/mr_clients    ${PUB3_DATA}
+#    Should Be Equal As Integers  ${resp.status_code}  200   
+#    ${resp}=         PostCall    ${DBC_URL}/mr_clients    ${SUB3_DATA}
+#    Should Be Equal As Integers  ${resp.status_code}  200   
+#
+#(DMAAP-297)
+#    [Documentation]    Query for all topics and specific topic
+#    Create Session     get          ${DBC_URL}
+#    ${resp}=           Get Request   get    /topics  
+#    Should Be Equal As Integers  ${resp.status_code}  200
+#    ${resp}=           Get Request   get    /topics/${TOPIC_NS}.singleMRtopic3
+#    Should Be Equal As Integers  ${resp.status_code}  200
+#
+#(DMAAP-301)
+#    [Documentation]    Delete a subscriber
+#    Create Session     get          ${DBC_URL}
+#    ${resp}=           Get Request   get    /topics/${TOPIC_NS}.singleMRtopic3
+#    Should Be Equal As Integers  ${resp.status_code}  200
+#      ${tmp}=            Get Json Value      ${resp.text}           /clients/1/mrClientId
+#      ${clientId}=       Remove String       ${tmp}         \"
+#    ${resp}=           DelCall   ${DBC_URL}/mr_clients/${clientId}
+#    Should Be Equal As Integers  ${resp.status_code}  204
+#
+#(DMAAP-302)
+#    [Documentation]    Delete a publisher
+#    Create Session     get          ${DBC_URL}
+#    ${resp}=           Get Request   get    /topics/${TOPIC_NS}.singleMRtopic3
+#    Should Be Equal As Integers  ${resp.status_code}  200
+#      ${tmp}=            Get Json Value      ${resp.text}           /clients/0/mrClientId
+#      ${clientId}=       Remove String       ${tmp}         \"
+#    ${resp}=           DelCall   ${DBC_URL}/mr_clients/${clientId}
+#    Should Be Equal As Integers  ${resp.status_code}  204
+
+
+*** Keywords ***
+CheckDir
+    [Arguments]                 ${path}
+    Directory Should Exist      ${path}
+
+CheckUrl
+    [Arguments]                  ${session}   ${path}     ${expect}
+    ${resp}=                     Get  Request          ${session} ${path} 
+    Should Be Equal As Integers  ${resp.status_code}  ${expect}
+
+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}
+
+DelCall
+    [Arguments]    ${url}           
+    ${headers}=    Create Dictionary    Accept=application/json    Content-Type=application/json
+    ${resp}=       Evaluate    requests.delete('${url}', headers=${headers},verify=False)    requests
+    [Return]       ${resp}
index 9f8e435..9fc937e 100644 (file)
@@ -5,6 +5,9 @@ Library       json
 
 *** Variables ***
 ${MESSAGE}    {"ping": "ok"}
+${BASIC}    Basic
+${AUTHVALUE}    bXVzaWM6bXVzaWM=
+${Authorization}    ${BASIC} ${AUTHVALUE}
 
 #global variables
 ${generatedAID}
@@ -60,7 +63,7 @@ Music AddOnBoarding
     [Documentation]    It sends a REST POST request to Music to Onboard a new application
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}onboard.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   Content-Type=application/json  Accept=application/json
     ${resp}=         Post Request        musicaas   /MUSIC/rest/v2/admin/onboardAppWithMusic    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -75,7 +78,7 @@ Music CreateKeyspace
     [Documentation]    It sends a REST POST request to Music to create a new keyspace in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}createkeyspace.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Post Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -86,7 +89,7 @@ Music CreateTable
     [Documentation]    It sends a REST POST request to Music to create a new Table in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}createtable.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Post Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -97,7 +100,7 @@ Music InsertRow
     [Documentation]    It sends a REST POST request to Music to create a new row in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}insertrow_eventual.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Post Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable/rows/?row=emp1   data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -107,7 +110,7 @@ Music InsertRow
 Music ReadRowJustInserted
     [Documentation]    It sends a REST GET request to Music to Read the row just inserted in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Get Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable/rows?name=emp1   headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -118,7 +121,7 @@ Music UpdateRowInAtomicWay
     [Documentation]    It sends a REST PUT request to Music to create a new row in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}updaterow_atomic.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Put Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable/rows?name=emp1   data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -128,7 +131,7 @@ Music UpdateRowInAtomicWay
 Music ReadRowAfterUpdate
     [Documentation]    It sends a REST GET request to Music to Read the row just inserted in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Get Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable/rows?name=emp1   headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -139,7 +142,7 @@ Music DeleteRow
     [Documentation]    It sends a REST DELETE request to Music to delete a row in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}deleterow_eventual.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json  Accept=application/json
     ${resp}=         Delete Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable/rows?name=emp1   data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -150,7 +153,7 @@ Music DropTable
     [Documentation]    It sends a REST Delete request to Music to drop one existing Table in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}droptable.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
     ${resp}=         Delete Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace/tables/MusicOnapTable    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -161,7 +164,7 @@ Music DropKeyspace
     [Documentation]    It sends a REST DELETE request to Music to drop one existing keyspace in Cassandra
     Create Session   musicaas            ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}dropkeyspace.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
     ${resp}=         Delete Request        musicaas   /MUSIC/rest/v2/keyspaces/MusicOnapKeyspace    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
@@ -173,7 +176,7 @@ Music DeleteOnBoarding
     [Documentation]    It sends a REST DELETE request to Music to remove a previosly onboarded application
     Create Session   musicaas             ${MUSIC_HOSTNAME}:${MUSIC_PORT}
     ${data}=         Get Binary File     ${CURDIR}${/}data${/}onboard.json
-    &{headers}=      Create Dictionary    ns=lb7254    userId=music    password=music   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
+    &{headers}=      Create Dictionary    ns=lb7254    Authorization=${Authorization}   aid=${generatedAID}   Content-Type=application/json   Accept=application/json
     ${resp}=         Delete Request        musicaas   /MUSIC/rest/v2/admin/onboardAppWithMusic    data=${data}    headers=${headers}
     Log To Console              *********************
     Log To Console              response = ${resp}
index 815ffa8..deba647 100644 (file)
@@ -115,6 +115,7 @@ Get Root Url
     Log To Console              response = ${resp}
     Log To Console              body = ${resp.text}
     Should Be Equal As Integers    ${resp.status_code}    200
+    Sleep    10s    Wait For 10 seconds
 
 Conductor AddHealthcheck Row Into Music
     [Documentation]    It sends a REST PUT request to Music to inject healthcheck plan
index f406bbf..911fdaf 100644 (file)
@@ -22,9 +22,9 @@ ${GLOBAL_AAI_CLOUD_OWNER}    Rackspace
 ${GLOBAL_BUILD_NUMBER}    31
 ${GLOBAL_VM_PRIVATE_KEY}   ${EXECDIR}/robot/assets/keys/robot_ssh_private_key.pvt
 # policy info - everything is from the private oam network (also called ecomp private network)
-${GLOBAL_POLICY_SERVER_URL}    http://%{PDP_IP}:8081
+${GLOBAL_POLICY_SERVER_URL}    https://%{PDP_IP}:8081
 ${GLOBAL_POLICY_AUTH}  dGVzdHBkcDphbHBoYTEyMw==
 ${GLOBAL_POLICY_CLIENTAUTH}     cHl0aG9uOnRlc3Q=
 ${GLOBAL_POLICY_HEALTHCHECK_URL}       http://%{POLICY_IP}:6969
 ${GLOBAL_POLICY_USERNAME}      healthcheck
-${GLOBAL_POLICY_PASSWORD}      zb!XztG34
\ No newline at end of file
+${GLOBAL_POLICY_PASSWORD}      zb!XztG34
diff --git a/test/csit/tests/vid/resources/docker-compose.yml b/test/csit/tests/vid/resources/docker-compose.yml
new file mode 100644 (file)
index 0000000..93b3170
--- /dev/null
@@ -0,0 +1,35 @@
+version: '3'
+services:
+    vid-server:
+        image: nexus3.onap.org:10001/onap/vid:latest
+        environment:
+            - VID_MYSQL_DBNAME=vid_openecomp_epsdk
+            - VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+            - ASDC_CLIENT_REST_HOST=localhost
+            - ASDC_CLIENT_REST_PORT=8443
+        ports:
+            - "8080:8080"
+        container_name: vid-server
+        links:
+            - vid-mariadb:vid-mariadb-docker-instance
+
+    vid-mariadb:
+        image: mariadb:10
+        environment:
+            - MYSQL_DATABASE=vid_openecomp_epsdk
+            - MYSQL_USER=vidadmin
+            - MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+            - MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY
+        container_name: vid-mariadb
+        volumes:
+            - ${WORKSPACE}/data/clone/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf
+            - ${WORKSPACE}/data/clone/vid/lf_config/vid-schema.sql:/docker-entrypoint-initdb.d/vid-schema.sql
+            - /var/lib/mysql
+
+    sdc_simulator:
+        build:
+            context: simulators
+            dockerfile: SDC_simulator
+        ports:
+        - "8443:8443"
+        container_name: sdc_simulator
\ No newline at end of file
diff --git a/test/csit/tests/vid/resources/simulators/SDC.py b/test/csit/tests/vid/resources/simulators/SDC.py
new file mode 100644 (file)
index 0000000..e99a0bd
--- /dev/null
@@ -0,0 +1,37 @@
+import ssl
+from http.server import BaseHTTPRequestHandler, HTTPServer
+
+from sys import argv
+
+DEFAULT_PORT = 8443
+
+
+class SDCHandler(BaseHTTPRequestHandler):
+
+    def __init__(self, request, client_address, server):
+        self.response_on_get = self._read_on_get_response()
+        super().__init__(request, client_address, server)
+
+    def do_GET(self):
+        self.send_response(200)
+        self._set_headers()
+
+        self.wfile.write(self.response_on_get.encode("utf-8"))
+        return
+
+    def _set_headers(self):
+        self.send_header('Content-Type', 'application/json')
+        self.end_headers()
+
+    @staticmethod
+    def _read_on_get_response():
+        with open('sdc_get_response.json', 'r') as file:
+            return file.read()
+
+
+if __name__ == '__main__':
+    SDCHandler.protocol_version = "HTTP/1.1"
+
+    httpd = HTTPServer(('', DEFAULT_PORT), SDCHandler)
+    httpd.socket = ssl.wrap_socket(httpd.socket, server_side=True, certfile='cert.pem', keyfile='key.pem')
+    httpd.serve_forever()
diff --git a/test/csit/tests/vid/resources/simulators/SDC_simulator b/test/csit/tests/vid/resources/simulators/SDC_simulator
new file mode 100644 (file)
index 0000000..c099787
--- /dev/null
@@ -0,0 +1,15 @@
+FROM alpine:latest
+
+RUN apk add --no-cache python3 && \
+    python3 -m ensurepip && \
+    rm -r /usr/lib/python*/ensurepip && \
+    pip3 install --upgrade pip setuptools && \
+    if [ ! -e /usr/bin/pip ]; then ln -s pip3 /usr/bin/pip ; fi && \
+    if [[ ! -e /usr/bin/python ]]; then ln -sf /usr/bin/python3 /usr/bin/python; fi && \
+       rm -r /root/.cache
+
+ADD SDC.py /
+
+EXPOSE 8443
+
+CMD [ "python", "./SDC.py" ]
diff --git a/test/csit/tests/vid/resources/simulators/cert.pem b/test/csit/tests/vid/resources/simulators/cert.pem
new file mode 100644 (file)
index 0000000..cea1e37
--- /dev/null
@@ -0,0 +1,74 @@
+Bag Attributes
+    friendlyName: 1
+    localKeyID: 54 69 6D 65 20 31 35 33 35 36 31 39 34 30 35 39 30 38
+subject=/C=US/ST=Michigan/L=Southfield/O=ATT Services, Inc./OU=ASDC/CN=mtanjv9sdcf51.aic.cip.att.com
+issuer=/C=US/O=Symantec Corporation/OU=Symantec Trust Network/CN=Symantec Class 3 Secure Server CA - G4
+-----BEGIN CERTIFICATE-----
+MIIGDzCCBPegAwIBAgIQfZLBdhhGhkOBcXuI5oF0gTANBgkqhkiG9w0BAQsFADB+
+MQswCQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAd
+BgNVBAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVj
+IENsYXNzIDMgU2VjdXJlIFNlcnZlciBDQSAtIEc0MB4XDTE1MTIwOTAwMDAwMFoX
+DTE2MTIwODIzNTk1OVowgYkxCzAJBgNVBAYTAlVTMREwDwYDVQQIDAhNaWNoaWdh
+bjETMBEGA1UEBwwKU291dGhmaWVsZDEbMBkGA1UECgwSQVRUIFNlcnZpY2VzLCBJ
+bmMuMQ0wCwYDVQQLDARBU0RDMSYwJAYDVQQDDB1tdGFuanY5c2RjZjUxLmFpYy5j
+aXAuYXR0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOup99Ff
+gk02lwXv535Y1FCCE8vL47BKj96h6to8rXwwN+9W+xiVEIgDXKOWBC7W8iEP2tOd
+Smzi3wsZIivaFh2yPGtj1z0a7WuA7wNw1fJF4WGr4VFaxHbMBaPOZHa3D+iIduWP
+H/t6ECEzfGRRtTt+mVCpV8Rx+v/q8d0yO114u/WBtbGGlIPDJcrHLRODnjM+mkjq
+EwfoR9qqqjbJhjUkUujGM/qVKm3YAjMIZ1ldteRXUew4xI/Foo6u3hqJwbYIJf3r
+fzWCt+fIyktDsm/c1w9HcX+8R0alK90bjC2D5auukIfbmhxd4MR9NBAH0SFleQtw
+SQLN6GYMVexhUEECAwEAAaOCAnswggJ3MCgGA1UdEQQhMB+CHW10YW5qdjlzZGNm
+NTEuYWljLmNpcC5hdHQuY29tMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBhBgNVHSAEWjBYMFYGBmeBDAEC
+AjBMMCMGCCsGAQUFBwIBFhdodHRwczovL2Quc3ltY2IuY29tL2NwczAlBggrBgEF
+BQcCAjAZGhdodHRwczovL2Quc3ltY2IuY29tL3JwYTAfBgNVHSMEGDAWgBRfYM9h
+kFXfhEMUimAqsvV69EMY7zArBgNVHR8EJDAiMCCgHqAchhpodHRwOi8vc3Muc3lt
+Y2IuY29tL3NzLmNybDBXBggrBgEFBQcBAQRLMEkwHwYIKwYBBQUHMAGGE2h0dHA6
+Ly9zcy5zeW1jZC5jb20wJgYIKwYBBQUHMAKGGmh0dHA6Ly9zcy5zeW1jYi5jb20v
+c3MuY3J0MIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYA3esdK3oNT6Ygi4GtgWhw
+fi6OnQHVXIiNPRHEzbbsvswAAAFRh4XRnAAABAMARzBFAiBXZqph5qeHUUnY8OkH
+jJLo454/8c9IBB7asjEYWYoBPQIhAKAwvP8KfqilgawBkuRV7r41P8Xd3Yi72RQO
+1Dvpi8rkAHcApLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFRh4XR
+3AAABAMASDBGAiEAon+cZcRpSsuo1aiCtaN3aAG0EqJb/1jJ4m4Q/qo1nEoCIQCr
+KrBNyywa4OTmSVSAsyazbnMr5ldimxNORhhtyGeFLDANBgkqhkiG9w0BAQsFAAOC
+AQEAG3/Mq8F0wbCpOOMCq4dZwgLENBjor9b9UljQZ+sgt7Nn00bfGdxY4MKtOTiK
+9ks/nV9sW0KyvhsZvLPPgdSCnu0MZogWQsKqQDkIkJoHtFRSaYTT1vLAIoKz/dN+
+SBS71EzFH92lMfiFtAjfTrFady0/6z7lp4VZwbXLWjHw6LQESENc29Xw1jpCVkg8
+iB2n/qCFfyw3HuvP+eW2TLmnHOl0tda1vrYKCXT2n7HepiJM3g9yLjb/w3MuxEmw
+dj1DqRemXtOUJW0mQXn1mRBjXEunzHoCr3GaeSU6G3RbIzXr34Hsv4IbggkhRula
+gQIYidtDmw0PS1kyaFvlhZkd1g==
+-----END CERTIFICATE-----
+Bag Attributes
+    friendlyName: CN=Symantec Class 3 Secure Server CA - G4,OU=Symantec Trust Network,O=Symantec Corporation,C=US
+subject=/C=US/O=Symantec Corporation/OU=Symantec Trust Network/CN=Symantec Class 3 Secure Server CA - G4
+issuer=/C=US/O=VeriSign, Inc./OU=VeriSign Trust Network/OU=(c) 2006 VeriSign, Inc. - For authorized use only/CN=VeriSign Class 3 Public Primary Certification Authority - G5
+-----BEGIN CERTIFICATE-----
+MIIFODCCBCCgAwIBAgIQUT+5dDhwtzRAQY0wkwaZ/zANBgkqhkiG9w0BAQsFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMTMxMDMxMDAwMDAwWhcNMjMxMDMwMjM1OTU5WjB+MQsw
+CQYDVQQGEwJVUzEdMBsGA1UEChMUU3ltYW50ZWMgQ29ycG9yYXRpb24xHzAdBgNV
+BAsTFlN5bWFudGVjIFRydXN0IE5ldHdvcmsxLzAtBgNVBAMTJlN5bWFudGVjIENs
+YXNzIDMgU2VjdXJlIFNlcnZlciBDQSAtIEc0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAstgFyhx0LbUXVjnFSlIJluhL2AzxaJ+aQihiw6UwU35VEYJb
+A3oNL+F5BMm0lncZgQGUWfm893qZJ4Itt4PdWid/sgN6nFMl6UgfRk/InSn4vnlW
+9vf92Tpo2otLgjNBEsPIPMzWlnqEIRoiBAMnF4scaGGTDw5RgDMdtLXO637QYqzu
+s3sBdO9pNevK1T2p7peYyo2qRA4lmUoVlqTObQJUHypqJuIGOmNIrLRM0XWTUP8T
+L9ba4cYY9Z/JJV3zADreJk20KQnNDz0jbxZKgRb78oMQw7jW2FUyPfG9D72MUpVK
+Fpd6UiFjdS8W+cRmvvW1Cdj/JwDNRHxvSz+w9wIDAQABo4IBYzCCAV8wEgYDVR0T
+AQH/BAgwBgEB/wIBADAwBgNVHR8EKTAnMCWgI6Ahhh9odHRwOi8vczEuc3ltY2Iu
+Y29tL3BjYTMtZzUuY3JsMA4GA1UdDwEB/wQEAwIBBjAvBggrBgEFBQcBAQQjMCEw
+HwYIKwYBBQUHMAGGE2h0dHA6Ly9zMi5zeW1jYi5jb20wawYDVR0gBGQwYjBgBgpg
+hkgBhvhFAQc2MFIwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuc3ltYXV0aC5jb20v
+Y3BzMCgGCCsGAQUFBwICMBwaGmh0dHA6Ly93d3cuc3ltYXV0aC5jb20vcnBhMCkG
+A1UdEQQiMCCkHjAcMRowGAYDVQQDExFTeW1hbnRlY1BLSS0xLTUzNDAdBgNVHQ4E
+FgQUX2DPYZBV34RDFIpgKrL1evRDGO8wHwYDVR0jBBgwFoAUf9Nlp8Ld7LvwMAnz
+Qzn6Aq8zMTMwDQYJKoZIhvcNAQELBQADggEBAF6UVkndji1l9cE2UbYD49qecxny
+H1mrWH5sJgUs+oHXXCMXIiw3k/eG7IXmsKP9H+IyqEVv4dn7ua/ScKAyQmW/hP4W
+Ko8/xabWo5N9Q+l0IZE1KPRj6S7t9/Vcf0uatSDpCr3gRRAMFJSaXaXjS5HoJJtG
+QGX0InLNmfiIEfXzf+YzguaoxX7+0AjiJVgIcWjmzaLmFN5OUiQt/eV5E1PnXi8t
+TRttQBVSK/eHiXgSgW7ZTaoteNTCLD0IX4eRnh8OsN4wUmSGiaqdZpwOdgyA8nTY
+Kvi4Os7X1g8RvmurFPW9QaAiY4nxug9vKWNmLT+sjHLF+8fk1A/yO0+MKcc=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/test/csit/tests/vid/resources/simulators/key.pem b/test/csit/tests/vid/resources/simulators/key.pem
new file mode 100644 (file)
index 0000000..641d13f
--- /dev/null
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDrqffRX4JNNpcF
+7+d+WNRQghPLy+OwSo/eoeraPK18MDfvVvsYlRCIA1yjlgQu1vIhD9rTnUps4t8L
+GSIr2hYdsjxrY9c9Gu1rgO8DcNXyReFhq+FRWsR2zAWjzmR2tw/oiHbljx/7ehAh
+M3xkUbU7fplQqVfEcfr/6vHdMjtdeLv1gbWxhpSDwyXKxy0Tg54zPppI6hMH6Efa
+qqo2yYY1JFLoxjP6lSpt2AIzCGdZXbXkV1HsOMSPxaKOrt4aicG2CCX96381grfn
+yMpLQ7Jv3NcPR3F/vEdGpSvdG4wtg+WrrpCH25ocXeDEfTQQB9EhZXkLcEkCzehm
+DFXsYVBBAgMBAAECggEBAOkwoYCzIktnFh+Q2R9DpKsZW59QXDfoP95LmAlk+0Gk
+sOSKzCHx9o6vzO4uFmuG08Z1WtIElU2TXKMttotv3Gx8Hp8hBy12xLGYvmlIMNvv
+2+n62xTWXQs0LOx+4Rg7Yml1Bzl1227KxMUlnhPiahO53NldB/Th2D197OA0wVtl
+o3d753CNs+vVk1Z8RTUWrW1ZNHdfQNa1zrNo3Q5/evnlt+mAhFbUIKB3FgMk4N4/
+EjnTH6d+MEUD1sVCNruxqv8PZzRzzJEU/8gzy0WAPFAGOOC7hgU3n7dIEEkjvoIw
+HlZD5c6I+3AzYq08CtUwWI09pNVlznqoOY6d548YusUCgYEA9cHOUXiafXFupqpT
+HwE18Yk5sqISpPwS8yip4NPPUv+W9qvCpdkFvV3HRMlICWJGoerRsALEQYY5fsvY
+7lk1avunprbIa9XLUrvb4ydJYynFhKjXkfTAmyCmbvH8t10BfDNuXT098+4M4HpG
+YW2Arl9Db7RoOBwQtPFX2RmYOM8CgYEA9Xx4TbsbT1C6c49aDZmuFeBXDEaMTDYS
+CC50MqMQpfoqS5QVyjl7JzP/dIz9CcUExFz7MOmYCp8yocXnLwxGDrZjZMkwEz15
+8WUGj4WMpSpUSRmGEVnoVE5bRazq37vhbOwh8gcKhF1ifVgwm+Rjs+4g6DwmSR8l
+4CVK6lWrCe8CgYEA5QR7kR6z0Wywse4N0dnd/D1mIFq6xzcFLcZaMOMR1IXMmAjO
+NqF8oNDQjwCH+f60VdWvHLgnTeyYjdnHSa6mghEMVecF9L/iXzIjopaM5DUcFRkG
+8sRD7QxLLR6i4/lvFeAT3B3jKvtO0q4AAnD6NwUdoe5cJNW6l/REalNYsK8CgYBw
+n7lF2CiwW9YevE7RXIc8rB7jl943/LqLHFzc+mjh7QLIh9jzXSm+E6IIY8KXX9dP
+C2WGzDSf8ue0xmnI8PWXPGAfVhoDSboPYI0A/YFIKUJgAyC6ByiKvSQstCdRnA3Q
+/giY1Fgj4AAWh4ZNjxua6g4Y3bem5m5nBlT3a3Q76wKBgQDSMFNfVNWautPQvcYB
+iu9oQhbXVkjh+ToFWq6pW4VaWhEf/6hqvihc6PcB7FXJ1v1/ybko6cIgVmFUt43s
+it1q5aLy3v6GTS/UnDZI3r5oECEuLeUqnHm3qilbatUtwvxghgdwGK+YG0yTfS3y
+GqdNDH5YdJJMyiLdQlLIzJb/XQ==
+-----END PRIVATE KEY-----
diff --git a/test/csit/tests/vid/resources/simulators/sdc_get_response.json b/test/csit/tests/vid/resources/simulators/sdc_get_response.json
new file mode 100644 (file)
index 0000000..9f7e118
--- /dev/null
@@ -0,0 +1,301 @@
+{
+  "service": {
+    "uuid": "2763bc78-8523-482f-895b-0c0db7364224",
+    "invariantUuid": "abb2dc66-b211-49d2-ab2f-8774694136fa",
+    "name": "Bare2",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Network L1-3",
+    "serviceType": "",
+    "serviceRole": "",
+    "description": "Bare2",
+    "serviceEcompNaming": "true",
+    "instantiationType": "ClientConfig",
+    "inputs": {}
+  },
+  "vnfs": {
+    "95e654c0-676b-4386-8a69 0": {
+      "uuid": "d6395498-7ecb-4eba-bf84-4380f6e9cdcf",
+      "invariantUuid": "16262b97-bcb1-4033-8f9f-a3016eaf1ec3",
+      "description": "vendor software product",
+      "name": "95e654c0-676b-4386-8a69",
+      "version": "1.0",
+      "customizationUuid": "34a3b91d-8d73-4412-bf4e-c6456741007f",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "vf_module_id": "vTrafficPNG",
+        "repo_url_blob": "https://nexus.onap.org/content/sites/raw",
+        "unprotected_private_subnet_id": "zdfw1fwl01_unprotected_sub",
+        "public_net_id": "PUT THE PUBLIC NETWORK ID HERE",
+        "vfw_private_ip_0": "192.168.10.100",
+        "onap_private_subnet_id": "PUT THE ONAP PRIVATE NETWORK NAME HERE",
+        "onap_private_net_cidr": "10.0.0.0/16",
+        "image_name": "PUT THE VM IMAGE NAME HERE (UBUNTU 1404)",
+        "flavor_name": "PUT THE VM FLAVOR NAME HERE (m1.medium suggested)",
+        "vnf_id": "vPNG_Firewall_demo_app",
+        "vpg_name_0": "zdfw1fwl01pgn01",
+        "vpg_private_ip_1": "10.0.100.2",
+        "vsn_private_ip_0": "192.168.20.250",
+        "vpg_private_ip_0": "192.168.10.200",
+        "protected_private_net_cidr": "192.168.20.0/24",
+        "unprotected_private_net_cidr": "192.168.10.0/24",
+        "nf_naming": "{ecomp_generated_naming=true}",
+        "multi_stage_design": "false",
+        "onap_private_net_id": "PUT THE ONAP PRIVATE NETWORK NAME HERE",
+        "unprotected_private_net_id": "zdfw1fwl01_unprotected",
+        "availability_zone_max_count": "1",
+        "demo_artifacts_version": "1.2.1",
+        "pub_key": "PUT YOUR PUBLIC KEY HERE",
+        "key_name": "vfw_key",
+        "repo_url_artifacts": "https://nexus.onap.org/content/repositories/releases",
+        "install_script_version": "1.2.1",
+        "cloud_env": "PUT openstack OR rackspace HERE"
+      },
+      "type": "VF",
+      "modelCustomizationName": "95e654c0-676b-4386-8a69 0",
+      "vfModules": {
+        "95e654c0676b43868a690..95e654c0676b43868a69..base_vpkg..module-0": {
+          "uuid": "12082e9d-a854-48cc-8243-e24b26199856",
+          "invariantUuid": "239419df-3375-49fe-9dd4-73b3393858ba",
+          "customizationUuid": "32c824f7-5910-4d7a-88ad-188d4905675d",
+          "description": null,
+          "name": "95e654c0676b43868a69..base_vpkg..module-0",
+          "version": "1",
+          "volumeGroupAllowed": false,
+          "commands": {},
+          "modelCustomizationName": "95e654c0676b43868a69..base_vpkg..module-0",
+          "properties": {
+            "min_vf_module_instances": {
+              "name": "min_vf_module_instances",
+              "value": 1,
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "The minimum instances of this VF-Module",
+              "default": null,
+              "type": "integer"
+            },
+            "vf_module_label": {
+              "name": "vf_module_label",
+              "value": "base_vpkg",
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "Alternate textual key used to reference this VF-Module model.  Must be unique within the VNF model\n",
+              "default": null,
+              "type": "string"
+            },
+            "max_vf_module_instances": {
+              "name": "max_vf_module_instances",
+              "value": 1,
+              "entrySchema": null,
+              "required": false,
+              "constraints": [],
+              "description": "The maximum instances of this VF-Module",
+              "default": null,
+              "type": "integer"
+            },
+            "vfc_list": {
+              "name": "vfc_list",
+              "value": null,
+              "entrySchema": {
+                "description": "<vfc_id>:<count>",
+                "type": "string"
+              },
+              "required": false,
+              "constraints": [],
+              "description": "Identifies the set of VM types and their count included in the VF-Module\n",
+              "default": null,
+              "type": "map"
+            },
+            "vf_module_type": {
+              "name": "vf_module_type",
+              "value": "Base",
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "",
+              "default": null,
+              "type": "string"
+            },
+            "vf_module_description": {
+              "name": "vf_module_description",
+              "value": null,
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "Description of the VF-modules contents and purpose   (e.g. \"Front-End\" or \"Database Cluster\")\n",
+              "default": null,
+              "type": "string"
+            },
+            "initial_count": {
+              "name": "initial_count",
+              "value": 1,
+              "entrySchema": null,
+              "required": false,
+              "constraints": [],
+              "description": "The initial count of instances of the VF-Module. The value must be in the  range between min_vfmodule_instances and max_vfmodule_instances. If no value provided the initial count is the min_vfmodule_instances.\n",
+              "default": null,
+              "type": "integer"
+            },
+            "volume_group": {
+              "name": "volume_group",
+              "value": false,
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "\"true\" indicates that this VF Module model requires attachment to a Volume   Group.  VID operator must select the Volume Group instance to attach to a VF-Module  at deployment time.\n",
+              "default": false,
+              "type": "boolean"
+            },
+            "availability_zone_count": {
+              "name": "availability_zone_count",
+              "value": null,
+              "entrySchema": null,
+              "required": false,
+              "constraints": [],
+              "description": "Quantity of Availability Zones needed for this VF-Module     (source: Extracted from VF-Module HEAT template)\n",
+              "default": null,
+              "type": "integer"
+            },
+            "isBase": {
+              "name": "isBase",
+              "value": false,
+              "entrySchema": null,
+              "required": true,
+              "constraints": [],
+              "description": "Whether this module should be deployed before other modules",
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        }
+      },
+      "volumeGroups": {}
+    }
+  },
+  "networks": {},
+  "configurations": {},
+  "serviceProxies": {},
+  "vfModules": {
+    "95e654c0676b43868a690..95e654c0676b43868a69..base_vpkg..module-0": {
+      "uuid": "12082e9d-a854-48cc-8243-e24b26199856",
+      "invariantUuid": "239419df-3375-49fe-9dd4-73b3393858ba",
+      "customizationUuid": "32c824f7-5910-4d7a-88ad-188d4905675d",
+      "description": null,
+      "name": "95e654c0676b43868a69..base_vpkg..module-0",
+      "version": "1",
+      "volumeGroupAllowed": false,
+      "commands": {},
+      "modelCustomizationName": "95e654c0676b43868a69..base_vpkg..module-0",
+      "properties": {
+        "min_vf_module_instances": {
+          "name": "min_vf_module_instances",
+          "value": 1,
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "The minimum instances of this VF-Module",
+          "default": null,
+          "type": "integer"
+        },
+        "vf_module_label": {
+          "name": "vf_module_label",
+          "value": "base_vpkg",
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "Alternate textual key used to reference this VF-Module model.  Must be unique within the VNF model\n",
+          "default": null,
+          "type": "string"
+        },
+        "max_vf_module_instances": {
+          "name": "max_vf_module_instances",
+          "value": 1,
+          "entrySchema": null,
+          "required": false,
+          "constraints": [],
+          "description": "The maximum instances of this VF-Module",
+          "default": null,
+          "type": "integer"
+        },
+        "vfc_list": {
+          "name": "vfc_list",
+          "value": null,
+          "entrySchema": {
+            "description": "<vfc_id>:<count>",
+            "type": "string"
+          },
+          "required": false,
+          "constraints": [],
+          "description": "Identifies the set of VM types and their count included in the VF-Module\n",
+          "default": null,
+          "type": "map"
+        },
+        "vf_module_type": {
+          "name": "vf_module_type",
+          "value": "Base",
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "",
+          "default": null,
+          "type": "string"
+        },
+        "vf_module_description": {
+          "name": "vf_module_description",
+          "value": null,
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "Description of the VF-modules contents and purpose   (e.g. \"Front-End\" or \"Database Cluster\")\n",
+          "default": null,
+          "type": "string"
+        },
+        "initial_count": {
+          "name": "initial_count",
+          "value": 1,
+          "entrySchema": null,
+          "required": false,
+          "constraints": [],
+          "description": "The initial count of instances of the VF-Module. The value must be in the  range between min_vfmodule_instances and max_vfmodule_instances. If no value provided the initial count is the min_vfmodule_instances.\n",
+          "default": null,
+          "type": "integer"
+        },
+        "volume_group": {
+          "name": "volume_group",
+          "value": false,
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "\"true\" indicates that this VF Module model requires attachment to a Volume   Group.  VID operator must select the Volume Group instance to attach to a VF-Module  at deployment time.\n",
+          "default": false,
+          "type": "boolean"
+        },
+        "availability_zone_count": {
+          "name": "availability_zone_count",
+          "value": null,
+          "entrySchema": null,
+          "required": false,
+          "constraints": [],
+          "description": "Quantity of Availability Zones needed for this VF-Module     (source: Extracted from VF-Module HEAT template)\n",
+          "default": null,
+          "type": "integer"
+        },
+        "isBase": {
+          "name": "isBase",
+          "value": false,
+          "entrySchema": null,
+          "required": true,
+          "constraints": [],
+          "description": "Whether this module should be deployed before other modules",
+          "default": false,
+          "type": "boolean"
+        }
+      }
+    }
+  },
+  "volumeGroups": {},
+  "pnfs": {}
+}
\ No newline at end of file
index 3071356..53139b5 100644 (file)
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
index c682dc5..e6e2a2c 100644 (file)
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
index feded7f..dcdb7d5 100644 (file)
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
index b18bd62..90d901d 100644 (file)
@@ -46,9 +46,7 @@ parameters:
 
   openstack_username: ${OS_USERNAME}
 
-  openstack_api_key: ${OS_PASSWORD}
-
-  openstack_auth_method: password
+  openstack_api_key: ${OS_PASSWORD_ENCRYPTED}
 
   openstack_region: RegionOne
 
index 2fd0556..6c8d05d 100755 (executable)
@@ -19,6 +19,8 @@ fi
 
 source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
 
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
 
 DEMO_DIR=${ONAP_WORKDIR}/demo
 if [ "$#" -ge 2 ]; then
index a2a5e55..d53a075 100644 (file)
@@ -26,6 +26,12 @@ It is possible to get access to logs by invocation of *./simulator.sh* logs.
 The content of the logs is related to the last simulator run. 
 Every start of simulator will generate new logs. 
 
+###SFTP support
+PNF Simulator allows to serve files via SFTP server. SFTP server has predefined user sftp-user. 
+Connection to SFTP server is being done with usage of SSH keys. Private key is stored in *ssh* directory.
+In order to download *sftp-file.txt* file simply run *sftp -P 2222 -i ssh/ssh_host_rsa_key sftp-user@localhost:sftp/sftp-file.txt*
+In order to add a new file (e.g. test.zip), put the file into *sftp* directory and run simulator.
+After that again execute sftp command: *sftp -P 2222 -i ssh/ssh_host_rsa_key sftp-user@localhost:sftp/test.zip*
 
 ###Developer mode
 For development of PNF Simulator, run *simulator.sh* start-dev in order to run Netopeer.
diff --git a/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/pnfsimulator/deployment/PnP_PNF_sim_heat_template.yml
new file mode 100644 (file)
index 0000000..d9acc9e
--- /dev/null
@@ -0,0 +1,129 @@
+description: Heat template that deploys PnP PNF simulator
+heat_template_version: '2013-05-23'
+parameters:
+  flavor_name: {description: Type of instance (flavor) to be used, label: Flavor,
+    type: string}
+  image_name: {description: Image to be used for compute instance, label: Image name
+      or ID, type: string}
+  key_name: {description: Public/Private key pair name, label: Key pair name, type: string}
+  public_net_id: {description: Public network that enables remote connection to VNF,
+    label: Public network name or ID, type: string}
+  private_net_id: {type: string, description: Private network id, label: Private network name or ID}
+  private_subnet_id: {type: string, description: Private subnet id, label: Private subnetwork name or ID}
+  proxy: {type: string, description: Proxy, label: Proxy, default: ""}
+resources:
+  PNF_PnP_simualtor:
+    type: OS::Nova::Server
+    properties:
+      key_name: { get_param: key_name }
+      image: { get_param: image_name }
+      flavor: { get_param: flavor_name }
+      networks:
+      - port: { get_resource: PNF_PnP_simualtor_port0 }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          template: |
+            #!/bin/bash
+
+            set_versions () {
+                    DOCKER_COMPOSE_VERSION=1.22.0
+            }
+
+
+            enable_root_ssh () {
+                sed -i 's/PermitRootLogin.*/PermitRootLogin yes/' /etc/ssh/sshd_config
+                sed -i 's/PasswordAuthentication.*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+                service sshd restart
+                echo -e "arthur\narthur" | passwd root
+            }
+
+            update_os () {
+                dnf -y install fedora-upgrade
+            }
+
+            docker_install_configure () {
+                dnf -y remove docker \
+                              docker-client \
+                              docker-client-latest \
+                              docker-common \
+                              docker-latest \
+                              docker-latest-logrotate \
+                              docker-logrotate \
+                              docker-selinux \
+                              docker-engine-selinux \
+                              docker-engine
+                dnf -y install dnf-plugins-core
+                dnf config-manager \
+                 --add-repo \
+                https://download.docker.com/linux/fedora/docker-ce.repo
+                dnf -y install docker-ce
+                systemctl start docker
+                mkdir -p /etc/systemd/system/docker.service.d/
+                cat > /etc/systemd/system/docker.service.d/override.conf<< EOF
+            [Service]
+            Environment="HTTP_PROXY=$proxy"
+            Environment="HTTPS_PROXY=$proxy"
+            EOF
+                systemctl daemon-reload
+                systemctl restart docker
+                docker login -u docker -p docker nexus3.onap.org:10003
+            }
+            docker_compose_install () {
+                curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+                chmod +x /usr/local/bin/docker-compose
+            }
+            pnf_sim_file_checkout () {
+                mkdir ~/sim/
+                mkdir ~/sim/ssh
+                cd ~/sim/ssh/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/ssh/ssh_host_rsa_key;hb=HEAD" -O ssh_host_rsa_key
+                cd ~/sim/ssh/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/ssh/ssh_host_rsa_key.pub;hb=HEAD" -O ssh_host_rsa_key.pub
+                mkdir ~/sim/sftp
+                cd ~/sim/sftp/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/sftp/sftp-file.txt;hb=HEAD" -O sftp-file.txt
+                mkdir ~/sim/config
+                cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/config/config.json;hb=HEAD" -O config.json
+                cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/config/netconf.env;hb=HEAD" -O netconf.env
+                mkdir ~/sim/json_schema
+                cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/json_schema/input_validator.json;hb=HEAD" -O input_validator.json
+                cd ~/sim/config/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/json_schema/output_validator_ves_schema_30.0.1.json;hb=HEAD" -O output_validator_ves_schema_30.0.1.json
+                mkdir ~/sim/netconf
+                cd ~/sim/netconf/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/netconf/pnf-simulator.data.xml;hb=HEAD" -O pnf-simulator.data.xml
+                cd ~/sim/netconf/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/netconf/pnf-simulator.yang;hb=HEAD" -O pnf-simulator.yang
+                cd ~/sim/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/docker-compose.yml;hb=HEAD" -O docker-compose.yml
+                cd ~/sim/;wget "https://gerrit.onap.org/r/gitweb?p=integration.git;a=blob_plain;f=test/mocks/pnfsimulator/simulator.sh;hb=HEAD" -O simulator.sh
+                chmod 654 ~/sim/simulator.sh
+            }
+
+            start_simulator (){
+               ~/sim/simulator.sh start
+            }
+
+            set_versions
+            enable_root_ssh
+            update_os
+            docker_install_configure
+            docker_compose_install
+            pnf_sim_file_checkout
+            start_simulator
+          params:
+            $proxy: { get_param: proxy }
+  PNF_PnP_simualtor_port0:
+    type: OS::Neutron::Port
+    properties:
+      network_id: { get_param: private_net_id }
+      security_groups:
+        - default
+      fixed_ips:
+        - subnet_id: { get_param: private_subnet_id }
+  PNF_PnP_simualtor_public:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: PNF_PnP_simualtor_port0 }
+outputs:
+  PNF_PnP_simualtor_private_ip:
+    description: IP address of PNF_PnP_simualtor in private network
+    value: { get_attr: [ PNF_PnP_simualtor, first_address ] }
+  PNF_PnP_simualtor_public_ip:
+    description: Floating IP address of PNF_PnP_simualtor in public network
+    value: { get_attr: [ PNF_PnP_simualtor_public, floating_ip_address ] }
index d6f376f..5f73cde 100644 (file)
@@ -32,8 +32,9 @@ services:
     container_name: sftp-server
     image: atmoz/sftp:alpine
     ports:
-      - "22:22"
+      - "2222:22"
     volumes:
       - ./sftp:/home/sftp-user/sftp
+      - ./ssh/ssh_host_rsa_key.pub:/home/sftp-user/.ssh/keys/ssh_host_rsa_key.pub:ro
     restart: on-failure
-    command: sftp-user:sftp-password
\ No newline at end of file
+    command: sftp-user::1001
\ No newline at end of file
diff --git a/test/mocks/pnfsimulator/json_schema/output_validator.json b/test/mocks/pnfsimulator/json_schema/output_validator.json
deleted file mode 100644 (file)
index a8ea341..0000000
+++ /dev/null
@@ -1,2432 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "VES Event Listener Common Event Format",
-  "type": "object",
-  "properties": {
-    "event": {"$ref": "#/definitions/event"},
-    "eventList": {"$ref": "#/definitions/eventList"}
-  },
-
-  "definitions": {
-    "schemaHeaderBlock": {
-      "description": "schema date, version, author and associated API",
-      "type": "object",
-      "properties": {
-        "associatedApi": {
-          "description": "VES Event Listener",
-          "type": "string"
-        },
-        "lastUpdatedBy": {
-          "description": "re2947",
-          "type": "string"
-        },
-        "schemaDate": {
-          "description": "July 31, 2018",
-          "type": "string"
-        },
-        "schemaVersion": {
-          "description": "30.0.1",
-          "type": "number"
-        }
-      }
-    },
-    "schemaLicenseAndCopyrightNotice": {
-      "description": "Copyright (c) 2018, AT&T Intellectual Property.  All rights reserved",
-      "type": "object",
-      "properties": {
-        "apacheLicense2.0": {
-          "description": "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:",
-          "type": "string"
-        },
-        "licenseUrl": {
-          "description": "http://www.apache.org/licenses/LICENSE-2.0",
-          "type": "string"
-        },
-        "asIsClause": {
-          "description": "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.",
-          "type": "string"
-        },
-        "permissionsAndLimitations": {
-          "description": "See the License for the specific language governing permissions and limitations under the License.",
-          "type": "string"
-        }
-      }
-    },
-    "arrayOfJsonObject": {
-      "description": "array of json objects described by name, schema and other meta-information",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/jsonObject"
-      }
-    },
-    "arrayOfNamedHashMap": {
-      "description": "array of named hashMaps",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/namedHashMap"
-      }
-    },
-    "codecsInUse": {
-      "description": "number of times an identified codec was used over the measurementInterval",
-      "type": "object",
-      "properties": {
-        "codecIdentifier": { "type": "string" },
-        "numberInUse": { "type": "integer" }
-      },
-      "additionalProperties": false,
-      "required": [ "codecIdentifier", "numberInUse" ]
-    },
-    "commonEventHeader": {
-      "description": "fields common to all events",
-      "type": "object",
-      "properties": {
-        "domain": {
-          "description": "the eventing domain associated with the event",
-          "type": "string",
-          "enum": [
-            "fault",
-            "heartbeat",
-            "measurement",
-            "mobileFlow",
-            "notification",
-            "other",
-            "pnfRegistration",
-            "sipSignaling",
-            "stateChange",
-            "syslog",
-            "thresholdCrossingAlert",
-            "voiceQuality"
-          ]
-        },
-        "eventId": {
-          "description": "event key that is unique to the event source",
-          "type": "string"
-        },
-        "eventName": {
-          "description": "unique event name",
-          "type": "string"
-        },
-        "eventType": {
-          "description": "for example - applicationNf, guestOS, hostOS, platform",
-          "type": "string"
-        },
-        "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
-        "lastEpochMicrosec": {
-          "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "nfcNamingCode": {
-          "description": "3 character network function component type, aligned with vfc naming standards",
-          "type": "string"
-        },
-        "nfNamingCode": {
-          "description": "4 character network function type, aligned with nf naming standards",
-          "type": "string"
-        },
-        "nfVendorName": {
-          "description": "network function vendor name",
-          "type": "string"
-        },
-        "priority": {
-          "description": "processing priority",
-          "type": "string",
-          "enum": [
-            "High",
-            "Medium",
-            "Normal",
-            "Low"
-          ]
-        },
-        "reportingEntityId": {
-          "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process",
-          "type": "string"
-        },
-        "reportingEntityName": {
-          "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
-          "type": "string"
-        },
-        "sequence": {
-          "description": "ordering of events communicated by an event source instance or 0 if not needed",
-          "type": "integer"
-        },
-        "sourceId": {
-          "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process",
-          "type": "string"
-        },
-        "sourceName": {
-          "description": "name of the entity experiencing the event issue",
-          "type": "string"
-        },
-        "startEpochMicrosec": {
-          "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "timeZoneOffset": {
-          "description": "UTC offset for the local time zone of the device as UTC+/-hh.mm",
-          "type": "string"
-        },
-        "version": {
-          "description": "version of the event header",
-          "type": "string",
-          "enum": [ "4.0.1" ]
-        },
-        "vesEventListenerVersion": {
-          "description": "version of the VES Event Listener API",
-          "type": "string",
-          "enum": [ "7.0.1" ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec",
-        "priority", "reportingEntityName", "sequence", "sourceName",
-        "startEpochMicrosec", "version", "vesEventListenerVersion" ]
-    },
-    "counter": {
-      "description": "performance counter",
-      "type": "object",
-      "properties": {
-        "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
-        "hashMap": { "$ref": "#/definitions/hashMap" },
-        "thresholdCrossed": { "type": "string" }
-      },
-      "additionalProperties": false,
-      "required": [ "criticality", "hashMap", "thresholdCrossed" ]
-    },
-    "cpuUsage": {
-      "description": "usage of an identified CPU",
-      "type": "object",
-      "properties": {
-        "cpuCapacityContention": {
-          "description": "the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuDemandAvg": {
-          "description": "the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuDemandMhz": {
-          "description": "CPU demand in megahertz",
-          "type": "number"
-        },
-        "cpuDemandPct": {
-          "description": "CPU demand as a percentage of the provisioned capacity",
-          "type": "number"
-        },
-        "cpuIdentifier": {
-          "description": "cpu identifer",
-          "type": "string"
-        },
-        "cpuIdle": {
-          "description": "percentage of CPU time spent in the idle task",
-          "type": "number"
-        },
-        "cpuLatencyAvg": {
-          "description": "percentage of time the VM is unable to run because it is contending for access to the physical CPUs",
-          "type": "number"
-        },
-        "cpuOverheadAvg": {
-          "description": "the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuSwapWaitTime": {
-          "description": "swap wait time. in milliseconds over the measurementInterval",
-          "type": "number"
-        },
-        "cpuUsageInterrupt": {
-          "description": "percentage of time spent servicing interrupts",
-          "type": "number"
-        },
-        "cpuUsageNice": {
-          "description": "percentage of time spent running user space processes that have been niced",
-          "type": "number"
-        },
-        "cpuUsageSoftIrq": {
-          "description": "percentage of time spent handling soft irq interrupts",
-          "type": "number"
-        },
-        "cpuUsageSteal": {
-          "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
-          "type": "number"
-        },
-        "cpuUsageSystem": {
-          "description": "percentage of time spent on system tasks running the kernel",
-          "type": "number"
-        },
-        "cpuUsageUser": {
-          "description": "percentage of time spent running un-niced user space processes",
-          "type": "number"
-        },
-        "cpuWait": {
-          "description": "percentage of CPU time spent waiting for I/O operations to complete",
-          "type": "number"
-        },
-        "percentUsage": {
-          "description": "aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "cpuIdentifier", "percentUsage" ]
-    },
-    "diskUsage": {
-      "description": "usage of an identified disk",
-      "type": "object",
-      "properties": {
-        "diskBusResets": {
-          "description": "number of bus resets over the measurementInterval",
-          "type": "number"
-        },
-        "diskCommandsAborted": {
-          "description": "number of disk commands aborted over the measurementInterval",
-          "type": "number"
-        },
-        "diskCommandsAvg": {
-          "description": "average number of commands per second over the measurementInterval",
-          "type": "number"
-        },
-        "diskFlushRequests": {
-          "description": "total flush requests of the disk cache over the measurementInterval",
-          "type": "number"
-        },
-        "diskFlushTime": {
-          "description": "milliseconds spent on disk cache flushing over the measurementInterval",
-          "type": "number"
-        },
-        "diskIdentifier": {
-          "description": "disk identifier",
-          "type": "string"
-        },
-        "diskIoTimeAvg": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeLast": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeMax": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskIoTimeMin": {
-          "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadAvg": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadLast": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadMax": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedReadMin": {
-          "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteAvg": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteLast": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteMax": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskMergedWriteMin": {
-          "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadAvg": {
-          "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadLast": {
-          "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadMax": {
-          "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsReadMin": {
-          "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteAvg": {
-          "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteLast": {
-          "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteMax": {
-          "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOctetsWriteMin": {
-          "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadAvg": {
-          "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadLast": {
-          "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadMax": {
-          "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsReadMin": {
-          "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteAvg": {
-          "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteLast": {
-          "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteMax": {
-          "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskOpsWriteMin": {
-          "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsAvg": {
-          "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsLast": {
-          "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsMax": {
-          "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskPendingOperationsMin": {
-          "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskReadCommandsAvg": {
-          "description": "average number of read commands issued per second to the disk over the measurementInterval",
-          "type": "number"
-        },
-        "diskTime": {
-          "description": "nanoseconds spent on disk cache reads/writes within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadAvg": {
-          "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadLast": {
-          "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadMax": {
-          "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeReadMin": {
-          "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteAvg": {
-          "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteLast": {
-          "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteMax": {
-          "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTimeWriteMin": {
-          "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
-          "type": "number"
-        },
-        "diskTotalReadLatencyAvg": {
-          "description": "average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval",
-          "type": "number"
-        },
-        "diskTotalWriteLatencyAvg": {
-          "description": "average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeAvg": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeLast": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeMax": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval",
-          "type": "number"
-        },
-        "diskWeightedIoTimeMin": {
-          "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval",
-          "type": "number"
-        },
-        "diskWriteCommandsAvg": {
-          "description": "average number of write commands issued per second to the disk over the measurementInterval",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "diskIdentifier" ]
-    },
-    "endOfCallVqmSummaries": {
-      "description": "provides end of call voice quality metrics",
-      "type": "object",
-      "properties": {
-        "adjacencyName": {
-          "description": " adjacency name",
-          "type": "string"
-        },
-        "endpointAverageJitter": {
-          "description": "endpoint average jitter",
-          "type": "number"
-        },
-        "endpointDescription": {
-          "description": "either Caller or Callee",
-          "type": "string",
-          "enum": ["Caller", "Callee"]
-        },
-        "endpointMaxJitter": {
-          "description": "endpoint maximum jitter",
-          "type": "number"
-        },
-        "endpointRtpOctetsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpOctetsLost": {
-          "description": "endpoint RTP octets lost",
-          "type": "number"
-        },
-        "endpointRtpOctetsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpOctetsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsLost": {
-          "description": "endpoint RTP packets lost",
-          "type": "number"
-        },
-        "endpointRtpPacketsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "endpointRtpPacketsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "localAverageJitter": {
-          "description": "Local average jitter",
-          "type": "number"
-        },
-        "localAverageJitterBufferDelay": {
-          "description": "Local average jitter delay",
-          "type": "number"
-        },
-        "localMaxJitter": {
-          "description": "Local maximum jitter",
-          "type": "number"
-        },
-        "localMaxJitterBufferDelay": {
-          "description": "Local maximum jitter delay",
-          "type": "number"
-        },
-        "localRtpOctetsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpOctetsLost": {
-          "description": "Local RTP octets lost",
-          "type": "number"
-        },
-        "localRtpOctetsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpOctetsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsDiscarded": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsLost": {
-          "description": "Local RTP packets lost",
-          "type": "number"
-        },
-        "localRtpPacketsReceived": {
-          "description": "",
-          "type": "number"
-        },
-        "localRtpPacketsSent": {
-          "description": "",
-          "type": "number"
-        },
-        "mosCqe": {
-          "description": "1-5 1dp",
-          "type": "number"
-        },
-        "oneWayDelay": {
-          "description": "one-way path delay in milliseconds",
-          "type": "number"
-        },
-        "packetLossPercent": {
-          "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
-          "type": "number"
-        },
-        "rFactor": {
-          "description": "0-100",
-          "type": "number"
-        },
-        "roundTripDelay": {
-          "description": "millisecs",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "adjacencyName", "endpointDescription" ]
-    },
-    "event": {
-      "description": "the root level of the common event format",
-      "type": "object",
-      "properties": {
-        "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
-        "faultFields": { "$ref": "#/definitions/faultFields" },
-        "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" },
-        "measurementFields": { "$ref": "#/definitions/measurementFields" },
-        "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
-        "notificationFields": { "$ref": "#/definitions/notificationFields" },
-        "otherFields": { "$ref": "#/definitions/otherFields" },
-        "pnfRegistrationFields": { "$ref": "#/definitions/pnfRegistrationFields" },
-        "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" },
-        "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
-        "syslogFields": { "$ref": "#/definitions/syslogFields" },
-        "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" },
-        "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" }
-      },
-      "additionalProperties": false,
-      "required": [ "commonEventHeader" ]
-    },
-    "eventList": {
-      "description": "array of events",
-      "type": "array",
-      "items": {
-        "$ref": "#/definitions/event"
-      }
-    },
-    "faultFields": {
-      "description": "fields specific to fault events",
-      "type": "object",
-      "properties": {
-        "alarmAdditionalInformation": { "$ref": "#/definitions/hashMap" },
-        "alarmCondition": {
-          "description": "alarm condition reported by the device",
-          "type": "string"
-        },
-        "alarmInterfaceA": {
-          "description": "card, port, channel or interface name of the device generating the alarm",
-          "type": "string"
-        },
-        "eventCategory": {
-          "description": "Event category, for example: license, link, routing, security, signaling",
-          "type": "string"
-        },
-        "eventSeverity": {
-          "description": "event severity",
-          "type": "string",
-          "enum": [
-            "CRITICAL",
-            "MAJOR",
-            "MINOR",
-            "WARNING",
-            "NORMAL"
-          ]
-        },
-        "eventSourceType": {
-          "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction",
-          "type": "string"
-        },
-        "faultFieldsVersion": {
-          "description": "version of the faultFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        },
-        "specificProblem": {
-          "description": "short description of the alarm or problem",
-          "type": "string"
-        },
-        "vfStatus": {
-          "description": "virtual function status enumeration",
-          "type": "string",
-          "enum": [
-            "Active",
-            "Idle",
-            "Preparing to terminate",
-            "Ready to terminate",
-            "Requesting termination"
-          ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "alarmCondition", "eventSeverity", "eventSourceType",
-        "faultFieldsVersion", "specificProblem", "vfStatus" ]
-    },
-    "filesystemUsage": {
-      "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
-      "type": "object",
-      "properties": {
-        "blockConfigured": { "type": "number" },
-        "blockIops": { "type": "number" },
-        "blockUsed": { "type": "number" },
-        "ephemeralConfigured": { "type": "number" },
-        "ephemeralIops": { "type": "number" },
-        "ephemeralUsed": { "type": "number" },
-        "filesystemName": { "type": "string" }
-      },
-      "additionalProperties": false,
-      "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
-        "ephemeralIops", "ephemeralUsed", "filesystemName" ]
-    },
-    "gtpPerFlowMetrics": {
-      "description": "Mobility GTP Protocol per flow metrics",
-      "type": "object",
-      "properties": {
-        "avgBitErrorRate": {
-          "description": "average bit error rate",
-          "type": "number"
-        },
-        "avgPacketDelayVariation": {
-          "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets",
-          "type": "number"
-        },
-        "avgPacketLatency": {
-          "description": "average delivery latency",
-          "type": "number"
-        },
-        "avgReceiveThroughput": {
-          "description": "average receive throughput",
-          "type": "number"
-        },
-        "avgTransmitThroughput": {
-          "description": "average transmit throughput",
-          "type": "number"
-        },
-        "durConnectionFailedStatus": {
-          "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval",
-          "type": "number"
-        },
-        "durTunnelFailedStatus": {
-          "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval",
-          "type": "number"
-        },
-        "flowActivatedBy": {
-          "description": "Endpoint activating the flow",
-          "type": "string"
-        },
-        "flowActivationEpoch": {
-          "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available",
-          "type": "number"
-        },
-        "flowActivationMicrosec": {
-          "description": "Integer microseconds for the start of the flow connection",
-          "type": "number"
-        },
-        "flowActivationTime": {
-          "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "flowDeactivatedBy": {
-          "description": "Endpoint deactivating the flow",
-          "type": "string"
-        },
-        "flowDeactivationEpoch": {
-          "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
-          "type": "number"
-        },
-        "flowDeactivationMicrosec": {
-          "description": "Integer microseconds for the start of the flow connection",
-          "type": "number"
-        },
-        "flowDeactivationTime": {
-          "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "flowStatus": {
-          "description": "connection status at reporting time as a working / inactive / failed indicator value",
-          "type": "string"
-        },
-        "gtpConnectionStatus": {
-          "description": "Current connection state at reporting time",
-          "type": "string"
-        },
-        "gtpTunnelStatus": {
-          "description": "Current tunnel state  at reporting time",
-          "type": "string"
-        },
-        "ipTosCountList": { "$ref": "#/definitions/hashMap" },
-        "ipTosList": {
-          "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "largePacketRtt": {
-          "description": "large packet round trip time",
-          "type": "number"
-        },
-        "largePacketThreshold": {
-          "description": "large packet threshold being applied",
-          "type": "number"
-        },
-        "maxPacketDelayVariation": {
-          "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets",
-          "type": "number"
-        },
-        "maxReceiveBitRate": {
-          "description": "maximum receive bit rate",
-          "type": "number"
-        },
-        "maxTransmitBitRate": {
-          "description": "maximum transmit bit rate",
-          "type": "number"
-        },
-        "mobileQciCosCountList": { "$ref": "#/definitions/hashMap" },
-        "mobileQciCosList": {
-          "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "numActivationFailures": {
-          "description": "Number of failed activation requests, as observed by the reporting node",
-          "type": "number"
-        },
-        "numBitErrors": {
-          "description": "number of errored bits",
-          "type": "number"
-        },
-        "numBytesReceived": {
-          "description": "number of bytes received, including retransmissions",
-          "type": "number"
-        },
-        "numBytesTransmitted": {
-          "description": "number of bytes transmitted, including retransmissions",
-          "type": "number"
-        },
-        "numDroppedPackets": {
-          "description": "number of received packets dropped due to errors per virtual interface",
-          "type": "number"
-        },
-        "numGtpEchoFailures": {
-          "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2",
-          "type": "number"
-        },
-        "numGtpTunnelErrors": {
-          "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1",
-          "type": "number"
-        },
-        "numHttpErrors": {
-          "description": "Http error count",
-          "type": "number"
-        },
-        "numL7BytesReceived": {
-          "description": "number of tunneled layer 7 bytes received, including retransmissions",
-          "type": "number"
-        },
-        "numL7BytesTransmitted": {
-          "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
-          "type": "number"
-        },
-        "numLostPackets": {
-          "description": "number of lost packets",
-          "type": "number"
-        },
-        "numOutOfOrderPackets": {
-          "description": "number of out-of-order packets",
-          "type": "number"
-        },
-        "numPacketErrors": {
-          "description": "number of errored packets",
-          "type": "number"
-        },
-        "numPacketsReceivedExclRetrans": {
-          "description": "number of packets received, excluding retransmission",
-          "type": "number"
-        },
-        "numPacketsReceivedInclRetrans": {
-          "description": "number of packets received, including retransmission",
-          "type": "number"
-        },
-        "numPacketsTransmittedInclRetrans": {
-          "description": "number of packets transmitted, including retransmissions",
-          "type": "number"
-        },
-        "numRetries": {
-          "description": "number of packet retries",
-          "type": "number"
-        },
-        "numTimeouts": {
-          "description": "number of packet timeouts",
-          "type": "number"
-        },
-        "numTunneledL7BytesReceived": {
-          "description": "number of tunneled layer 7 bytes received, excluding retransmissions",
-          "type": "number"
-        },
-        "roundTripTime": {
-          "description": "round trip time",
-          "type": "number"
-        },
-        "tcpFlagCountList": { "$ref": "#/definitions/hashMap" },
-        "tcpFlagList": {
-          "description": "Array of unique TCP Flags observed in the flow",
-          "type": "array",
-          "items": {
-            "type": "string"
-          }
-        },
-        "timeToFirstByte": {
-          "description": "Time in milliseconds between the connection activation and first byte received",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency",
-        "avgReceiveThroughput", "avgTransmitThroughput",
-        "flowActivationEpoch", "flowActivationMicrosec",
-        "flowDeactivationEpoch", "flowDeactivationMicrosec",
-        "flowDeactivationTime", "flowStatus",
-        "maxPacketDelayVariation", "numActivationFailures",
-        "numBitErrors", "numBytesReceived", "numBytesTransmitted",
-        "numDroppedPackets", "numL7BytesReceived",
-        "numL7BytesTransmitted", "numLostPackets",
-        "numOutOfOrderPackets", "numPacketErrors",
-        "numPacketsReceivedExclRetrans",
-        "numPacketsReceivedInclRetrans",
-        "numPacketsTransmittedInclRetrans",
-        "numRetries", "numTimeouts", "numTunneledL7BytesReceived",
-        "roundTripTime", "timeToFirstByte"
-      ]
-    },
-    "hashMap": {
-      "description": "an associative array which is an array of key:value pairs",
-      "type": "object",
-      "additionalProperties": { "type": "string" },
-      "default": {}
-    },
-    "heartbeatFields": {
-      "description": "optional field block for fields specific to heartbeat events",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "heartbeatFieldsVersion": {
-          "description": "version of the heartbeatFields block",
-          "type": "string",
-          "enum": [ "3.0" ]
-        },
-        "heartbeatInterval": {
-          "description": "current heartbeat interval in seconds",
-          "type": "integer"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
-    },
-    "hugePages": {
-      "description": "metrics on system hugepages",
-      "type": "object",
-      "properties": {
-        "bytesFree": {
-          "description": "number of free hugepages in bytes",
-          "type": "number"
-        },
-        "bytesUsed": {
-          "description": "number of used hugepages in bytes",
-          "type": "number"
-        },
-        "hugePagesIdentifier": {
-          "description": "hugePages identifier",
-          "type": "number"
-        },
-        "percentFree": {
-          "description": "number of free hugepages in percent",
-          "type": "number"
-        },
-        "percentUsed": {
-          "description": "number of free hugepages in percent",
-          "type": "number"
-        },
-        "vmPageNumberFree": {
-          "description": "number of free vmPages in numbers",
-          "type": "number"
-        },
-        "vmPageNumberUsed": {
-          "description": "number of used vmPages in numbers",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "hugePagesIdentifier" ]
-    },
-    "internalHeaderFields": {
-      "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
-      "type": "object"
-    },
-    "ipmi": {
-      "description": "intelligent platform management interface metrics",
-      "type": "object",
-      "properties": {
-        "exitAirTemperature": {
-          "description": "system fan exit air flow temperature in celsius",
-          "type": "number"
-        },
-        "frontPanelTemperature": {
-          "description": "front panel temperature in celsius",
-          "type": "number"
-        },
-        "ioModuleTemperature": {
-          "description": "io module temperature in celsius",
-          "type": "number"
-        },
-        "ipmiBaseboardTemperatureArray": {
-          "description": "array of ipmiBaseboardTemperature objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBaseboardTemperature"
-          }
-        },
-        "ipmiBaseboardVoltageRegulatorArray": {
-          "description": "array of ipmiBaseboardVoltageRegulator objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBaseboardVoltageRegulator"
-          }
-        },
-        "ipmiBatteryArray": {
-          "description": "array of ipmiBattery objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiBattery"
-          }
-        },
-        "ipmiFanArray": {
-          "description": "array of ipmiFan objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiFan"
-          }
-        },
-        "ipmiHsbpArray": {
-          "description": "array of ipmiHsbp objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiHsbp"
-          }
-        },
-        "ipmiGlobalAggregateTemperatureMarginArray": {
-          "description": "array of ipmiGlobalAggregateTemperatureMargin objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiGlobalAggregateTemperatureMargin"
-          }
-        },
-        "ipmiNicArray": {
-          "description": "array of ipmiNic objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiNic"
-          }
-        },
-        "ipmiPowerSupplyArray": {
-          "description": "array of ipmiPowerSupply objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiPowerSupply"
-          }
-        },
-        "ipmiProcessorArray": {
-          "description": "array of ipmiProcessor objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/ipmiProcessor"
-          }
-        },
-        "systemAirflow": {
-          "description": "airfflow in cubic feet per minute (cfm)",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false
-    },
-    "ipmiBaseboardTemperature": {
-      "description": "intelligent platform management interface (ipmi) baseboard temperature metrics",
-      "type": "object",
-      "properties": {
-        "baseboardTemperatureIdentifier": {
-          "description": "identifier for the location where the temperature is taken",
-          "type": "string"
-        },
-        "baseboardTemperature": {
-          "description": "baseboard temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "baseboardTemperatureIdentifier" ]
-    },
-    "ipmiBaseboardVoltageRegulator": {
-      "description": "intelligent platform management interface (ipmi) baseboard voltage regulator metrics",
-      "type": "object",
-      "properties": {
-        "baseboardVoltageRegulatorIdentifier": {
-          "description": "identifier for the baseboard voltage regulator",
-          "type": "string"
-        },
-        "voltageRegulatorTemperature": {
-          "description": "voltage regulator temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "baseboardVoltageRegulatorIdentifier" ]
-    },
-    "ipmiBattery": {
-      "description": "intelligent platform management interface (ipmi) battery metrics",
-      "type": "object",
-      "properties": {
-        "batteryIdentifier": {
-          "description": "identifier for the battery",
-          "type": "string"
-        },
-        "batteryType": {
-          "description": "type of battery",
-          "type": "string"
-        },
-        "batteryVoltageLevel": {
-          "description": "battery voltage level",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "batteryIdentifier" ]
-    },
-    "ipmiFan": {
-      "description": "intelligent platform management interface (ipmi) fan metrics",
-      "type": "object",
-      "properties": {
-        "fanIdentifier": {
-          "description": "identifier for the fan",
-          "type": "string"
-        },
-        "fanSpeed": {
-          "description": "fan speed in revolutions per minute (rpm)",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "fanIdentifier" ]
-    },
-    "ipmiGlobalAggregateTemperatureMargin": {
-      "description": "intelligent platform management interface (ipmi) global aggregate temperature margin",
-      "type": "object",
-      "properties": {
-        "ipmiGlobalAggregateTemperatureMarginIdentifier": {
-          "description": "identifier for the ipmi global aggregate temperature margin metrics",
-          "type": "string"
-        },
-        "globalAggregateTemperatureMargin": {
-          "description": "the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "ipmiGlobalAggregateTemperatureMarginIdentifier", "globalAggregateTemperatureMargin" ]
-    },
-    "ipmiHsbp": {
-      "description": "intelligent platform management interface (ipmi) hot swap backplane power metrics",
-      "type": "object",
-      "properties": {
-        "hsbpIdentifier": {
-          "description": "identifier for the hot swap backplane power unit",
-          "type": "string"
-        },
-        "hsbpTemperature": {
-          "description": "hot swap backplane power temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "hsbpIdentifier" ]
-    },
-    "ipmiNic": {
-      "description": "intelligent platform management interface (ipmi) network interface control card (nic) metrics",
-      "type": "object",
-      "properties": {
-        "nicIdentifier": {
-          "description": "identifier for the network interface control card",
-          "type": "string"
-        },
-        "nicTemperature": {
-          "description": "nic temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "nicIdentifier" ]
-    },
-    "ipmiPowerSupply": {
-      "description": "intelligent platform management interface (ipmi) power supply metrics",
-      "type": "object",
-      "properties": {
-        "powerSupplyIdentifier": {
-          "description": "identifier for the power supply",
-          "type": "string"
-        },
-        "powerSupplyInputPower": {
-          "description": "input power in watts",
-          "type": "number"
-        },
-        "powerSupplyCurrentOutputPercent": {
-          "description": "current output voltage as a percentage of the design specified level",
-          "type": "number"
-        },
-        "powerSupplyTemperature": {
-          "description": "power supply temperature in celsius",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "powerSupplyIdentifier" ]
-    },
-    "ipmiProcessor": {
-      "description": "intelligent platform management interface processor metrics",
-      "type": "object",
-      "properties": {
-        "processorIdentifier": {
-          "description": "identifier for an ipmi processor",
-          "type": "string"
-        },
-        "processorThermalControlPercent": {
-          "description": "io module temperature in celsius",
-          "type": "number"
-        },
-        "processorDtsThermalMargin": {
-          "description": "front panel temperature in celsius",
-          "type": "number"
-        },
-        "processorDimmAggregateThermalMarginArray": {
-          "description": "array of processorDimmAggregateThermalMargin objects",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/processorDimmAggregateThermalMargin"
-          }
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "processorIdentifier" ]
-    },
-    "jsonObject": {
-      "description": "json object schema, name and other meta-information along with one or more object instances",
-      "type": "object",
-      "properties": {
-        "objectInstances":  {
-          "description": "one or more instances of the jsonObject",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/jsonObjectInstance"
-          }
-        },
-        "objectName":  {
-          "description": "name of the JSON Object",
-          "type": "string"
-        },
-        "objectSchema":  {
-          "description": "json schema for the object",
-          "type": "string"
-        },
-        "objectSchemaUrl":  {
-          "description": "Url to the json schema for the object",
-          "type": "string"
-        },
-        "nfSubscribedObjectName":  {
-          "description": "name of the object associated with the nfSubscriptonId",
-          "type": "string"
-        },
-        "nfSubscriptionId":  {
-          "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "objectInstances", "objectName" ]
-    },
-    "jsonObjectInstance": {
-      "description": "meta-information about an instance of a jsonObject along with the actual object instance",
-      "type": "object",
-      "properties": {
-        "jsonObject": { "$ref": "#/definitions/jsonObject" },
-        "objectInstance":  {
-          "description": "an instance conforming to the jsonObject objectSchema",
-          "type": "object"
-        },
-        "objectInstanceEpochMicrosec":  {
-          "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
-          "type": "number"
-        },
-        "objectKeys":  {
-          "description": "an ordered set of keys that identifies this particular instance of jsonObject",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/key"
-          }
-        }
-      },
-      "additionalProperties": false
-    },
-    "key": {
-      "description": "tuple which provides the name of a key along with its value and relative order",
-      "type": "object",
-      "properties": {
-        "keyName": {
-          "description": "name of the key",
-          "type": "string"
-        },
-        "keyOrder": {
-          "description": "relative sequence or order of the key with respect to other keys",
-          "type": "integer"
-        },
-        "keyValue": {
-          "description": "value of the key",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "keyName" ]
-    },
-    "latencyBucketMeasure": {
-      "description": "number of counts falling within a defined latency bucket",
-      "type": "object",
-      "properties": {
-        "countsInTheBucket": { "type": "number" },
-        "highEndOfLatencyBucket": { "type": "number" },
-        "lowEndOfLatencyBucket":  { "type": "number" }
-      },
-      "additionalProperties": false,
-      "required": [ "countsInTheBucket" ]
-    },
-    "load": {
-      "description": "/proc/loadavg cpu utilization and io utilization metrics",
-      "type": "object",
-      "properties": {
-        "longTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg",
-          "type": "number"
-        },
-        "midTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg",
-          "type": "number"
-        },
-        "shortTerm": {
-          "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false
-    },
-    "machineCheckException": {
-      "description": "metrics on vm machine check exceptions",
-      "type": "object",
-      "properties": {
-        "correctedMemoryErrors": {
-          "description": "total hardware errors that were corrected by the hardware (e.g. data corruption corrected via Â ECC) over the measurementInterval",
-          "type": "number"
-        },
-        "correctedMemoryErrorsIn1Hr": {
-          "description": "total hardware errors that were corrected by the hardware over the last one hour",
-          "type": "number"
-        },
-        "uncorrectedMemoryErrors": {
-          "description": "total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval",
-          "type": "number"
-        },
-        "uncorrectedMemoryErrorsIn1Hr": {
-          "description": "total uncorrected hardware errors that were detected by the hardware over the last one hour",
-          "type": "number"
-        },
-        "vmIdentifier": {
-          "description": "virtual machine identifier associated with the machine check exception",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "vmIdentifier" ]
-    },
-    "measurementFields": {
-      "description": "measurement fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "additionalMeasurements": {"$ref": "#/definitions/arrayOfNamedHashMap"},
-        "additionalObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
-        "codecUsageArray": {
-          "description": "array of codecs in use",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/codecsInUse"
-          }
-        },
-        "concurrentSessions": {
-          "description": "peak concurrent sessions for the VM or xNF over the measurementInterval",
-          "type": "integer"
-        },
-        "configuredEntities": {
-          "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF",
-          "type": "integer"
-        },
-        "cpuUsageArray": {
-          "description": "usage of an array of CPUs",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/cpuUsage"
-          }
-        },
-        "diskUsageArray": {
-          "description": "usage of an array of disks",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/diskUsage"
-          }
-        },
-        "featureUsageArray": { "$ref": "#/definitions/hashMap" },
-        "filesystemUsageArray": {
-          "description": "filesystem usage of the VM on which the xNFC reporting the event is running",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/filesystemUsage"
-          }
-        },
-        "hugePagesArray": {
-          "description": "array of metrics on hugepPages",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/hugePages"
-          }
-        },
-        "ipmi": { "$ref": "#/definitions/ipmi" },
-        "latencyDistribution": {
-          "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/latencyBucketMeasure"
-          }
-        },
-        "loadArray": {
-          "description": "array of system load metrics",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/load"
-          }
-        },
-        "machineCheckExceptionArray": {
-          "description": "array of machine check exceptions",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/machineCheckException"
-          }
-        },
-        "meanRequestLatency": {
-          "description": "mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running",
-          "type": "number"
-        },
-        "measurementInterval": {
-          "description": "interval over which measurements are being reported in seconds",
-          "type": "number"
-        },
-        "measurementFieldsVersion": {
-          "description": "version of the measurementFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        },
-        "memoryUsageArray": {
-          "description": "memory usage of an array of VMs",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/memoryUsage"
-          }
-        },
-        "numberOfMediaPortsInUse": {
-          "description": "number of media ports in use",
-          "type": "integer"
-        },
-        "requestRate": {
-          "description": "peak rate of service requests per second to the xNF over the measurementInterval",
-          "type": "number"
-        },
-        "nfcScalingMetric": {
-          "description": "represents busy-ness of the network function from 0 to 100 as reported by the xNFC",
-          "type": "integer"
-        },
-        "nicPerformanceArray": {
-          "description": "usage of an array of network interface cards",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/nicPerformance"
-          }
-        },
-        "processStatsArray": {
-          "description": "array of metrics on system processes",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/processStats"
-          }
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "measurementInterval", "measurementFieldsVersion" ]
-    },
-    "memoryUsage": {
-      "description": "memory usage of an identified virtual machine",
-      "type": "object",
-      "properties": {
-        "memoryBuffered": {
-          "description": "kibibytes of temporary storage for raw disk blocks",
-          "type": "number"
-        },
-        "memoryCached": {
-          "description": "kibibytes of memory used for cache",
-          "type": "number"
-        },
-        "memoryConfigured": {
-          "description": "kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running",
-          "type": "number"
-        },
-        "memoryDemand": {
-          "description": "host demand in kibibytes",
-          "type": "number"
-        },
-        "memoryFree": {
-          "description": "kibibytes of physical RAM left unused by the system",
-          "type": "number"
-        },
-        "memoryLatencyAvg": {
-          "description": "Percentage of time the VM is waiting to access swapped or compressed memory",
-          "type": "number"
-        },
-        "memorySharedAvg": {
-          "description": "shared memory in kilobytes",
-          "type": "number"
-        },
-        "memorySlabRecl": {
-          "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes",
-          "type": "number"
-        },
-        "memorySlabUnrecl": {
-          "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes",
-          "type": "number"
-        },
-        "memorySwapInAvg": {
-          "description": "Amount of memory swapped-in from host cache in kibibytes",
-          "type": "number"
-        },
-        "memorySwapInRateAvg": {
-          "description": "rate at which memory is swapped from disk into active memory during the interval in kilobytes per second",
-          "type": "number"
-        },
-        "memorySwapOutAvg": {
-          "description": "Amount of memory swapped-out to host cache in kibibytes",
-          "type": "number"
-        },
-        "memorySwapOutRateAvg": {
-          "description": "rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second",
-          "type": "number"
-        },
-        "memorySwapUsedAvg": {
-          "description": "space used for caching swapped pages in the host cache in kibibytes",
-          "type": "number"
-        },
-        "memoryUsed": {
-          "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes",
-          "type": "number"
-        },
-        "percentMemoryUsage": {
-          "description": "Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "vmIdentifier": {
-          "description": "virtual machine identifier associated with the memory metrics",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ]
-    },
-    "mobileFlowFields": {
-      "description": "mobileFlow fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "applicationType": {
-          "description": "Application type inferred",
-          "type": "string"
-        },
-        "appProtocolType": {
-          "description": "application protocol",
-          "type": "string"
-        },
-        "appProtocolVersion": {
-          "description": "application protocol version",
-          "type": "string"
-        },
-        "cid": {
-          "description": "cell id",
-          "type": "string"
-        },
-        "connectionType": {
-          "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
-          "type": "string"
-        },
-        "ecgi": {
-          "description": "Evolved Cell Global Id",
-          "type": "string"
-        },
-        "flowDirection": {
-          "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
-          "type": "string"
-        },
-        "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
-        "gtpProtocolType": {
-          "description": "GTP protocol",
-          "type": "string"
-        },
-        "gtpVersion": {
-          "description": "GTP protocol version",
-          "type": "string"
-        },
-        "httpHeader": {
-          "description": "HTTP request header, if the flow connects to a node referenced by HTTP",
-          "type": "string"
-        },
-        "imei": {
-          "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "imsi": {
-          "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "ipProtocolType": {
-          "description": "IP protocol type e.g., TCP, UDP, RTP...",
-          "type": "string"
-        },
-        "ipVersion": {
-          "description": "IP protocol version e.g., IPv4, IPv6",
-          "type": "string"
-        },
-        "lac": {
-          "description": "location area code",
-          "type": "string"
-        },
-        "mcc": {
-          "description": "mobile country code",
-          "type": "string"
-        },
-        "mnc": {
-          "description": "mobile network code",
-          "type": "string"
-        },
-        "mobileFlowFieldsVersion": {
-          "description": "version of the mobileFlowFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        },
-        "msisdn": {
-          "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
-          "type": "string"
-        },
-        "otherEndpointIpAddress": {
-          "description": "IP address for the other endpoint, as used for the flow being reported on",
-          "type": "string"
-        },
-        "otherEndpointPort": {
-          "description": "IP Port for the reporting entity, as used for the flow being reported on",
-          "type": "integer"
-        },
-        "otherFunctionalRole": {
-          "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
-          "type": "string"
-        },
-        "rac": {
-          "description": "routing area code",
-          "type": "string"
-        },
-        "radioAccessTechnology": {
-          "description": "Radio Access Technology e.g., 2G, 3G, LTE",
-          "type": "string"
-        },
-        "reportingEndpointIpAddr": {
-          "description": "IP address for the reporting entity, as used for the flow being reported on",
-          "type": "string"
-        },
-        "reportingEndpointPort": {
-          "description": "IP port for the reporting entity, as used for the flow being reported on",
-          "type": "integer"
-        },
-        "sac": {
-          "description": "service area code",
-          "type": "string"
-        },
-        "samplingAlgorithm": {
-          "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied",
-          "type": "integer"
-        },
-        "tac": {
-          "description": "transport area code",
-          "type": "string"
-        },
-        "tunnelId": {
-          "description": "tunnel identifier",
-          "type": "string"
-        },
-        "vlanId": {
-          "description": "VLAN identifier used by this flow",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
-        "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
-        "reportingEndpointIpAddr", "reportingEndpointPort" ]
-    },
-    "namedHashMap": {
-      "description": "a hashMap which is associated with and described by a name",
-      "type": "object",
-      "properties": {
-        "name":  { "type": "string" },
-        "hashMap": { "$ref": "#/definitions/hashMap" }
-      },
-      "additionalProperties": false,
-      "required": [ "name", "hashMap" ]
-    },
-    "nicPerformance": {
-      "description": "describes the performance and errors of an identified network interface card",
-      "type": "object",
-      "properties": {
-        "administrativeState": {
-          "description": "administrative state",
-          "type": "string",
-          "enum": [ "inService", "outOfService" ]
-        },
-        "nicIdentifier": {
-          "description": "nic identification",
-          "type": "string"
-        },
-        "operationalState": {
-          "description": "operational state",
-          "type": "string",
-          "enum": [ "inService", "outOfService" ]
-        },
-        "receivedBroadcastPacketsAccumulated": {
-          "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedBroadcastPacketsDelta": {
-          "description": "Count of broadcast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedDiscardedPacketsAccumulated": {
-          "description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedDiscardedPacketsDelta": {
-          "description": "Count of discarded packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedErrorPacketsAccumulated": {
-          "description": "Cumulative count of error packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedErrorPacketsDelta": {
-          "description": "Count of error packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedMulticastPacketsAccumulated": {
-          "description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedMulticastPacketsDelta": {
-          "description": "Count of multicast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedOctetsAccumulated": {
-          "description": "Cumulative count of octets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedOctetsDelta": {
-          "description": "Count of octets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedTotalPacketsAccumulated": {
-          "description": "Cumulative count of all packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedPercentDiscard": {
-          "description": "Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "receivedPercentError": {
-          "description": "Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.",
-          "type": "number"
-        },
-        "receivedTotalPacketsDelta": {
-          "description": "Count of all packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedUnicastPacketsAccumulated": {
-          "description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "receivedUnicastPacketsDelta": {
-          "description": "Count of unicast packets received within the measurement interval",
-          "type": "number"
-        },
-        "receivedUtilization": {
-          "description": "Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "speed": {
-          "description": "Speed configured in mbps",
-          "type": "number"
-        },
-        "transmittedBroadcastPacketsAccumulated": {
-          "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedBroadcastPacketsDelta": {
-          "description": "Count of broadcast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedDiscardedPacketsAccumulated": {
-          "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedDiscardedPacketsDelta": {
-          "description": "Count of discarded packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedErrorPacketsAccumulated": {
-          "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedErrorPacketsDelta": {
-          "description": "Count of error packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedMulticastPacketsAccumulated": {
-          "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedMulticastPacketsDelta": {
-          "description": "Count of multicast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedOctetsAccumulated": {
-          "description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedOctetsDelta": {
-          "description": "Count of octets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedTotalPacketsAccumulated": {
-          "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedTotalPacketsDelta": {
-          "description": "Count of all packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedUnicastPacketsAccumulated": {
-          "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
-          "type": "number"
-        },
-        "transmittedUnicastPacketsDelta": {
-          "description": "Count of unicast packets transmitted within the measurement interval",
-          "type": "number"
-        },
-        "transmittedPercentDiscard": {
-          "description": "Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "transmittedPercentError": {
-          "description": "Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
-          "type": "number"
-        },
-        "transmittedUtilization": {
-          "description": "Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.",
-          "type": "number"
-        },
-        "valuesAreSuspect": {
-          "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
-          "type": "string",
-          "enum": [ "true", "false" ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "nicIdentifier", "valuesAreSuspect" ]
-    },
-    "notificationFields": {
-      "description": "notification fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
-        "changeContact": {
-          "description": "identifier for a contact related to the change",
-          "type": "string"
-        },
-        "changeIdentifier": {
-          "description": "system or session identifier associated with the change",
-          "type": "string"
-        },
-        "changeType": {
-          "description": "describes what has changed for the entity",
-          "type": "string"
-        },
-        "newState": {
-          "description": "new state of the entity",
-          "type": "string"
-        },
-        "oldState": {
-          "description": "previous state of the entity",
-          "type": "string"
-        },
-        "notificationFieldsVersion": {
-          "description": "version of the notificationFields block",
-          "type": "string",
-          "enum": [ "2.0" ]
-        },
-        "stateInterface": {
-          "description": "card or port name of the entity that changed state",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "changeIdentifier", "changeType", "notificationFieldsVersion" ]
-    },
-    "otherFields": {
-      "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
-      "type": "object",
-      "properties": {
-        "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
-        "hashMap": {"$ref": "#/definitions/hashMap"},
-        "jsonObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
-        "otherFieldsVersion": {
-          "description": "version of the otherFields block",
-          "type": "string",
-          "enum": [ "3.0" ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "otherFieldsVersion" ]
-    },
-    "pnfRegistrationFields": {
-      "description": "hardware device registration fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "lastServiceDate": {
-          "description": "TS 32.692 dateOfLastService = date of last service; e.g. 15022017",
-          "type": "string"
-        },
-        "macAddress": {
-          "description": "MAC address of OAM interface of the unit",
-          "type": "string"
-        },
-        "manufactureDate": {
-          "description": "TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016",
-          "type": "string"
-        },
-        "modelNumber": {
-          "description": "TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model",
-          "type": "string"
-        },
-        "oamV4IpAddress": {
-          "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
-        },
-        "oamV6IpAddress": {
-          "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
-        },
-        "pnfRegistrationFieldsVersion": {
-          "description": "version of the pnfRegistrationFields block",
-          "type": "string",
-          "enum": [ "2.0" ]
-        },
-        "serialNumber": {
-          "description": "TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3",
-          "type": "string"
-        },
-        "softwareVersion": {
-          "description": "TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201",
-          "type": "string"
-        },
-        "unitFamily": {
-          "description": "TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU",
-          "type": "string"
-        },
-        "unitType": {
-          "description": "TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale",
-          "type": "string"
-        },
-        "vendorName": {
-          "description": "TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "pnfRegistrationFieldsVersion" ]
-    },
-    "processorDimmAggregateThermalMargin": {
-      "description": "intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics",
-      "type": "object",
-      "properties": {
-        "processorDimmAggregateThermalMarginIdentifier": {
-          "description": "identifier for the aggregate thermal margin metrics from the processor dual inline memory module",
-          "type": "string"
-        },
-        "thermalMargin": {
-          "description": "the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "processorDimmAggregateThermalMarginIdentifier", "thermalMargin" ]
-    },
-    "processStats": {
-      "description": "metrics on system processes",
-      "type": "object",
-      "properties": {
-        "forkRate": {
-          "description": "the number of threads created since the last reboot",
-          "type": "number"
-        },
-        "processIdentifier": {
-          "description": "processIdentifier",
-          "type": "string"
-        },
-        "psStateBlocked": {
-          "description": "the number of processes in a blocked state",
-          "type": "number"
-        },
-        "psStatePaging": {
-          "description": "the number of processes in a paging state",
-          "type": "number"
-        },
-        "psStateRunning": {
-          "description": "the number of processes in a running state",
-          "type": "number"
-        },
-        "psStateSleeping": {
-          "description": "the number of processes in a sleeping state",
-          "type": "number"
-        },
-        "psStateStopped": {
-          "description": "the number of processes in a stopped state",
-          "type": "number"
-        },
-        "psStateZombie": {
-          "description": "the number of processes in a zombie state",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "processIdentifier" ]
-    },
-    "requestError": {
-      "description": "standard request error data structure",
-      "type": "object",
-      "properties": {
-        "messageId": {
-          "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
-          "type": "string"
-        },
-        "text": {
-          "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
-          "type": "string"
-        },
-        "url": {
-          "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
-          "type": "string"
-        },
-        "variables": {
-          "description": "List of zero or more strings that represent the contents of the variables used by the message text",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "messageId", "text" ]
-    },
-    "sipSignalingFields": {
-      "description": "sip signaling fields",
-      "type": "object",
-      "properties": {
-        "additionalInformation": { "$ref": "#/definitions/hashMap"},
-        "compressedSip": {
-          "description": "the full SIP request/response including headers and bodies",
-          "type": "string"
-        },
-        "correlator": {
-          "description": "this is the same for all events on this call",
-          "type": "string"
-        },
-        "localIpAddress": {
-          "description": "IP address on xNF",
-          "type": "string"
-        },
-        "localPort": {
-          "description": "port on xNF",
-          "type": "string"
-        },
-        "remoteIpAddress": {
-          "description": "IP address of peer endpoint",
-          "type": "string"
-        },
-        "remotePort": {
-          "description": "port of peer endpoint",
-          "type": "string"
-        },
-        "sipSignalingFieldsVersion": {
-          "description": "version of the sipSignalingFields block",
-          "type": "string",
-          "enum": [ "3.0" ]
-        },
-        "summarySip": {
-          "description": "the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)",
-          "type": "string"
-        },
-        "vendorNfNameFields": {
-          "$ref": "#/definitions/vendorNfNameFields"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress",
-        "remotePort", "sipSignalingFieldsVersion", "vendorNfNameFields" ]
-    },
-    "stateChangeFields": {
-      "description": "stateChange fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "newState": {
-          "description": "new state of the entity",
-          "type": "string",
-          "enum": [
-            "inService",
-            "maintenance",
-            "outOfService"
-          ]
-        },
-        "oldState": {
-          "description": "previous state of the entity",
-          "type": "string",
-          "enum": [
-            "inService",
-            "maintenance",
-            "outOfService"
-          ]
-        },
-        "stateChangeFieldsVersion": {
-          "description": "version of the stateChangeFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        },
-        "stateInterface": {
-          "description": "card or port name of the entity that changed state",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ]
-    },
-    "syslogFields": {
-      "description": "sysLog fields",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap" },
-        "eventSourceHost": {
-          "description": "hostname of the device",
-          "type": "string"
-        },
-        "eventSourceType": {
-          "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
-          "type": "string"
-        },
-        "syslogFacility": {
-          "description": "numeric code from 0 to 23 for facility--see table in documentation",
-          "type": "integer"
-        },
-        "syslogFieldsVersion": {
-          "description": "version of the syslogFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        },
-        "syslogMsg": {
-          "description": "syslog message",
-          "type": "string"
-        },
-        "syslogMsgHost": {
-          "description": "hostname parsed from non-VES syslog message",
-          "type": "string"
-        },
-        "syslogPri": {
-          "description": "0-192 combined severity and facility",
-          "type": "integer"
-        },
-        "syslogProc": {
-          "description": "identifies the application that originated the message",
-          "type": "string"
-        },
-        "syslogProcId": {
-          "description": "a change in the value of this field indicates a discontinuity in syslog reporting",
-          "type": "number"
-        },
-        "syslogSData": {
-          "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
-          "type": "string"
-        },
-        "syslogSdId": {
-          "description": "0-32 char in format name@number for example ourSDID@32473",
-          "type": "string"
-        },
-        "syslogSev": {
-          "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
-          "type": "string",
-          "enum": [
-            "Alert",
-            "Critical",
-            "Debug",
-            "Emergency",
-            "Error",
-            "Info",
-            "Notice",
-            "Warning"
-          ]
-        },
-        "syslogTag": {
-          "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
-          "type": "string"
-        },
-        "syslogTs": {
-          "description": "timestamp parsed from non-VES syslog message",
-          "type": "string"
-        },
-        "syslogVer": {
-          "description": "IANA assigned version of the syslog protocol specification - typically 1",
-          "type": "number"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ]
-    },
-    "thresholdCrossingAlertFields": {
-      "description": "fields specific to threshold crossing alert events",
-      "type": "object",
-      "properties": {
-        "additionalFields": { "$ref": "#/definitions/hashMap"},
-        "additionalParameters": {
-          "description": "performance counters",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/counter"
-          }
-        },
-        "alertAction": {
-          "description": "Event action",
-          "type": "string",
-          "enum": [
-            "CLEAR",
-            "CONT",
-            "SET"
-          ]
-        },
-        "alertDescription": {
-          "description": "Unique short alert description such as IF-SHUB-ERRDROP",
-          "type": "string"
-        },
-        "alertType": {
-          "description": "Event type",
-          "type": "string",
-          "enum": [
-            "CARD-ANOMALY",
-            "ELEMENT-ANOMALY",
-            "INTERFACE-ANOMALY",
-            "SERVICE-ANOMALY"
-          ]
-        },
-        "alertValue": {
-          "description": "Calculated API value (if applicable)",
-          "type": "string"
-        },
-        "associatedAlertIdList": {
-          "description": "List of eventIds associated with the event being reported",
-          "type": "array",
-          "items": { "type": "string" }
-        },
-        "collectionTimestamp": {
-          "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "dataCollector": {
-          "description": "Specific performance collector instance used",
-          "type": "string"
-        },
-        "elementType": {
-          "description": "type of network element - internal ATT field",
-          "type": "string"
-        },
-        "eventSeverity": {
-          "description": "event severity or priority",
-          "type": "string",
-          "enum": [
-            "CRITICAL",
-            "MAJOR",
-            "MINOR",
-            "WARNING",
-            "NORMAL"
-          ]
-        },
-        "eventStartTimestamp": {
-          "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
-          "type": "string"
-        },
-        "interfaceName": {
-          "description": "Physical or logical port or card (if applicable)",
-          "type": "string"
-        },
-        "networkService": {
-          "description": "network name - internal ATT field",
-          "type": "string"
-        },
-        "possibleRootCause": {
-          "description": "Reserved for future use",
-          "type": "string"
-        },
-        "thresholdCrossingFieldsVersion": {
-          "description": "version of the thresholdCrossingAlertFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [
-        "additionalParameters",
-        "alertAction",
-        "alertDescription",
-        "alertType",
-        "collectionTimestamp",
-        "eventSeverity",
-        "eventStartTimestamp",
-        "thresholdCrossingFieldsVersion"
-      ]
-    },
-    "vendorNfNameFields": {
-      "description": "provides vendor, nf and nfModule identifying information",
-      "type": "object",
-      "properties": {
-        "vendorName": {
-          "description": "network function vendor name",
-          "type": "string"
-        },
-        "nfModuleName": {
-          "description": "name of the nfModule generating the event",
-          "type": "string"
-        },
-        "nfName": {
-          "description": "name of the network function generating the event",
-          "type": "string"
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "vendorName" ]
-    },
-    "voiceQualityFields": {
-      "description": "provides statistics related to customer facing voice products",
-      "type": "object",
-      "properties": {
-        "additionalInformation": { "$ref": "#/definitions/hashMap"},
-        "calleeSideCodec": {
-          "description": "callee codec for the call",
-          "type": "string"
-        },
-        "callerSideCodec": {
-          "description": "caller codec for the call",
-          "type": "string"
-        },
-        "correlator": {
-          "description": "this is the same for all events on this call",
-          "type": "string"
-        },
-        "endOfCallVqmSummaries": {
-          "$ref": "#/definitions/endOfCallVqmSummaries"
-        },
-        "phoneNumber": {
-          "description": "phone number associated with the correlator",
-          "type": "string"
-        },
-        "midCallRtcp": {
-          "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
-          "type": "string"
-        },
-        "vendorNfNameFields": {
-          "$ref": "#/definitions/vendorNfNameFields"
-        },
-        "voiceQualityFieldsVersion": {
-          "description": "version of the voiceQualityFields block",
-          "type": "string",
-          "enum": [ "4.0" ]
-        }
-      },
-      "additionalProperties": false,
-      "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp",
-        "vendorNfNameFields", "voiceQualityFieldsVersion" ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/mocks/pnfsimulator/json_schema/output_validator_ves_schema_30.0.1.json b/test/mocks/pnfsimulator/json_schema/output_validator_ves_schema_30.0.1.json
new file mode 100644 (file)
index 0000000..385ba25
--- /dev/null
@@ -0,0 +1,2432 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "VES Event Listener Common Event Format",
+    "type": "object",
+    "properties": {
+        "event": {"$ref": "#/definitions/event"},
+        "eventList": {"$ref": "#/definitions/eventList"}
+    },
+    
+    "definitions": {
+        "schemaHeaderBlock": {
+            "description": "schema date, version, author and associated API",
+            "type": "object",
+            "properties": {
+                "associatedApi": {
+                    "description": "VES Event Listener",
+                    "type": "string"
+                },
+                "lastUpdatedBy": {
+                    "description": "re2947",
+                    "type": "string"
+                },
+                "schemaDate": {
+                    "description": "July 31, 2018",
+                    "type": "string"
+                },
+                "schemaVersion": {
+                    "description": "30.0.1",
+                    "type": "number"
+                }
+            }
+        },
+        "schemaLicenseAndCopyrightNotice": {
+            "description": "Copyright (c) 2018, AT&T Intellectual Property.  All rights reserved",
+            "type": "object",
+            "properties": {
+                "apacheLicense2.0": {
+                    "description": "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:",
+                    "type": "string"
+                },
+                "licenseUrl": {
+                    "description": "http://www.apache.org/licenses/LICENSE-2.0",
+                    "type": "string"
+                },
+                "asIsClause": {
+                    "description": "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.",
+                    "type": "string"
+                },
+                "permissionsAndLimitations": {
+                    "description": "See the License for the specific language governing permissions and limitations under the License.",
+                    "type": "string"
+                }
+            }
+        },
+        "arrayOfJsonObject": {
+            "description": "array of json objects described by name, schema and other meta-information",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/jsonObject"
+            }
+        },
+        "arrayOfNamedHashMap": {
+            "description": "array of named hashMaps",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/namedHashMap"
+            }
+        },
+        "codecsInUse": {
+            "description": "number of times an identified codec was used over the measurementInterval",
+            "type": "object",
+            "properties": {
+                "codecIdentifier": { "type": "string" },
+                "numberInUse": { "type": "integer" }
+            },
+            "additionalProperties": false,
+            "required": [ "codecIdentifier", "numberInUse" ]
+        },
+        "commonEventHeader": {
+            "description": "fields common to all events",
+            "type": "object",
+            "properties": {
+                "domain": {
+                    "description": "the eventing domain associated with the event",
+                    "type": "string",
+                    "enum": [
+                        "fault",
+                        "heartbeat",
+                        "measurement",
+                        "mobileFlow",
+                        "notification",
+                        "other",
+                        "pnfRegistration",
+                        "sipSignaling",
+                        "stateChange",
+                        "syslog",
+                        "thresholdCrossingAlert",
+                        "voiceQuality"
+                    ]
+                },
+                "eventId": {
+                    "description": "event key that is unique to the event source",
+                    "type": "string"
+                },
+                "eventName": {
+                    "description": "unique event name",
+                    "type": "string"
+                },
+                "eventType": {
+                    "description": "for example - applicationNf, guestOS, hostOS, platform",
+                    "type": "string"
+                },
+                "internalHeaderFields": { "$ref": "#/definitions/internalHeaderFields" },
+                "lastEpochMicrosec": {
+                    "description": "the latest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
+                    "type": "number"
+                },
+                "nfcNamingCode": {
+                    "description": "3 character network function component type, aligned with vfc naming standards",
+                    "type": "string"
+                },
+                "nfNamingCode": {
+                    "description": "4 character network function type, aligned with nf naming standards",
+                    "type": "string"
+                },
+                "nfVendorName": {
+                    "description": "network function vendor name",
+                    "type": "string"
+                },
+                "priority": {
+                    "description": "processing priority",
+                    "type": "string",
+                    "enum": [
+                        "High",
+                        "Medium",
+                        "Normal",
+                        "Low"
+                    ]
+                },
+                "reportingEntityId": {
+                    "description": "UUID identifying the entity reporting the event, for example an OAM VM; must be populated by the ATT enrichment process",
+                    "type": "string"
+                },
+                "reportingEntityName": {
+                    "description": "name of the entity reporting the event, for example, an EMS name; may be the same as sourceName",
+                    "type": "string"
+                },
+                "sequence": {
+                    "description": "ordering of events communicated by an event source instance or 0 if not needed",
+                    "type": "integer"
+                },
+                "sourceId": {
+                    "description": "UUID identifying the entity experiencing the event issue; must be populated by the ATT enrichment process",
+                    "type": "string"
+                },
+                "sourceName": {
+                    "description": "name of the entity experiencing the event issue",
+                    "type": "string"
+                },
+                "startEpochMicrosec": {
+                    "description": "the earliest unix time aka epoch time associated with the event from any component--as microseconds elapsed since 1 Jan 1970 not including leap seconds",
+                    "type": "number"
+                },
+                "timeZoneOffset": {
+                    "description": "UTC offset for the local time zone of the device as UTC+/-hh.mm",
+                    "type": "string"
+                },
+                "version": {
+                    "description": "version of the event header",
+                    "type": "string",
+                    "enum": [ "4.0.1" ]
+                },
+                "vesEventListenerVersion": {
+                    "description": "version of the VES Event Listener API",
+                    "type": "string",
+                    "enum": [ "7.0.1" ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "domain", "eventId", "eventName", "lastEpochMicrosec", 
+                          "priority", "reportingEntityName", "sequence", "sourceName",
+                          "startEpochMicrosec", "version", "vesEventListenerVersion" ]
+        },
+        "counter": {
+            "description": "performance counter",
+            "type": "object",
+            "properties": {
+                "criticality": { "type": "string", "enum": [ "CRIT", "MAJ" ] },
+                "hashMap": { "$ref": "#/definitions/hashMap" },
+                "thresholdCrossed": { "type": "string" }
+            },
+            "additionalProperties": false,
+            "required": [ "criticality", "hashMap", "thresholdCrossed" ]
+        },
+        "cpuUsage": {
+            "description": "usage of an identified CPU",
+            "type": "object",
+            "properties": {
+                "cpuCapacityContention": { 
+                    "description": "the amount of time the CPU cannot run due to contention, in milliseconds over the measurementInterval",
+                    "type": "number" 
+                },
+                "cpuDemandAvg": { 
+                    "description": "the total CPU time that the NF/NFC/VM could use if there was no contention, in milliseconds over the measurementInterval",
+                    "type": "number" 
+                },
+                "cpuDemandMhz": { 
+                    "description": "CPU demand in megahertz",
+                    "type": "number" 
+                },
+                "cpuDemandPct": { 
+                    "description": "CPU demand as a percentage of the provisioned capacity",
+                    "type": "number" 
+                },
+                "cpuIdentifier": { 
+                    "description": "cpu identifer",
+                    "type": "string" 
+                },
+                "cpuIdle": { 
+                    "description": "percentage of CPU time spent in the idle task",
+                    "type": "number" 
+                },
+                "cpuLatencyAvg": { 
+                    "description": "percentage of time the VM is unable to run because it is contending for access to the physical CPUs",
+                    "type": "number" 
+                },
+                "cpuOverheadAvg": { 
+                    "description": "the overhead demand above available allocations and reservations, in milliseconds over the measurementInterval",
+                    "type": "number" 
+                },
+                "cpuSwapWaitTime": { 
+                    "description": "swap wait time. in milliseconds over the measurementInterval",
+                    "type": "number" 
+                },
+                "cpuUsageInterrupt": { 
+                    "description": "percentage of time spent servicing interrupts",
+                    "type": "number" 
+                },
+                "cpuUsageNice": { 
+                    "description": "percentage of time spent running user space processes that have been niced",
+                    "type": "number" 
+                },
+                "cpuUsageSoftIrq": { 
+                    "description": "percentage of time spent handling soft irq interrupts",
+                    "type": "number" 
+                },
+                "cpuUsageSteal": { 
+                    "description": "percentage of time spent in involuntary wait which is neither user, system or idle time and is effectively time that went missing",
+                    "type": "number" 
+                },
+                "cpuUsageSystem": { 
+                    "description": "percentage of time spent on system tasks running the kernel",
+                    "type": "number" 
+                },
+                "cpuUsageUser": { 
+                    "description": "percentage of time spent running un-niced user space processes",
+                    "type": "number" 
+                },
+                "cpuWait": { 
+                    "description": "percentage of CPU time spent waiting for I/O operations to complete",
+                    "type": "number" 
+                },
+                "percentUsage": { 
+                    "description": "aggregate cpu usage of the virtual machine on which the xNFC reporting the event is running",
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "cpuIdentifier", "percentUsage" ]
+        },
+        "diskUsage": {
+            "description": "usage of an identified disk",
+            "type": "object",
+            "properties": {
+                "diskBusResets": {
+                    "description": "number of bus resets over the measurementInterval",
+                    "type": "number"
+                },
+                "diskCommandsAborted": {
+                    "description": "number of disk commands aborted over the measurementInterval",
+                    "type": "number"
+                },
+                "diskCommandsAvg": {
+                    "description": "average number of commands per second over the measurementInterval",
+                    "type": "number"
+                },
+                "diskFlushRequests": {
+                    "description": "total flush requests of the disk cache over the measurementInterval",
+                    "type": "number"
+                },
+                "diskFlushTime": {
+                    "description": "milliseconds spent on disk cache flushing over the measurementInterval",
+                    "type": "number"
+                },
+                "diskIdentifier": { 
+                    "description": "disk identifier", 
+                    "type": "string" 
+                },
+                "diskIoTimeAvg": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the average over the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeLast": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeMax": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskIoTimeMin": {
+                    "description": "milliseconds spent doing input/output operations over 1 sec; treat this metric as a device load percentage where 1000ms  matches 100% load; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadAvg": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadLast": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadMax": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedReadMin": {
+                    "description": "number of logical read operations that were merged into physical read operations, e.g., two logical reads were served by one physical disk access; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteAvg": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteLast": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the last value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteMax": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the maximum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskMergedWriteMin": {
+                    "description": "number of logical write operations that were merged into physical write operations, e.g., two logical writes were served by one physical disk access; provide the minimum value measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadAvg": {
+                    "description": "number of octets per second read from a disk or partition; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadLast": {
+                    "description": "number of octets per second read from a disk or partition; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadMax": {
+                    "description": "number of octets per second read from a disk or partition; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsReadMin": {
+                    "description": "number of octets per second read from a disk or partition; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteAvg": {
+                    "description": "number of octets per second written to a disk or partition; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteLast": {
+                    "description": "number of octets per second written to a disk or partition; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteMax": {
+                    "description": "number of octets per second written to a disk or partition; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOctetsWriteMin": {
+                    "description": "number of octets per second written to a disk or partition; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadAvg": {
+                    "description": "number of read operations per second issued to the disk; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadLast": {
+                    "description": "number of read operations per second issued to the disk; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadMax": {
+                    "description": "number of read operations per second issued to the disk; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsReadMin": {
+                    "description": "number of read operations per second issued to the disk; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteAvg": {
+                    "description": "number of write operations per second issued to the disk; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteLast": {
+                    "description": "number of write operations per second issued to the disk; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteMax": {
+                    "description": "number of write operations per second issued to the disk; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskOpsWriteMin": {
+                    "description": "number of write operations per second issued to the disk; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsAvg": {
+                    "description": "queue size of pending I/O operations per second; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsLast": {
+                    "description": "queue size of pending I/O operations per second; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsMax": {
+                    "description": "queue size of pending I/O operations per second; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskPendingOperationsMin": {
+                    "description": "queue size of pending I/O operations per second; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskReadCommandsAvg": {
+                    "description": "average number of read commands issued per second to the disk over the measurementInterval",
+                    "type": "number"
+                },
+                "diskTime": {
+                    "description": "nanoseconds spent on disk cache reads/writes within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadAvg": {
+                    "description": "milliseconds a read operation took to complete; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadLast": {
+                    "description": "milliseconds a read operation took to complete; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadMax": {
+                    "description": "milliseconds a read operation took to complete; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeReadMin": {
+                    "description": "milliseconds a read operation took to complete; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteAvg": {
+                    "description": "milliseconds a write operation took to complete; provide the average measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteLast": {
+                    "description": "milliseconds a write operation took to complete; provide the last measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteMax": {
+                    "description": "milliseconds a write operation took to complete; provide the maximum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTimeWriteMin": {
+                    "description": "milliseconds a write operation took to complete; provide the minimum measurement within the measurement interval",
+                    "type": "number"
+                },
+                "diskTotalReadLatencyAvg": {
+                    "description": "average read time from the perspective of a Guest OS: sum of the Kernel Read Latency and Physical Device Read Latency in milliseconds over the measurement interval",
+                    "type": "number"
+                },
+                "diskTotalWriteLatencyAvg": {
+                    "description": "average write time from the perspective of a Guest OS: sum of the Kernel Write Latency and Physical Device Write Latency in milliseconds over the measurement interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeAvg": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the average within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeLast": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the last within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeMax": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the maximum within the collection interval",
+                    "type": "number"
+                },
+                "diskWeightedIoTimeMin": {
+                    "description": "measure in ms over 1 sec of both I/O completion time and the backlog that may be accumulating; value is the minimum within the collection interval",
+                    "type": "number"
+                },
+                "diskWriteCommandsAvg": {
+                    "description": "average number of write commands issued per second to the disk over the measurementInterval",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "diskIdentifier" ]
+        },
+        "endOfCallVqmSummaries": {
+            "description": "provides end of call voice quality metrics",
+            "type": "object",
+            "properties": {
+                "adjacencyName": {
+                    "description": " adjacency name",
+                    "type": "string"
+                },
+                "endpointAverageJitter": {
+                    "description": "endpoint average jitter",
+                    "type": "number"
+                },
+                "endpointDescription": {
+                    "description": "either Caller or Callee",
+                    "type": "string",
+                    "enum": ["Caller", "Callee"]
+                },
+                "endpointMaxJitter": {
+                    "description": "endpoint maximum jitter",
+                    "type": "number"
+                },
+                "endpointRtpOctetsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpOctetsLost": {
+                    "description": "endpoint RTP octets lost",
+                    "type": "number"
+                },
+                "endpointRtpOctetsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpOctetsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsLost": {
+                    "description": "endpoint RTP packets lost",
+                    "type": "number"
+                },
+                "endpointRtpPacketsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "endpointRtpPacketsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localAverageJitter": {
+                    "description": "Local average jitter",
+                    "type": "number"
+                },
+                "localAverageJitterBufferDelay": {
+                    "description": "Local average jitter delay",
+                    "type": "number"
+                },
+                "localMaxJitter": {
+                    "description": "Local maximum jitter",
+                    "type": "number"
+                },
+                "localMaxJitterBufferDelay": {
+                    "description": "Local maximum jitter delay",
+                    "type": "number"
+                },
+                "localRtpOctetsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpOctetsLost": {
+                    "description": "Local RTP octets lost",
+                    "type": "number"
+                },
+                "localRtpOctetsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpOctetsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsDiscarded": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsLost": {
+                    "description": "Local RTP packets lost",
+                    "type": "number"
+                },
+                "localRtpPacketsReceived": {
+                    "description": "",
+                    "type": "number"
+                },
+                "localRtpPacketsSent": {
+                    "description": "",
+                    "type": "number"
+                },
+                "mosCqe": {
+                    "description": "1-5 1dp",
+                    "type": "number"
+                },
+                "oneWayDelay": {
+                    "description": "one-way path delay in milliseconds",
+                    "type": "number"
+                },
+                "packetLossPercent": {
+                    "description" : "Calculated percentage packet loss based on Endpoint RTP packets lost (as reported in RTCP) and Local RTP packets sent. Direction is based on Endpoint description (Caller, Callee). Decimal (2 dp)",
+                    "type": "number"
+                },
+                "rFactor": {
+                    "description": "0-100",
+                    "type": "number"
+                },
+                "roundTripDelay": {
+                    "description": "millisecs",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "adjacencyName", "endpointDescription" ]
+        },
+        "event": {
+            "description": "the root level of the common event format",
+            "type": "object",
+            "properties": {
+                "commonEventHeader": { "$ref": "#/definitions/commonEventHeader" },
+                "faultFields": { "$ref": "#/definitions/faultFields" },
+                "heartbeatFields": { "$ref": "#/definitions/heartbeatFields" },
+                "measurementFields": { "$ref": "#/definitions/measurementFields" },
+                "mobileFlowFields": { "$ref": "#/definitions/mobileFlowFields" },
+                "notificationFields": { "$ref": "#/definitions/notificationFields" },
+                "otherFields": { "$ref": "#/definitions/otherFields" },
+                "pnfRegistrationFields": { "$ref": "#/definitions/pnfRegistrationFields" },
+                "sipSignalingFields": { "$ref": "#/definitions/sipSignalingFields" },
+                "stateChangeFields": { "$ref": "#/definitions/stateChangeFields" },
+                "syslogFields": { "$ref": "#/definitions/syslogFields" },
+                "thresholdCrossingAlertFields": { "$ref": "#/definitions/thresholdCrossingAlertFields" },
+                "voiceQualityFields": { "$ref": "#/definitions/voiceQualityFields" }
+            },
+            "additionalProperties": false,
+            "required": [ "commonEventHeader" ]
+        },
+        "eventList": {
+            "description": "array of events",
+            "type": "array",
+            "items": {
+                "$ref": "#/definitions/event"
+            }
+        },
+        "faultFields": {
+            "description": "fields specific to fault events",
+            "type": "object",
+            "properties": {
+                "alarmAdditionalInformation": { "$ref": "#/definitions/hashMap" },
+                "alarmCondition": {
+                    "description": "alarm condition reported by the device",
+                    "type": "string"
+                },
+                "alarmInterfaceA": {
+                    "description": "card, port, channel or interface name of the device generating the alarm",
+                    "type": "string"
+                },
+                "eventCategory": {
+                    "description": "Event category, for example: license, link, routing, security, signaling",
+                    "type": "string"
+                },
+                "eventSeverity": {
+                    "description": "event severity",
+                    "type": "string",
+                    "enum": [
+                        "CRITICAL",
+                        "MAJOR",
+                        "MINOR",
+                        "WARNING",
+                        "NORMAL"
+                    ]
+                },
+                "eventSourceType": {
+                    "description": "type of event source; examples: card, host, other, port, portThreshold, router, slotThreshold, switch, virtualMachine, virtualNetworkFunction",
+                    "type": "string"
+                },
+                "faultFieldsVersion": {
+                    "description": "version of the faultFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                },
+                "specificProblem": {
+                    "description": "short description of the alarm or problem",
+                    "type": "string"
+                },
+                "vfStatus": {
+                    "description": "virtual function status enumeration",
+                    "type": "string",
+                    "enum": [
+                        "Active",
+                        "Idle",
+                        "Preparing to terminate",
+                        "Ready to terminate",
+                        "Requesting termination"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "alarmCondition", "eventSeverity", "eventSourceType",
+                          "faultFieldsVersion", "specificProblem", "vfStatus" ]
+        },
+        "filesystemUsage": {
+            "description": "disk usage of an identified virtual machine in gigabytes and/or gigabytes per second",
+            "type": "object",
+            "properties": {
+                "blockConfigured": { "type": "number" },
+                "blockIops": { "type": "number" },
+                "blockUsed": { "type": "number" },
+                "ephemeralConfigured": { "type": "number" },
+                "ephemeralIops": { "type": "number" },
+                "ephemeralUsed": { "type": "number" },
+                "filesystemName": { "type": "string" }
+            },
+            "additionalProperties": false,
+            "required": [ "blockConfigured", "blockIops", "blockUsed", "ephemeralConfigured",
+                          "ephemeralIops", "ephemeralUsed", "filesystemName" ]
+        },
+        "gtpPerFlowMetrics": {
+            "description": "Mobility GTP Protocol per flow metrics",
+            "type": "object",
+            "properties": {
+                "avgBitErrorRate": {
+                    "description": "average bit error rate",
+                    "type": "number"
+                },
+                "avgPacketDelayVariation": {
+                    "description": "Average packet delay variation or jitter in milliseconds for received packets: Average difference between the packet timestamp and time received for all pairs of consecutive packets",
+                    "type": "number"
+                },
+                "avgPacketLatency": {
+                    "description": "average delivery latency",
+                    "type": "number"
+                },
+                "avgReceiveThroughput": {
+                    "description": "average receive throughput",
+                    "type": "number"
+                },
+                "avgTransmitThroughput": {
+                    "description": "average transmit throughput",
+                    "type": "number"
+                },
+                "durConnectionFailedStatus": {
+                    "description": "duration of failed state in milliseconds, computed as the cumulative time between a failed echo request and the next following successful error request, over this reporting interval",
+                    "type": "number"
+                },
+                "durTunnelFailedStatus": {
+                    "description": "Duration of errored state, computed as the cumulative time between a tunnel error indicator and the next following non-errored indicator, over this reporting interval",
+                    "type": "number"
+                },
+                "flowActivatedBy": {
+                    "description": "Endpoint activating the flow",
+                    "type": "string"
+                },
+                "flowActivationEpoch": {
+                    "description": "Time the connection is activated in the flow (connection) being reported on, or transmission time of the first packet if activation time is not available",
+                    "type": "number"
+                },
+                "flowActivationMicrosec": {
+                    "description": "Integer microseconds for the start of the flow connection",
+                    "type": "number"
+                },
+                "flowActivationTime": {
+                    "description": "time the connection is activated in the flow being reported on, or transmission time of the first packet if activation time is not available; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "flowDeactivatedBy": {
+                    "description": "Endpoint deactivating the flow",
+                    "type": "string"
+                },
+                "flowDeactivationEpoch": {
+                    "description": "Time for the start of the flow connection, in integer UTC epoch time aka UNIX time",
+                    "type": "number"
+                },
+                "flowDeactivationMicrosec": {
+                    "description": "Integer microseconds for the start of the flow connection",
+                    "type": "number"
+                },
+                "flowDeactivationTime": {
+                    "description": "Transmission time of the first packet in the flow connection being reported on; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "flowStatus": {
+                    "description": "connection status at reporting time as a working / inactive / failed indicator value",
+                    "type": "string"
+                },
+                "gtpConnectionStatus": {
+                    "description": "Current connection state at reporting time",
+                    "type": "string"
+                },
+                "gtpTunnelStatus": {
+                    "description": "Current tunnel state  at reporting time",
+                    "type": "string"
+                },
+                "ipTosCountList": { "$ref": "#/definitions/hashMap" },
+                "ipTosList": {
+                    "description": "Array of unique IP Type-of-Service values observed in the flow where values range from '0' to '255'",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "largePacketRtt": {
+                    "description": "large packet round trip time",
+                    "type": "number"
+                },
+                "largePacketThreshold": {
+                    "description": "large packet threshold being applied",
+                    "type": "number"
+                },
+                "maxPacketDelayVariation": {
+                    "description": "Maximum packet delay variation or jitter in milliseconds for received packets: Maximum of the difference between the packet timestamp and time received for all pairs of consecutive packets",
+                    "type": "number"
+                },
+                "maxReceiveBitRate": {
+                    "description": "maximum receive bit rate",
+                    "type": "number"
+                },
+                "maxTransmitBitRate": {
+                    "description": "maximum transmit bit rate",
+                    "type": "number"
+                },
+                "mobileQciCosCountList": { "$ref": "#/definitions/hashMap" },
+                "mobileQciCosList": {
+                    "description": "Array of unique LTE QCI or UMTS class-of-service values observed in the flow",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "numActivationFailures": {
+                    "description": "Number of failed activation requests, as observed by the reporting node",
+                    "type": "number"
+                },
+                "numBitErrors": {
+                    "description": "number of errored bits",
+                    "type": "number"
+                },
+                "numBytesReceived": {
+                    "description": "number of bytes received, including retransmissions",
+                    "type": "number"
+                },
+                "numBytesTransmitted": {
+                    "description": "number of bytes transmitted, including retransmissions",
+                    "type": "number"
+                },
+                "numDroppedPackets": {
+                    "description": "number of received packets dropped due to errors per virtual interface",
+                    "type": "number"
+                },
+                "numGtpEchoFailures": {
+                    "description": "Number of Echo request path failures where failed paths are defined in 3GPP TS 29.281 sec 7.2.1 and 3GPP TS 29.060 sec. 11.2",
+                    "type": "number"
+                },
+                "numGtpTunnelErrors": {
+                    "description": "Number of tunnel error indications where errors are defined in 3GPP TS 29.281 sec 7.3.1 and 3GPP TS 29.060 sec. 11.1",
+                    "type": "number"
+                },
+                "numHttpErrors": {
+                    "description": "Http error count",
+                    "type": "number"
+                },
+                "numL7BytesReceived": {
+                    "description": "number of tunneled layer 7 bytes received, including retransmissions",
+                    "type": "number"
+                },
+                "numL7BytesTransmitted": {
+                    "description": "number of tunneled layer 7 bytes transmitted, excluding retransmissions",
+                    "type": "number"
+                },
+                "numLostPackets": {
+                    "description": "number of lost packets",
+                    "type": "number"
+                },
+                "numOutOfOrderPackets": {
+                    "description": "number of out-of-order packets",
+                    "type": "number"
+                },
+                "numPacketErrors": {
+                    "description": "number of errored packets",
+                    "type": "number"
+                },
+                "numPacketsReceivedExclRetrans": {
+                    "description": "number of packets received, excluding retransmission",
+                    "type": "number"
+                },
+                "numPacketsReceivedInclRetrans": {
+                    "description": "number of packets received, including retransmission",
+                    "type": "number"
+                },
+                "numPacketsTransmittedInclRetrans": {
+                    "description": "number of packets transmitted, including retransmissions",
+                    "type": "number"
+                },
+                "numRetries": {
+                    "description": "number of packet retries",
+                    "type": "number"
+                },
+                "numTimeouts": {
+                    "description": "number of packet timeouts",
+                    "type": "number"
+                },
+                "numTunneledL7BytesReceived": {
+                    "description": "number of tunneled layer 7 bytes received, excluding retransmissions",
+                    "type": "number"
+                },
+                "roundTripTime": {
+                    "description": "round trip time",
+                    "type": "number"
+                },
+                "tcpFlagCountList": { "$ref": "#/definitions/hashMap" },
+                "tcpFlagList": {
+                    "description": "Array of unique TCP Flags observed in the flow",
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "timeToFirstByte": {
+                    "description": "Time in milliseconds between the connection activation and first byte received",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "avgBitErrorRate", "avgPacketDelayVariation", "avgPacketLatency",
+                          "avgReceiveThroughput", "avgTransmitThroughput",
+                          "flowActivationEpoch", "flowActivationMicrosec",
+                          "flowDeactivationEpoch", "flowDeactivationMicrosec",
+                          "flowDeactivationTime", "flowStatus",
+                          "maxPacketDelayVariation", "numActivationFailures",
+                          "numBitErrors", "numBytesReceived", "numBytesTransmitted",
+                          "numDroppedPackets", "numL7BytesReceived",
+                          "numL7BytesTransmitted", "numLostPackets",
+                          "numOutOfOrderPackets", "numPacketErrors",
+                          "numPacketsReceivedExclRetrans",
+                          "numPacketsReceivedInclRetrans",
+                          "numPacketsTransmittedInclRetrans",
+                          "numRetries", "numTimeouts", "numTunneledL7BytesReceived",
+                          "roundTripTime", "timeToFirstByte"
+            ]
+        },
+        "hashMap": {
+            "description": "an associative array which is an array of key:value pairs",
+            "type": "object",
+            "additionalProperties": { "type": "string" },
+            "default": {}
+        },
+        "heartbeatFields": {
+            "description": "optional field block for fields specific to heartbeat events",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "heartbeatFieldsVersion": {
+                    "description": "version of the heartbeatFields block",
+                    "type": "string",
+                    "enum": [ "3.0" ]
+                },
+                "heartbeatInterval": {
+                    "description": "current heartbeat interval in seconds",
+                    "type": "integer"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "heartbeatFieldsVersion", "heartbeatInterval" ]
+        },
+        "hugePages": {
+            "description": "metrics on system hugepages",
+            "type": "object",
+            "properties": {
+                "bytesFree": { 
+                    "description": "number of free hugepages in bytes", 
+                    "type": "number" 
+                },
+                "bytesUsed": { 
+                    "description": "number of used hugepages in bytes", 
+                    "type": "number" 
+                },
+                "hugePagesIdentifier": { 
+                    "description": "hugePages identifier", 
+                    "type": "number" 
+                },
+                "percentFree": { 
+                    "description": "number of free hugepages in percent", 
+                    "type": "number" 
+                },
+                "percentUsed": { 
+                    "description": "number of free hugepages in percent", 
+                    "type": "number" 
+                },
+                "vmPageNumberFree": { 
+                    "description": "number of free vmPages in numbers", 
+                    "type": "number" 
+                },
+                "vmPageNumberUsed": { 
+                    "description": "number of used vmPages in numbers", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "hugePagesIdentifier" ]
+        },
+        "internalHeaderFields": {
+            "description": "enrichment fields for internal VES Event Listener service use only, not supplied by event sources",
+            "type": "object"
+        },
+        "ipmi": {
+            "description": "intelligent platform management interface metrics",
+            "type": "object",
+            "properties": {
+                "exitAirTemperature": { 
+                    "description": "system fan exit air flow temperature in celsius", 
+                    "type": "number" 
+                },
+                "frontPanelTemperature": { 
+                    "description": "front panel temperature in celsius", 
+                    "type": "number" 
+                },
+                "ioModuleTemperature": { 
+                    "description": "io module temperature in celsius", 
+                    "type": "number" 
+                },
+                "ipmiBaseboardTemperatureArray": { 
+                    "description": "array of ipmiBaseboardTemperature objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBaseboardTemperature"  
+                    }                   
+                },
+                "ipmiBaseboardVoltageRegulatorArray": { 
+                    "description": "array of ipmiBaseboardVoltageRegulator objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBaseboardVoltageRegulator"  
+                    }                   
+                },
+                "ipmiBatteryArray": { 
+                    "description": "array of ipmiBattery objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiBattery"  
+                    }                   
+                },
+                "ipmiFanArray": { 
+                    "description": "array of ipmiFan objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiFan"  
+                    }                   
+                },
+                "ipmiHsbpArray": { 
+                    "description": "array of ipmiHsbp objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiHsbp"  
+                    }                   
+                },
+                "ipmiGlobalAggregateTemperatureMarginArray": { 
+                    "description": "array of ipmiGlobalAggregateTemperatureMargin objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiGlobalAggregateTemperatureMargin"  
+                    }                   
+                },
+                "ipmiNicArray": { 
+                    "description": "array of ipmiNic objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiNic"  
+                    }                   
+                },
+                "ipmiPowerSupplyArray": { 
+                    "description": "array of ipmiPowerSupply objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiPowerSupply"  
+                    }                   
+                },
+                "ipmiProcessorArray": { 
+                    "description": "array of ipmiProcessor objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/ipmiProcessor"  
+                    }                   
+                },
+                "systemAirflow": { 
+                    "description": "airfflow in cubic feet per minute (cfm)", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false
+        },
+        "ipmiBaseboardTemperature": {
+            "description": "intelligent platform management interface (ipmi) baseboard temperature metrics",
+            "type": "object",
+            "properties": {
+                "baseboardTemperatureIdentifier": { 
+                    "description": "identifier for the location where the temperature is taken", 
+                    "type": "string" 
+                },
+                "baseboardTemperature": { 
+                    "description": "baseboard temperature in celsius", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "baseboardTemperatureIdentifier" ]
+        },
+        "ipmiBaseboardVoltageRegulator": {
+            "description": "intelligent platform management interface (ipmi) baseboard voltage regulator metrics",
+            "type": "object",
+            "properties": {
+                "baseboardVoltageRegulatorIdentifier": { 
+                    "description": "identifier for the baseboard voltage regulator", 
+                    "type": "string" 
+                },
+                "voltageRegulatorTemperature": { 
+                    "description": "voltage regulator temperature in celsius", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "baseboardVoltageRegulatorIdentifier" ]
+        },
+        "ipmiBattery": {
+            "description": "intelligent platform management interface (ipmi) battery metrics",
+            "type": "object",
+            "properties": {
+                "batteryIdentifier": { 
+                    "description": "identifier for the battery", 
+                    "type": "string" 
+                },
+                "batteryType": { 
+                    "description": "type of battery", 
+                    "type": "string" 
+                },
+                "batteryVoltageLevel": { 
+                    "description": "battery voltage level", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "batteryIdentifier" ]
+        },
+        "ipmiFan": {
+            "description": "intelligent platform management interface (ipmi) fan metrics",
+            "type": "object",
+            "properties": {
+                "fanIdentifier": { 
+                    "description": "identifier for the fan", 
+                    "type": "string" 
+                },
+                "fanSpeed": { 
+                    "description": "fan speed in revolutions per minute (rpm)", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "fanIdentifier" ]
+        },
+        "ipmiGlobalAggregateTemperatureMargin": {
+            "description": "intelligent platform management interface (ipmi) global aggregate temperature margin",
+            "type": "object",
+            "properties": {
+                "ipmiGlobalAggregateTemperatureMarginIdentifier": { 
+                    "description": "identifier for the ipmi global aggregate temperature margin metrics", 
+                    "type": "string" 
+                },
+                "globalAggregateTemperatureMargin": { 
+                    "description": "the difference between the current global aggregate temperature, in celsius, and the global aggregate throttling thermal trip point", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "ipmiGlobalAggregateTemperatureMarginIdentifier", "globalAggregateTemperatureMargin" ]
+        },
+        "ipmiHsbp": {
+            "description": "intelligent platform management interface (ipmi) hot swap backplane power metrics",
+            "type": "object",
+            "properties": {
+                "hsbpIdentifier": { 
+                    "description": "identifier for the hot swap backplane power unit", 
+                    "type": "string" 
+                },
+                "hsbpTemperature": { 
+                    "description": "hot swap backplane power temperature in celsius", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "hsbpIdentifier" ]
+        },
+        "ipmiNic": {
+            "description": "intelligent platform management interface (ipmi) network interface control card (nic) metrics",
+            "type": "object",
+            "properties": {
+                "nicIdentifier": { 
+                    "description": "identifier for the network interface control card", 
+                    "type": "string" 
+                },
+                "nicTemperature": { 
+                    "description": "nic temperature in celsius", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "nicIdentifier" ]
+        },
+        "ipmiPowerSupply": {
+            "description": "intelligent platform management interface (ipmi) power supply metrics",
+            "type": "object",
+            "properties": {
+                "powerSupplyIdentifier": { 
+                    "description": "identifier for the power supply", 
+                    "type": "string" 
+                },
+                "powerSupplyInputPower": { 
+                    "description": "input power in watts", 
+                    "type": "number" 
+                },
+                "powerSupplyCurrentOutputPercent": { 
+                    "description": "current output voltage as a percentage of the design specified level", 
+                    "type": "number" 
+                },
+                "powerSupplyTemperature": { 
+                    "description": "power supply temperature in celsius", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "powerSupplyIdentifier" ]
+        },
+        "ipmiProcessor": {
+            "description": "intelligent platform management interface processor metrics",
+            "type": "object",
+            "properties": {
+                "processorIdentifier": { 
+                    "description": "identifier for an ipmi processor", 
+                    "type": "string" 
+                },
+                "processorThermalControlPercent": { 
+                    "description": "io module temperature in celsius", 
+                    "type": "number" 
+                },
+                "processorDtsThermalMargin": { 
+                    "description": "front panel temperature in celsius", 
+                    "type": "number" 
+                },
+                "processorDimmAggregateThermalMarginArray": { 
+                    "description": "array of processorDimmAggregateThermalMargin objects", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/processorDimmAggregateThermalMargin"  
+                    }                   
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "processorIdentifier" ]
+        },
+        "jsonObject": {
+            "description": "json object schema, name and other meta-information along with one or more object instances",
+            "type": "object",
+            "properties": {
+                "objectInstances":  {
+                    "description": "one or more instances of the jsonObject", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/jsonObjectInstance"  
+                    }                   
+                },
+                "objectName":  {
+                    "description": "name of the JSON Object", 
+                    "type": "string" 
+                },
+                "objectSchema":  {
+                    "description": "json schema for the object", 
+                    "type": "string" 
+                },
+                "objectSchemaUrl":  {
+                    "description": "Url to the json schema for the object", 
+                    "type": "string" 
+                },
+                "nfSubscribedObjectName":  {
+                    "description": "name of the object associated with the nfSubscriptonId", 
+                    "type": "string" 
+                },
+                "nfSubscriptionId":  {
+                    "description": "identifies an openConfig telemetry subscription on a network function, which configures the network function to send complex object data associated with the jsonObject", 
+                    "type": "string" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "objectInstances", "objectName" ]
+        },
+        "jsonObjectInstance": {
+            "description": "meta-information about an instance of a jsonObject along with the actual object instance",
+            "type": "object",
+            "properties": {
+                "jsonObject": { "$ref": "#/definitions/jsonObject" },
+                "objectInstance":  {
+                    "description": "an instance conforming to the jsonObject objectSchema", 
+                    "type": "object" 
+                },
+                "objectInstanceEpochMicrosec":  {
+                    "description": "the unix time aka epoch time associated with this objectInstance--as microseconds elapsed since 1 Jan 1970 not including leap seconds", 
+                    "type": "number" 
+                },
+                "objectKeys":  {
+                    "description": "an ordered set of keys that identifies this particular instance of jsonObject", 
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/key"
+                    }                   
+                }
+            },
+            "additionalProperties": false
+        },
+        "key": {
+            "description": "tuple which provides the name of a key along with its value and relative order",
+            "type": "object",
+            "properties": {
+                "keyName": { 
+                    "description": "name of the key", 
+                    "type": "string" 
+                },
+                "keyOrder": { 
+                    "description": "relative sequence or order of the key with respect to other keys", 
+                    "type": "integer" 
+                },
+                "keyValue": { 
+                    "description": "value of the key", 
+                    "type": "string" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "keyName" ]
+        },
+        "latencyBucketMeasure": {
+            "description": "number of counts falling within a defined latency bucket",
+            "type": "object",
+            "properties": {
+                "countsInTheBucket": { "type": "number" },
+                "highEndOfLatencyBucket": { "type": "number" },
+                "lowEndOfLatencyBucket":  { "type": "number" }
+            },
+            "additionalProperties": false,
+            "required": [ "countsInTheBucket" ]
+        },
+        "load": {
+            "description": "/proc/loadavg cpu utilization and io utilization metrics",
+            "type": "object",
+            "properties": {
+                "longTerm": { 
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 15 minutes using /proc/loadavg", 
+                    "type": "number" 
+                },
+                "midTerm": { 
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 5 minutes using /proc/loadavg", 
+                    "type": "number" 
+                },
+                "shortTerm": { 
+                    "description": "number of jobs in the run queue (state R, cpu utilization) or waiting for disk I/O (state D, io utilization) averaged over 1 minute using /proc/loadavg", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false
+        },
+        "machineCheckException": {
+            "description": "metrics on vm machine check exceptions",
+            "type": "object",
+            "properties": {
+                "correctedMemoryErrors": {
+                    "description": "total hardware errors that were corrected by the hardware (e.g. data corruption corrected via Â ECC) over the measurementInterval",
+                    "type": "number"
+                },
+                "correctedMemoryErrorsIn1Hr": {
+                    "description": "total hardware errors that were corrected by the hardware over the last one hour",
+                    "type": "number"
+                },
+                "uncorrectedMemoryErrors": {
+                    "description": "total uncorrected hardware errors that were detected by the hardware (e.g., causing data corruption) over the measurementInterval",
+                    "type": "number"
+                },
+                "uncorrectedMemoryErrorsIn1Hr": {
+                    "description": "total uncorrected hardware errors that were detected by the hardware over the last one hour",
+                    "type": "number"
+                },
+                "vmIdentifier": { 
+                    "description": "virtual machine identifier associated with the machine check exception", 
+                    "type": "string" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "vmIdentifier" ]
+        },
+        "measurementFields": {
+            "description": "measurement fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "additionalMeasurements": {"$ref": "#/definitions/arrayOfNamedHashMap"},
+                "additionalObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
+                "codecUsageArray": {
+                    "description": "array of codecs in use",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/codecsInUse"
+                    }
+                },
+                "concurrentSessions": {
+                    "description": "peak concurrent sessions for the VM or xNF over the measurementInterval",
+                    "type": "integer"
+                },
+                "configuredEntities": {
+                    "description": "over the measurementInterval, peak total number of: users, subscribers, devices, adjacencies, etc., for the VM, or subscribers, devices, etc., for the xNF",
+                    "type": "integer"
+                },
+                "cpuUsageArray": {
+                    "description": "usage of an array of CPUs",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/cpuUsage"
+                    }
+                },
+                "diskUsageArray": {
+                    "description": "usage of an array of disks",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/diskUsage"
+                    }
+                },
+                "featureUsageArray": { "$ref": "#/definitions/hashMap" },
+                "filesystemUsageArray": {
+                    "description": "filesystem usage of the VM on which the xNFC reporting the event is running",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/filesystemUsage"
+                    }
+                },
+                "hugePagesArray": {
+                    "description": "array of metrics on hugepPages",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/hugePages"
+                    }
+                },
+                "ipmi": { "$ref": "#/definitions/ipmi" },
+                "latencyDistribution": {
+                    "description": "array of integers representing counts of requests whose latency in milliseconds falls within per-xNF configured ranges",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/latencyBucketMeasure"
+                    }
+                },
+                "loadArray": {
+                    "description": "array of system load metrics",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/load"
+                    }
+                },
+                "machineCheckExceptionArray": {
+                    "description": "array of machine check exceptions",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/machineCheckException"
+                    }
+                },
+                "meanRequestLatency": {
+                    "description": "mean seconds required to respond to each request for the VM on which the xNFC reporting the event is running",
+                    "type": "number"
+                },
+                "measurementInterval": {
+                    "description": "interval over which measurements are being reported in seconds",
+                    "type": "number"
+                },
+                "measurementFieldsVersion": {
+                    "description": "version of the measurementFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                },
+                "memoryUsageArray": {
+                    "description": "memory usage of an array of VMs",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/memoryUsage"
+                    }
+                },
+                "numberOfMediaPortsInUse": {
+                    "description": "number of media ports in use",
+                    "type": "integer"
+                },
+                "requestRate": {
+                    "description": "peak rate of service requests per second to the xNF over the measurementInterval",
+                    "type": "number"
+                },
+                "nfcScalingMetric": {
+                    "description": "represents busy-ness of the network function from 0 to 100 as reported by the xNFC",
+                    "type": "integer"
+                },
+                "nicPerformanceArray": {
+                    "description": "usage of an array of network interface cards",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/nicPerformance"
+                    }
+                },
+                "processStatsArray": {
+                    "description": "array of metrics on system processes",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/processStats"
+                    }
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "measurementInterval", "measurementFieldsVersion" ]
+        },
+        "memoryUsage": {
+            "description": "memory usage of an identified virtual machine",
+            "type": "object",
+            "properties": {
+                "memoryBuffered": { 
+                    "description": "kibibytes of temporary storage for raw disk blocks", 
+                    "type": "number" 
+                },
+                "memoryCached": { 
+                    "description": "kibibytes of memory used for cache", 
+                    "type": "number" 
+                },
+                "memoryConfigured": { 
+                    "description": "kibibytes of memory configured in the virtual machine on which the xNFC reporting the event is running", 
+                    "type": "number" 
+                },
+                "memoryDemand": { 
+                    "description": "host demand in kibibytes", 
+                    "type": "number" 
+                },
+                "memoryFree": { 
+                    "description": "kibibytes of physical RAM left unused by the system", 
+                    "type": "number" 
+                },
+                "memoryLatencyAvg": { 
+                    "description": "Percentage of time the VM is waiting to access swapped or compressed memory", 
+                    "type": "number" 
+                },
+                "memorySharedAvg": { 
+                    "description": "shared memory in kilobytes", 
+                    "type": "number" 
+                },
+                "memorySlabRecl": { 
+                    "description": "the part of the slab that can be reclaimed such as caches measured in kibibytes", 
+                    "type": "number" 
+                },
+                "memorySlabUnrecl": { 
+                    "description": "the part of the slab that cannot be reclaimed even when lacking memory measured in kibibytes", 
+                    "type": "number" 
+                },
+                "memorySwapInAvg": { 
+                    "description": "Amount of memory swapped-in from host cache in kibibytes", 
+                    "type": "number" 
+                },
+                "memorySwapInRateAvg": { 
+                    "description": "rate at which memory is swapped from disk into active memory during the interval in kilobytes per second", 
+                    "type": "number" 
+                },
+                "memorySwapOutAvg": { 
+                    "description": "Amount of memory swapped-out to host cache in kibibytes", 
+                    "type": "number" 
+                },
+                "memorySwapOutRateAvg": { 
+                    "description": "rate at which memory is being swapped from active memory to disk during the current interval in kilobytes per second", 
+                    "type": "number" 
+                },
+                "memorySwapUsedAvg": { 
+                    "description": "space used for caching swapped pages in the host cache in kibibytes", 
+                    "type": "number" 
+                },
+                "memoryUsed": { 
+                    "description": "total memory minus the sum of free, buffered, cached and slab memory measured in kibibytes", 
+                    "type": "number" 
+                },
+                "percentMemoryUsage": { 
+                    "description": "Percentage of memory usage; value = (memoryUsed / (memoryUsed + memoryFree) x 100 if denomintor is nonzero, or 0, if otherwise", 
+                    "type": "number" 
+                },
+                "vmIdentifier": { 
+                    "description": "virtual machine identifier associated with the memory metrics", 
+                    "type": "string" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "memoryFree", "memoryUsed", "vmIdentifier" ]
+        },
+        "mobileFlowFields": {
+            "description": "mobileFlow fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "applicationType": {
+                    "description": "Application type inferred",
+                    "type": "string"
+                },
+                "appProtocolType": {
+                    "description": "application protocol",
+                    "type": "string"
+                },
+                "appProtocolVersion": {
+                    "description": "application protocol version",
+                    "type": "string"
+                },
+                "cid": {
+                    "description": "cell id",
+                    "type": "string"
+                },
+                "connectionType": {
+                    "description": "Abbreviation referencing a 3GPP reference point e.g., S1-U, S11, etc",
+                    "type": "string"
+                },
+                "ecgi": {
+                    "description": "Evolved Cell Global Id",
+                    "type": "string"
+                },
+                "flowDirection": {
+                    "description": "Flow direction, indicating if the reporting node is the source of the flow or destination for the flow",
+                    "type": "string"
+                },
+                "gtpPerFlowMetrics": { "$ref": "#/definitions/gtpPerFlowMetrics" },
+                "gtpProtocolType": {
+                    "description": "GTP protocol",
+                    "type": "string"
+                },
+                "gtpVersion": {
+                    "description": "GTP protocol version",
+                    "type": "string"
+                },
+                "httpHeader": {
+                    "description": "HTTP request header, if the flow connects to a node referenced by HTTP",
+                    "type": "string"
+                },
+                "imei": {
+                    "description": "IMEI for the subscriber UE used in this flow, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "imsi": {
+                    "description": "IMSI for the subscriber UE used in this flow, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "ipProtocolType": {
+                    "description": "IP protocol type e.g., TCP, UDP, RTP...",
+                    "type": "string"
+                },
+                "ipVersion": {
+                    "description": "IP protocol version e.g., IPv4, IPv6",
+                    "type": "string"
+                },
+                "lac": {
+                    "description": "location area code",
+                    "type": "string"
+                },
+                "mcc": {
+                    "description": "mobile country code",
+                    "type": "string"
+                },
+                "mnc": {
+                    "description": "mobile network code",
+                    "type": "string"
+                },
+                "mobileFlowFieldsVersion": {
+                    "description": "version of the mobileFlowFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                },
+                "msisdn": {
+                    "description": "MSISDN for the subscriber UE used in this flow, as an integer, if the flow connects to a mobile device",
+                    "type": "string"
+                },
+                "otherEndpointIpAddress": {
+                    "description": "IP address for the other endpoint, as used for the flow being reported on",
+                    "type": "string"
+                },
+                "otherEndpointPort": {
+                    "description": "IP Port for the reporting entity, as used for the flow being reported on",
+                    "type": "integer"
+                },
+                "otherFunctionalRole": {
+                    "description": "Functional role of the other endpoint for the flow being reported on e.g., MME, S-GW, P-GW, PCRF...",
+                    "type": "string"
+                },
+                "rac": {
+                    "description": "routing area code",
+                    "type": "string"
+                },
+                "radioAccessTechnology": {
+                    "description": "Radio Access Technology e.g., 2G, 3G, LTE",
+                    "type": "string"
+                },
+                "reportingEndpointIpAddr": {
+                    "description": "IP address for the reporting entity, as used for the flow being reported on",
+                    "type": "string"
+                },
+                "reportingEndpointPort": {
+                    "description": "IP port for the reporting entity, as used for the flow being reported on",
+                    "type": "integer"
+                },
+                "sac": {
+                    "description": "service area code",
+                    "type": "string"
+                },
+                "samplingAlgorithm": {
+                    "description": "Integer identifier for the sampling algorithm or rule being applied in calculating the flow metrics if metrics are calculated based on a sample of packets, or 0 if no sampling is applied",
+                    "type": "integer"
+                },
+                "tac": {
+                    "description": "transport area code",
+                    "type": "string"
+                },
+                "tunnelId": {
+                    "description": "tunnel identifier",
+                    "type": "string"
+                },
+                "vlanId": {
+                    "description": "VLAN identifier used by this flow",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "flowDirection", "gtpPerFlowMetrics", "ipProtocolType", "ipVersion",
+                          "mobileFlowFieldsVersion", "otherEndpointIpAddress", "otherEndpointPort",
+                          "reportingEndpointIpAddr", "reportingEndpointPort" ]
+        },
+        "namedHashMap": {
+            "description": "a hashMap which is associated with and described by a name",
+            "type": "object",
+            "properties": {
+                "name":  { "type": "string" },
+                "hashMap": { "$ref": "#/definitions/hashMap" }
+            },
+            "additionalProperties": false,
+            "required": [ "name", "hashMap" ]
+        },
+        "nicPerformance": {
+            "description": "describes the performance and errors of an identified network interface card",
+            "type": "object",
+            "properties": {
+                "administrativeState": {
+                    "description": "administrative state",
+                    "type": "string",
+                    "enum": [ "inService", "outOfService" ]
+                },
+                "nicIdentifier": {
+                    "description": "nic identification",
+                    "type": "string"
+                },
+                "operationalState": {
+                    "description": "operational state",
+                    "type": "string",
+                    "enum": [ "inService", "outOfService" ]
+                },
+                "receivedBroadcastPacketsAccumulated": {
+                    "description": "Cumulative count of broadcast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedBroadcastPacketsDelta": {
+                    "description": "Count of broadcast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedDiscardedPacketsAccumulated": {
+                    "description": "Cumulative count of discarded packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedDiscardedPacketsDelta": {
+                    "description": "Count of discarded packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedErrorPacketsAccumulated": {
+                    "description": "Cumulative count of error packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedErrorPacketsDelta": {
+                    "description": "Count of error packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedMulticastPacketsAccumulated": {
+                    "description": "Cumulative count of multicast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedMulticastPacketsDelta": {
+                    "description": "Count of multicast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedOctetsAccumulated": {
+                    "description": "Cumulative count of octets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedOctetsDelta": {
+                    "description": "Count of octets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedTotalPacketsAccumulated": {
+                    "description": "Cumulative count of all packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedPercentDiscard": {
+                    "description": "Percentage of discarded packets received; value = (receivedDiscardedPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "receivedPercentError": {
+                    "description": "Percentage of error packets received; value = (receivedErrorPacketsDelta / receivedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise.",
+                    "type": "number"
+                },
+                "receivedTotalPacketsDelta": {
+                    "description": "Count of all packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedUnicastPacketsAccumulated": {
+                    "description": "Cumulative count of unicast packets received as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "receivedUnicastPacketsDelta": {
+                    "description": "Count of unicast packets received within the measurement interval",
+                    "type": "number"
+                },
+                "receivedUtilization": {
+                    "description": "Percentage of utilization received; value = (receivedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "speed": {
+                    "description": "Speed configured in mbps",
+                    "type": "number"
+                },
+                "transmittedBroadcastPacketsAccumulated": {
+                    "description": "Cumulative count of broadcast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedBroadcastPacketsDelta": {
+                    "description": "Count of broadcast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedDiscardedPacketsAccumulated": {
+                    "description": "Cumulative count of discarded packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedDiscardedPacketsDelta": {
+                    "description": "Count of discarded packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedErrorPacketsAccumulated": {
+                    "description": "Cumulative count of error packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedErrorPacketsDelta": {
+                    "description": "Count of error packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedMulticastPacketsAccumulated": {
+                    "description": "Cumulative count of multicast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedMulticastPacketsDelta": {
+                    "description": "Count of multicast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedOctetsAccumulated": {
+                    "description": "Cumulative count of octets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedOctetsDelta": {
+                    "description": "Count of octets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedTotalPacketsAccumulated": {
+                    "description": "Cumulative count of all packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedTotalPacketsDelta": {
+                    "description": "Count of all packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedUnicastPacketsAccumulated": {
+                    "description": "Cumulative count of unicast packets transmitted as read at the end of the measurement interval",
+                    "type": "number"
+                },
+                "transmittedUnicastPacketsDelta": {
+                    "description": "Count of unicast packets transmitted within the measurement interval",
+                    "type": "number"
+                },
+                "transmittedPercentDiscard": {
+                    "description": "Percentage of discarded packets transmitted; value = (transmittedDiscardedPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "transmittedPercentError": {
+                    "description": "Percentage of error packets received; value = (transmittedErrorPacketsDelta / transmittedTotalPacketsDelta) x 100, if denominator is nonzero, or 0, if otherwise",
+                    "type": "number"
+                },
+                "transmittedUtilization": {
+                    "description": "Percentage of utilization transmitted; value = (transmittedOctetsDelta / (speed x (lastEpochMicrosec - startEpochMicrosec))) x 100, if denominator is nonzero, or 0, if otherwise.",
+                    "type": "number"
+                },
+                "valuesAreSuspect": {
+                    "description": "Indicates whether vNicPerformance values are likely inaccurate due to counter overflow or other condtions",
+                    "type": "string",
+                    "enum": [ "true", "false" ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "nicIdentifier", "valuesAreSuspect" ]
+        },
+        "notificationFields": {
+            "description": "notification fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
+                "changeContact": {
+                    "description": "identifier for a contact related to the change",
+                    "type": "string"
+                },
+                "changeIdentifier": {
+                    "description": "system or session identifier associated with the change",
+                    "type": "string"
+                },
+                "changeType": {
+                    "description": "describes what has changed for the entity",
+                    "type": "string"
+                },
+                "newState": {
+                    "description": "new state of the entity",
+                    "type": "string"
+                },
+                "oldState": {
+                    "description": "previous state of the entity",
+                    "type": "string"
+                },
+                "notificationFieldsVersion": {
+                    "description": "version of the notificationFields block",
+                    "type": "string",
+                    "enum": [ "2.0" ]
+                },
+                "stateInterface": {
+                    "description": "card or port name of the entity that changed state",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "changeIdentifier", "changeType", "notificationFieldsVersion" ]
+        },
+        "otherFields": {
+            "description": "fields for events belonging to the 'other' domain of the commonEventHeader domain enumeration",
+            "type": "object",
+            "properties": {
+                "arrayOfNamedHashMap": {"$ref": "#/definitions/arrayOfNamedHashMap"},
+                "hashMap": {"$ref": "#/definitions/hashMap"},               
+                "jsonObjects": {"$ref": "#/definitions/arrayOfJsonObject"},
+                "otherFieldsVersion": {
+                    "description": "version of the otherFields block",
+                    "type": "string",
+                    "enum": [ "3.0" ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "otherFieldsVersion" ]
+        },
+        "pnfRegistrationFields": {
+            "description": "hardware device registration fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "lastServiceDate": {
+                    "description": "TS 32.692 dateOfLastService = date of last service; e.g. 15022017",
+                    "type": "string"
+                },
+                "macAddress": {
+                    "description": "MAC address of OAM interface of the unit",
+                    "type": "string"
+                },
+                "manufactureDate": {
+                    "description": "TS 32.692 dateOfManufacture = manufacture date of the unit; 24032016",
+                    "type": "string"
+                },
+                "modelNumber": {
+                    "description": "TS 32.692 versionNumber = version of the unit from vendor; e.g. AJ02.  Maps to AAI equip-model",
+                    "type": "string"
+                },
+                "oamV4IpAddress": {
+                    "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
+                    "type": "string"
+                },
+                "oamV6IpAddress": {
+                    "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
+                    "type": "string"
+                },
+                "pnfRegistrationFieldsVersion": {
+                    "description": "version of the pnfRegistrationFields block",
+                    "type": "string",
+                    "enum": [ "2.0" ]
+                },
+                "serialNumber": {
+                    "description": "TS 32.692 serialNumber = serial number of the unit; e.g. 6061ZW3",
+                    "type": "string"
+                },
+                "softwareVersion": {
+                    "description": "TS 32.692 swName = active SW running on the unit; e.g. 5gDUv18.05.201",
+                    "type": "string"
+                },
+                "unitFamily": {
+                    "description": "TS 32.692 vendorUnitFamilyType = general type of HW unit; e.g. BBU",
+                    "type": "string"
+                },
+                "unitType": {
+                    "description": "TS 32.692 vendorUnitTypeNumber = vendor name for the unit; e.g. Airscale",
+                    "type": "string"
+                },
+                "vendorName": {
+                    "description": "TS 32.692 vendorName = name of manufacturer; e.g. Nokia. Maps to AAI equip-vendor",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "pnfRegistrationFieldsVersion" ]
+        },
+        "processorDimmAggregateThermalMargin": {
+            "description": "intelligent platform management interface (ipmi) processor dual inline memory module aggregate thermal margin metrics",
+            "type": "object",
+            "properties": {
+                "processorDimmAggregateThermalMarginIdentifier": { 
+                    "description": "identifier for the aggregate thermal margin metrics from the processor dual inline memory module", 
+                    "type": "string" 
+                },
+                "thermalMargin": { 
+                    "description": "the difference between the DIMM's current temperature, in celsius, and the DIMM's throttling thermal trip point", 
+                    "type": "number" 
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "processorDimmAggregateThermalMarginIdentifier", "thermalMargin" ]
+        },
+        "processStats": {
+            "description": "metrics on system processes",
+            "type": "object",
+            "properties": {
+                "forkRate": {
+                    "description": "the number of threads created since the last reboot",
+                    "type": "number"
+                },
+                "processIdentifier": {
+                    "description": "processIdentifier",
+                    "type": "string"
+                },
+                "psStateBlocked": {
+                    "description": "the number of processes in a blocked state",
+                    "type": "number"
+                },
+                "psStatePaging": {
+                    "description": "the number of processes in a paging state",
+                    "type": "number"
+                },
+                "psStateRunning": {
+                    "description": "the number of processes in a running state",
+                    "type": "number"
+                },
+                "psStateSleeping": {
+                    "description": "the number of processes in a sleeping state",
+                    "type": "number"
+                },
+                "psStateStopped": {
+                    "description": "the number of processes in a stopped state",
+                    "type": "number"
+                },
+                "psStateZombie": {
+                    "description": "the number of processes in a zombie state",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "processIdentifier" ]
+        },
+        "requestError": {
+            "description": "standard request error data structure",
+            "type": "object",
+            "properties": {
+                "messageId": {
+                    "description": "Unique message identifier of the format ABCnnnn where ABC is either SVC for Service Exceptions or POL for Policy Exception",
+                    "type": "string"
+                },
+                "text": {
+                    "description": "Message text, with replacement variables marked with %n, where n is an index into the list of <variables> elements, starting at 1",
+                    "type": "string"
+                },
+                "url": {
+                    "description": "Hyperlink to a detailed error resource e.g., an HTML page for browser user agents",
+                    "type": "string"
+                },
+                "variables": {
+                    "description": "List of zero or more strings that represent the contents of the variables used by the message text",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "messageId", "text" ]
+        },
+        "sipSignalingFields": {
+            "description": "sip signaling fields",
+            "type": "object",
+            "properties": {
+                "additionalInformation": { "$ref": "#/definitions/hashMap"},
+                "compressedSip": {
+                    "description": "the full SIP request/response including headers and bodies",
+                    "type": "string"
+                },
+                "correlator": {
+                    "description": "this is the same for all events on this call",
+                    "type": "string"
+                },
+                "localIpAddress": {
+                    "description": "IP address on xNF",
+                    "type": "string"
+                },
+                "localPort": {
+                    "description": "port on xNF",
+                    "type": "string"
+                },
+                "remoteIpAddress": {
+                    "description": "IP address of peer endpoint",
+                    "type": "string"
+                },
+                "remotePort": {
+                    "description": "port of peer endpoint",
+                    "type": "string"
+                },
+                "sipSignalingFieldsVersion": {
+                    "description": "version of the sipSignalingFields block",
+                    "type": "string",
+                    "enum": [ "3.0" ]
+                },
+                "summarySip": {
+                    "description": "the SIP Method or Response ('INVITE', '200 OK', 'BYE', etc)",
+                    "type": "string"
+                },
+                "vendorNfNameFields": {
+                    "$ref": "#/definitions/vendorNfNameFields"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "correlator", "localIpAddress", "localPort", "remoteIpAddress", 
+                          "remotePort", "sipSignalingFieldsVersion", "vendorNfNameFields" ]
+        },
+        "stateChangeFields": {
+            "description": "stateChange fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "newState": {
+                    "description": "new state of the entity",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "maintenance",
+                        "outOfService"
+                    ]
+                },
+                "oldState": {
+                    "description": "previous state of the entity",
+                    "type": "string",
+                    "enum": [
+                        "inService",
+                        "maintenance",
+                        "outOfService"
+                    ]
+                },
+                "stateChangeFieldsVersion": {
+                    "description": "version of the stateChangeFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                },
+                "stateInterface": {
+                    "description": "card or port name of the entity that changed state",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "newState", "oldState", "stateChangeFieldsVersion", "stateInterface" ]
+        },
+        "syslogFields": {
+            "description": "sysLog fields",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap" },
+                "eventSourceHost": {
+                    "description": "hostname of the device",
+                    "type": "string"
+                },
+                "eventSourceType": {
+                    "description": "type of event source; examples: other, router, switch, host, card, port, slotThreshold, portThreshold, virtualMachine, virtualNetworkFunction",
+                    "type": "string"
+                },
+                "syslogFacility": {
+                    "description": "numeric code from 0 to 23 for facility--see table in documentation",
+                    "type": "integer"
+                },
+                "syslogFieldsVersion": {
+                    "description": "version of the syslogFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                },
+                "syslogMsg": {
+                    "description": "syslog message",
+                    "type": "string"
+                },
+                "syslogMsgHost": {
+                    "description": "hostname parsed from non-VES syslog message",
+                    "type": "string"
+                },
+                "syslogPri": {
+                    "description": "0-192 combined severity and facility",
+                    "type": "integer"
+                },
+                "syslogProc": {
+                    "description": "identifies the application that originated the message",
+                    "type": "string"
+                },
+                "syslogProcId": {
+                    "description": "a change in the value of this field indicates a discontinuity in syslog reporting",
+                    "type": "number"
+                },
+                "syslogSData": {
+                    "description": "syslog structured data consisting of a structured data Id followed by a set of key value pairs",
+                    "type": "string"
+                },
+                "syslogSdId": {
+                    "description": "0-32 char in format name@number for example ourSDID@32473",
+                    "type": "string"
+                },
+                "syslogSev": {
+                    "description": "numerical Code for  severity derived from syslogPri as remaider of syslogPri / 8",
+                    "type": "string",
+                    "enum": [
+                        "Alert",
+                        "Critical",
+                        "Debug",
+                        "Emergency",
+                        "Error",
+                        "Info",
+                        "Notice",
+                        "Warning"
+                    ]
+                },
+                "syslogTag": {
+                    "description": "msgId indicating the type of message such as TCPOUT or TCPIN; NILVALUE should be used when no other value can be provided",
+                    "type": "string"
+                },
+                "syslogTs": {
+                    "description": "timestamp parsed from non-VES syslog message",
+                    "type": "string"
+                },
+                "syslogVer": {
+                    "description": "IANA assigned version of the syslog protocol specification - typically 1",
+                    "type": "number"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "eventSourceType", "syslogFieldsVersion", "syslogMsg", "syslogTag" ]
+        },
+        "thresholdCrossingAlertFields": {
+            "description": "fields specific to threshold crossing alert events",
+            "type": "object",
+            "properties": {
+                "additionalFields": { "$ref": "#/definitions/hashMap"},
+                "additionalParameters": {
+                    "description": "performance counters",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/counter"
+                    }
+                },
+                "alertAction": {
+                    "description": "Event action",
+                    "type": "string",
+                    "enum": [
+                        "CLEAR",
+                        "CONT",
+                        "SET"
+                    ]
+                },
+                "alertDescription": {
+                    "description": "Unique short alert description such as IF-SHUB-ERRDROP",
+                    "type": "string"
+                },
+                "alertType": {
+                    "description": "Event type",
+                    "type": "string",
+                    "enum": [
+                        "CARD-ANOMALY",
+                        "ELEMENT-ANOMALY",
+                        "INTERFACE-ANOMALY",
+                        "SERVICE-ANOMALY"
+                    ]
+                },
+                "alertValue": {
+                    "description": "Calculated API value (if applicable)",
+                    "type": "string"
+                },
+                "associatedAlertIdList": {
+                    "description": "List of eventIds associated with the event being reported",
+                    "type": "array",
+                    "items": { "type": "string" }
+                },
+                "collectionTimestamp": {
+                    "description": "Time when the performance collector picked up the data; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "dataCollector": {
+                    "description": "Specific performance collector instance used",
+                    "type": "string"
+                },
+                "elementType": {
+                    "description": "type of network element - internal ATT field",
+                    "type": "string"
+                },
+                "eventSeverity": {
+                    "description": "event severity or priority",
+                    "type": "string",
+                    "enum": [
+                        "CRITICAL",
+                        "MAJOR",
+                        "MINOR",
+                        "WARNING",
+                        "NORMAL"
+                    ]
+                },
+                "eventStartTimestamp": {
+                    "description": "Time closest to when the measurement was made; with RFC 2822 compliant format: Sat, 13 Mar 2010 11:29:05 -0800",
+                    "type": "string"
+                },
+                "interfaceName": {
+                    "description": "Physical or logical port or card (if applicable)",
+                    "type": "string"
+                },
+                "networkService": {
+                    "description": "network name - internal ATT field",
+                    "type": "string"
+                },
+                "possibleRootCause": {
+                    "description": "Reserved for future use",
+                    "type": "string"
+                },
+                "thresholdCrossingFieldsVersion": {
+                    "description": "version of the thresholdCrossingAlertFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "additionalParameters",
+                "alertAction",
+                "alertDescription",
+                "alertType",
+                "collectionTimestamp",
+                "eventSeverity",
+                "eventStartTimestamp",
+                "thresholdCrossingFieldsVersion"
+            ]
+        },
+        "vendorNfNameFields": {
+            "description": "provides vendor, nf and nfModule identifying information",
+            "type": "object",
+            "properties": {
+                "vendorName": {
+                    "description": "network function vendor name",
+                    "type": "string"
+                },
+                "nfModuleName": {
+                    "description": "name of the nfModule generating the event",
+                    "type": "string"
+                },
+                "nfName": {
+                    "description": "name of the network function generating the event",
+                    "type": "string"
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "vendorName" ]
+        },
+        "voiceQualityFields": {
+            "description": "provides statistics related to customer facing voice products",
+            "type": "object",
+            "properties": {
+                "additionalInformation": { "$ref": "#/definitions/hashMap"},
+                "calleeSideCodec": {
+                    "description": "callee codec for the call",
+                    "type": "string"
+                },
+                "callerSideCodec": {
+                    "description": "caller codec for the call",
+                    "type": "string"
+                },
+                "correlator": {
+                    "description": "this is the same for all events on this call",
+                    "type": "string"
+                },
+                "endOfCallVqmSummaries": {
+                    "$ref": "#/definitions/endOfCallVqmSummaries"
+                },
+                "phoneNumber": {
+                    "description": "phone number associated with the correlator",
+                    "type": "string"
+                },
+                "midCallRtcp": {
+                    "description": "Base64 encoding of the binary RTCP data excluding Eth/IP/UDP headers",
+                    "type": "string"
+                },
+                "vendorNfNameFields": {
+                    "$ref": "#/definitions/vendorNfNameFields"
+                },
+                "voiceQualityFieldsVersion": {
+                    "description": "version of the voiceQualityFields block",
+                    "type": "string",
+                    "enum": [ "4.0" ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [ "calleeSideCodec", "callerSideCodec", "correlator", "midCallRtcp",
+                          "vendorNfNameFields", "voiceQualityFieldsVersion" ]
+        }
+    }
+}
\ No newline at end of file
index 42dc8e8..3948644 100644 (file)
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SimulatorFactory {
 
-    private static final String DEFAULT_OUTPUT_SCHEMA_PATH = "json_schema/output_validator.json";
+    private static final String DEFAULT_OUTPUT_SCHEMA_PATH = "json_schema/output_validator_ves_schema_30.0.1.json";
 
     private MessageProvider messageProvider;
     private JSONValidator validator;
diff --git a/test/mocks/pnfsimulator/ssh/ssh_host_rsa_key b/test/mocks/pnfsimulator/ssh/ssh_host_rsa_key
new file mode 100644 (file)
index 0000000..1a3c49e
--- /dev/null
@@ -0,0 +1,54 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,242034B2C46EE5D70C6017C29024CFAE
+
+33cZKnNILWwb7Xlw4sQLEWp5w72vS8znQr/T4Hd7mCxoxrTJM0Cm3oNM6zK92kMp
+tXtJiT/Mpz6zmlUrKwhcESk+4ovNHGkzVCyYQfofkb5jyYHT92HXA8H1Qd1oyKBA
+8DUDFdFqlW2EZS7joDrU/ImpWkAI4gysbhg40QUeWbjlO/gyzii7/gu6AgZ3RF8l
+hKu4600kk7m3xa28GqMm53k2TVlgAI7JBiFH/aTxeHhntjpO2NRwtQ+YQlx8DveH
+CXw1+RhfWa2CtBPosstuAza+8NPRreIclUjMBKz7FDWIucnMbBhLCoyZyCRctYy5
+exzIkjQ3Uacz0aV9GTNvmJ4HiratKPPsMzCVggk6bxQy+DfvcYdoP/Z8vsLvhCkg
+usOWh5EUDI918rPwwA6O9fZce8QJHp/SY29m5JboafWN9raUMd0Szdc3DcNYK0oR
+04dF7FZuRhrBY8c0xPJV99K9091Hnr9gJU+0dst6naw6z/X5ZXra+pBIPEAFkRdy
+eZLAr9sKsjEhEb+jY1T/PI2sfR1B9dygCZW/nqrpqHKqjxZ034R9AmrpSRiwb8BJ
+1omLjh49J6ys7ibmYk3pC+c4ry1vLlpg9Gr7pD0TJo3F8k826D4pPEzA70X7rVoD
+vZRg+TUKQ9cbECF8+/AuwA+vi12qU4vUPvgdQYl9EgrSpNdNN9St/C6RsNKK8I4D
+vPD2MN8gfxSJrQn/FyZlcujDX0MoX6NbsKKLkUdH/3FnAnjH9wZUCrE+SZFOZkT5
+uki7fa/+6Lc5M5s4v4Qi438lTJD9/PQUJ//WtNMQjZLM3rwgg68syJBZ/WoqqqLw
+585rAORYgXcHH62Vp71yUCwnwVvnPMOkjes01gGluZaCGVZptNRwE38GqED8nGGt
+dOpY7A59BlZAryeXN0UwI5ki6KIG/BeRrNULdkniTYp7zbod+Ac9cDBv1Aczzv04
+rAKlzJ5Ac/ROrqcHb3dJwdNMZA3hLWBRAHw4EtYRyyrn1WHNIKUJJivn3to7h+I5
+7dMQpWSWJ8MFCDBNN0RPmXECZVzwAKjHcGcq4YOZAKOzcHE5u+1GmtjiOhcvsisy
+5xelkqKKwcu+uY6CmlItaxNvyt4tLkS8BsbFDovx44CwDb6YzUkuw8KKPFjGp+H1
+qkqw/Iqqw9f5d8pcK8f5kZWnQOTYEadQvpSz0o8Qod4Kk98HyWl45/83YxK/SV1A
+yaQftzYw8WTpbBC164hKIQamyuZ6CIv8inAIaHs/zFIYNlDtriNDqt+uh/0WPe1b
+Y/7aA6I0cU1DggoXgU8irxHKVfll2Mk9r0wB1lvqvBU/LA6XPh6Crcc6iN+nQAtE
+YXWEdPV0n9mnOug1h+LiU4P5LmShkkm4+Bo3TBOjS3gGz7bzu7d8rWp8S+VUBcKM
+fa0sivE6CC24WMJXGxqs4YhC+3OIGjA2z7vfaLANBCWBycIM6TwtF3MgpX9hSIbL
+mFX7SFTHd/QCOAK930nXp/fpe78RBebyabyJ5tiOoXBQWyVGvqmXroGj6ajWojZT
+QMn8FuQQ+QpbKgFZCxgsQmkLelslcVUpvcqK26FC5t5+FoAfAzmzbVLdTVycAa77
+QDxkcaCgfIJAV/JbHfAZHJaoK2ZM8/xaygpDhRqjgIraCELMcyQR0V3pn3dgTahd
+ynZHxLMzeyyX700kyJEaG1DvA4s4io+C3naRg5te5sH6rgy/Zvq1ldA95husA3rf
+1LGEWnrudsm8mxJo3EfstiBJXltHxrG+kM99PDk3+c+eRAn0iSpFUeMn+2sWZRSZ
+6o7sRoBVAY6wRxi1qBftAnw9FLyhZhpz6Jp33DT3j8L8vD4il9zdv5gU4FZsdT8T
+B+d3/c2wIEuFYQCIrW/A+QVqEastChUexfNMenuj28QySifAXWjiVV8CifseG/OI
+hSn6+EfMVyK00DJEqjUeXH5Om3jxkfY+oldpx+HafITxqcvUsFVDSsP+CZPzhEz5
+HNidv0mH6eDmRwB+Nb1HoYFNdvnotrLotvdLr53POu/q3IM6Co8VAxkHU4cY68a9
+hCrhrTY2HH5kasjvoanf/DbLrj+vwTRvH4MDSOu4a5Wdm3LRjyHgP3RuhbGq61eq
+7MZT1UASPJVFGUe9KlxZDKhJQ8ccvzGkGU5yJdxao27hRDnBaR2l72PCawT5ntgf
+hEmMLmw17g848MET/2jMvbNyyOx9pKlfMv/AJBBU4knGSBDBYnETdocvbwkbVJSe
+4EDu/K+mOCF5dllEgGTCPTazvYBlbgWi+lZtq6eAYLiN4arJ+ScALFSMh+zSwwvM
+xt5RnpSxw1yV2pHlGsQjg9yw9XQX7wEjKeMGjTwiLFAMbwWYJvF6Z6ZmI2LWaS5O
+AmXm/JkHdE8JQzAZwnqZOOpcEB3y8D/vACEBHUMafbkBGHRvFOIcHfB/ozfEyIym
+E5Mo6OWtRTbnpPo0seH4Kx9UY+BvG1Run3fYxcPQqaA7H4jLO1eOZSOfiiOzM8Jf
+l+QrKomqizmyUTUiikC/9memJDz/nqdm7w0r4Zq9UqY0E74OkpYLyspoWVM8Cj4k
+61wPtYXRrJ70UbvVnhX2pMnxRMH6BkU6+SCSzhbo9sNHgP0VtVhXrijTPJJY8Kap
+3hUkQvVlb1Gdl7DeeeJmYGOLxYGjfmj6UcflqXZzorm43E0djw/sCtBc76FFOpsB
+8R8F/ArtsSGsw+KJqK5Uyf+2LzL9BNdv80EiRKkubJ8+ODdRrBMNCT/hPRY7iACX
+UEudm5DA0Ai5NOyUDV7kVyW9C7SFaXoMtG0NO7TL5cBZ63uFpsoBrk+Y4tepgVIx
++8beinOJSBAu7HlTyj4eS2L+TQbPIf7j+UwPh2FKNvloVeXku3IUtyRjfcRlWpct
+5sjAXvtc+elSAVVoX9J1fAltepsRG9sd9iFTNTpiOC6nrvWuVz8jrbCitFuvKYnm
+tD5bqRmGLkqYrwz+MSkA7cFCE50F5WPXVkRxp/bZ1ds+fh/Ymx9UwlsUqgRpHsGb
+ZhpJZALukr2YDGw4mSyTtRE9uhGW7+YFSHp1TL6wEUHAT5GwqrY2MioZ2Da6vVYD
+SZv+uusSWHjaiJpkuoqOOnPfdFDse8Khc4xBsOMLgAc86wfjZtD3gWBcDkRdD81C
+-----END RSA PRIVATE KEY-----
diff --git a/test/mocks/pnfsimulator/ssh/ssh_host_rsa_key.pub b/test/mocks/pnfsimulator/ssh/ssh_host_rsa_key.pub
new file mode 100644 (file)
index 0000000..6193335
--- /dev/null
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCiZJaJfjmjnaJqHTcYG8DkrU1Mr7WAmGR70QVd4mDxmM5vPm26nOv3uDO0sSwjP/sDGyVzlaxwlnfBfVZwJbMMf6sEPMNCLvBSwT4E6vf9rKwXqUIzj8hZuvOd7RPp241Z29CkL6aep6QNSk3NOlu4mxGMv+WJwyoDq8ya+ePEXQgl5QipabAmXFOKk1x15z9tcs9Dw5JvKkCpjpJ7zAd9tkmuiramS9OlETy8BJ0QkMj3ucNuqDsUkUzvKnnWHVcykmacJY3v3D9S4BoqLc1XZTVB4oRg0GlOCqOMQeVLP/jxtzVYiK5EsHbC55qhC9i8IaaSyeN66hgWwIh6FHhPMHr40vRKyliZGK0aBP+paS0V1PvNUW9+sb3ZDB/7mu/0yp06yGpqJAAFRQCZzNqiWbbQy1s/+HQbtUwVr7gnY2jhhAv8bcBPwTtIctg/rO/WDWJJsLzuFnb7fGkFL+EqAt0qozDSL5bDzJgylg00Y6GM1ebvBluNE+71n1TigInlIvKWHKtrAtiHQwXLOS/v3aEoepgJKiwABvYXiB2QNXqxkbrnFoT4+byhmakG3SVmDCDUlbQoDJpKLekwt5dezSuDNdFeC1TxUahfsBcOOG1TOxrsCKJU+ZoMXVXsouAAshpWiSZGZR2imXFLcRfDV5FI2bRZPv+WADzuzsfkJw==
\ No newline at end of file
index e6eedbc..0b338ab 100644 (file)
@@ -24,8 +24,9 @@ onap/clamp,3.0-STAGING-latest
 onap/cli,2.0.2
 onap/data-router,1.2.2
 onap/dmaap/buscontroller,1.0.12
-onap/dmaap/dmaap-mr,1.1.5
-onap/externalapi/nbi,2.0.0
+onap/dmaap/dmaap-mr,1.1.6
+onap/dmaap/kafka01101,0.0.1
+onap/externalapi/nbi,3.0.0-latest
 onap/gizmo,1.2.1
 onap/holmes/engine-management,1.2.0-STAGING-latest
 onap/holmes/rule-management,1.2.0-STAGING-latest
@@ -42,8 +43,8 @@ onap/music/cassandra_music,3.0.0
 onap/music/music,2.5.3
 onap/music/prom,1.0.5-latest
 onap/oom/kube2msb,1.1.0
-onap/optf-has,1.1.1
-onap/optf-osdf,1.1.1
+onap/optf-has,1.2.1-STAGING-latest
+onap/optf-osdf,1.2.1-STAGING-latest
 onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0
 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
@@ -86,11 +87,11 @@ onap/sdnc-ueb-listener-image,1.4-STAGING-latest
 onap/search-data-service,1.2.2
 onap/sniroemulator,1.0.0
 onap/so/api-handler-infra,1.3.0-STAGING-latest
-onap/so/asdc-controller,1.3.0-STAGING-latest
 onap/so/bpmn-infra,1.3.0-STAGING-latest
 onap/so/catalog-db-adapter,1.3.0-STAGING-latest
 onap/so/openstack-adapter,1.3.0-STAGING-latest
 onap/so/request-db-adapter,1.3.0-STAGING-latest
+onap/so/sdc-controller,1.3.0-STAGING-latest
 onap/so/sdnc-adapter,1.3.0-STAGING-latest
 onap/so/vfc-adapter,1.3.0-STAGING-latest
 onap/sparky-be,1.2.1
index 40baea2..9e11233 100644 (file)
@@ -25,7 +25,7 @@ onap/cli,2.0.2
 onap/data-router,1.2.2
 onap/dmaap/buscontroller,1.0.12
 onap/dmaap/dmaap-mr,1.1.4
-onap/externalapi/nbi,2.0.0
+onap/externalapi/nbi,2.1.1
 onap/gizmo,1.2.1
 onap/holmes/engine-management,1.1.0
 onap/holmes/rule-management,1.1.0