Merge "Update INFO.yaml file"
authorGary Wu <gary.i.wu@huawei.com>
Fri, 8 Mar 2019 02:42:49 +0000 (02:42 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 8 Mar 2019 02:42:49 +0000 (02:42 +0000)
40 files changed:
.gitignore
INFO.yaml
deployment/heat/onap-oom/env/tlab/onap-oom.env
deployment/heat/onap-oom/env/windriver/onap-oom-light.env
deployment/heat/onap-oom/env/windriver/onap-oom.env
test/mocks/mass-pnf-sim/.gitignore [new file with mode: 0644]
test/mocks/mass-pnf-sim/README.md [new file with mode: 0644]
test/mocks/mass-pnf-sim/ROP_file_creator.sh [new file with mode: 0755]
test/mocks/mass-pnf-sim/mass-pnf-sim.py [new file with mode: 0755]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl.conf [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/files/prepare-ROP-files.sh [new file with mode: 0755]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/input_validator.json [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh [new file with mode: 0755]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/dfc.crt [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.crt [new file with mode: 0644]
test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.key [new file with mode: 0644]
test/mocks/mass-pnf-sim/requirements.txt [new file with mode: 0644]
test/mocks/mass-pnf-sim/setup.sh [new file with mode: 0755]
test/mocks/mass-pnf-sim/templates/file_template.xml.gz [new file with mode: 0644]
test/mocks/pnfsimulator/docker-compose.yml
test/mocks/pnfsimulator/json_schema/input_validator.json
test/mocks/pnfsimulator/netopeer_tls_cfg/entrypoint.sh [new file with mode: 0755]
test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.data [new file with mode: 0644]
test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.yang [new file with mode: 0644]
test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem [new file with mode: 0644]
test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem.pub [new file with mode: 0644]
test/mocks/pnfsimulator/netopeer_tls_cfg/update_tls.sh [new file with mode: 0755]
test/mocks/sniroemulator/pom.xml
test/mocks/sniroemulator/src/main/docker/Dockerfile
version-manifest/src/main/resources/docker-manifest-staging.csv
version-manifest/src/main/resources/docker-manifest.csv
version-manifest/src/main/resources/java-manifest.csv

index e5b53d8..e6ef23d 100644 (file)
@@ -14,7 +14,6 @@ env.properties
 *.jar
 *.zip
 *.tar
-*.gz
 *.log
 .vagrant
 *~
index b50e6df..8dde2ba 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -144,3 +144,9 @@ committers:
       timezone: 'Poland/Wroclaw'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
+    changes:
+        - type: 'Addition'
+          name: 'Brian Freeman'
+          name: 'Mariusz Wagner'
+          link: 'https://wiki.onap.org/display/DW/TSC+2019-02-21'
+
index a54a798..43b6ed1 100644 (file)
@@ -23,6 +23,7 @@ parameters:
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       flavor: large
       appcUsername: "appc@appc.onap.org"
       appcPassword: "demo123456!"
@@ -45,12 +46,14 @@ parameters:
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
-      so-openstack-adapter:
+      enabled: true
+      so-catalog-db-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
@@ -62,10 +65,12 @@ parameters:
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
     aai:
+      enabled: true
       liveness:
         initialDelaySeconds: 120
       aai-data-router:
@@ -78,6 +83,7 @@ parameters:
         liveness:
           initialDelaySeconds: 120
     portal:
+      enabled: true
       global:
         portalHostName: "__portal_hostname__"
       portal-mariadb:
@@ -91,5 +97,49 @@ parameters:
           dmaapBcHostName: "__portal_hostname__"
           msbHostName: "__portal_hostname__"
     vid:
+      enabled: true
       config:
         portalhost: "__portal_hostname__"
+
+    aaf:
+      enabled: true
+    cassandra:
+      enabled: true
+    clamp:
+      enabled: true
+    cli:
+      enabled: true
+    consul:
+      enabled: true
+    contrib:
+      enabled: true
+    dcaegen2:
+      enabled: true
+    dmaap:
+      enabled: true
+    esr:
+      enabled: true
+    log:
+      enabled: true
+    sniro-emulator:
+      enabled: true
+    oof:
+      enabled: true
+    msb:
+      enabled: true
+    multicloud:
+      enabled: true
+    nbi:
+      enabled: true
+    policy:
+      enabled: true
+    pomba:
+      enabled: true
+    sdc:
+      enabled: true
+    uui:
+      enabled: true
+    vfc:
+      enabled: true
+    vnfsdk:
+      enabled: true
\ No newline at end of file
index 4ded3df..c3f6159 100644 (file)
@@ -18,6 +18,7 @@ parameters:
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       openStackKeyStoneUrl: "http://10.12.25.2:5000"
       openStackPublicNetId: "__public_net_id__"
       openStackTenantId: "${OS_PROJECT_ID}"
@@ -36,15 +37,19 @@ parameters:
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
-      config:
-        openStackUserName: "${OS_USERNAME}"
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+      enabled: true
+      so-catalog-db-adapter:
+        config:
+          openStackUserName: "${OS_USERNAME}"
+          openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
+          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 1
       config:
         enableClustering: false
     sdnc:
+      enabled: true
       replicaCount: 1
       config:
         enableClustering: false
index 850a471..5a0cfbe 100644 (file)
@@ -23,6 +23,7 @@ parameters:
       repository: __docker_proxy__
       pullPolicy: IfNotPresent
     robot:
+      enabled: true
       flavor: large
       appcUsername: "appc@appc.onap.org"
       appcPassword: "demo123456!"
@@ -46,12 +47,14 @@ parameters:
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     so:
-      so-openstack-adapter:
+      enabled: true
+      so-catalog-db-adapter:
         config:
           openStackUserName: "${OS_USERNAME}"
           openStackKeyStoneUrl: "http://10.12.25.2:5000/v2.0"
           openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
@@ -63,10 +66,12 @@ parameters:
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
+      enabled: true
       replicaCount: 3
       config:
         enableClustering: true
     aai:
+      enabled: true
       liveness:
         initialDelaySeconds: 120
       aai-data-router:
@@ -79,6 +84,7 @@ parameters:
         liveness:
           initialDelaySeconds: 120
     portal:
+      enabled: true
       global:
         portalHostName: "__portal_hostname__"
       portal-mariadb:
@@ -92,5 +98,49 @@ parameters:
           dmaapBcHostName: "__portal_hostname__"
           msbHostName: "__portal_hostname__"
     vid:
+      enabled: true
       config:
         portalhost: "__portal_hostname__"
+
+    aaf:
+      enabled: true
+    cassandra:
+      enabled: true
+    clamp:
+      enabled: true
+    cli:
+      enabled: true
+    consul:
+      enabled: true
+    contrib:
+      enabled: true
+    dcaegen2:
+      enabled: true
+    dmaap:
+      enabled: true
+    esr:
+      enabled: true
+    log:
+      enabled: true
+    sniro-emulator:
+      enabled: true
+    oof:
+      enabled: true
+    msb:
+      enabled: true
+    multicloud:
+      enabled: true
+    nbi:
+      enabled: true
+    policy:
+      enabled: true
+    pomba:
+      enabled: true
+    sdc:
+      enabled: true
+    uui:
+      enabled: true
+    vfc:
+      enabled: true
+    vnfsdk:
+      enabled: true
\ No newline at end of file
diff --git a/test/mocks/mass-pnf-sim/.gitignore b/test/mocks/mass-pnf-sim/.gitignore
new file mode 100644 (file)
index 0000000..7111c7f
--- /dev/null
@@ -0,0 +1,4 @@
+pnf-sim-lw-*
+.env/
+pnf-sim-lightweight/logs/*
+files/onap/*
diff --git a/test/mocks/mass-pnf-sim/README.md b/test/mocks/mass-pnf-sim/README.md
new file mode 100644 (file)
index 0000000..fa15292
--- /dev/null
@@ -0,0 +1,28 @@
+### Mass PNF simulator
+The purpose of this simulator is to mimic the PNF for benchmark purposes.
+This variant is based on the PNF simulator and use several components.
+The modification are focusing on the following areas:
+    -add a script configuring and governing multiple instances of PNF simualtor
+    -removing parts which are not required for benchmark purposes.
+    -add functionality which creates and maintains the ROP files
+    -add functionality to query the actual ROP files and construct VES events based on them
+
+
+
+###Pre-configuration
+The ipstart should align to a /28 Ip address range start (e.g. 10.11.0.16, 10.11.0.32)
+
+Example:
+python3 ./mass-pnf-sim.py  --bootstrap 2 --ipves 10.11.0.2 --ipstart 10.11.0.16
+
+###Start
+Define the amount of simulators to be launched
+python3 ./mass-pnf-sim.py  --start 2
+
+
+###Stop and clean
+python3 ./mass-pnf-sim.py  --stop 2
+python3 ./mass-pnf-sim.py  --clean
+
+###Cleaning and recovery after incorrect configuration
+docker stop $(docker ps -aq); docker rm $(docker ps -aq)
diff --git a/test/mocks/mass-pnf-sim/ROP_file_creator.sh b/test/mocks/mass-pnf-sim/ROP_file_creator.sh
new file mode 100755 (executable)
index 0000000..1451658
--- /dev/null
@@ -0,0 +1,69 @@
+#!/bin/bash
+MAIN_DIRECTORY=./files/onap
+FILE_TEMPLATE=./templates/file_template.xml.gz
+UPDATE_MINS=15
+NUM_NODES=20
+NUM_FILES=10
+
+rm -rf $MAIN_DIRECTORY/*
+for ((m=1;m<=$NUM_NODES;m++))
+do
+       DIRECTORY=$MAIN_DIRECTORY/"node"$m
+       mkdir -p "$DIRECTORY"
+done
+
+for ((n=0;n<$NUM_FILES;n++))
+do
+       if [[ "$OSTYPE" == "linux-gnu" ]]; then         # Linux OS
+               DATE=$(date -d $(($UPDATE_MINS*$n))" minutes ago" +"%Y%m%d")
+               TIME_START=$(date -d $(($UPDATE_MINS*($n+1)-1))" minutes ago" +"%H%M")
+               TIME_END=$(date -d $(($UPDATE_MINS*$n))" minutes ago" +"%H%M")  
+       elif [[ "$OSTYPE" == "darwin"* ]]; then         # Mac OS
+               DATE=$(date -v "-"$(($UPDATE_MINS*$n))"M" +"%Y%m%d")
+               TIME_START=$(date -v "-"$(($UPDATE_MINS*($n+1)-1))"M" +"%H%M")
+               TIME_END=$(date -v "-"$(($UPDATE_MINS*$n))"M" +"%H%M")
+       else
+               echo "ERROR: OS not supported"
+               exit 1
+       fi
+
+       FILE_NAME_TIMESTAMP="A"$DATE"."$TIME_START"-"$TIME_END
+       TIMESTAMP_ARRAY[$n]=$FILE_NAME_TIMESTAMP
+
+       for ((m=1;m<=$NUM_NODES;m++))
+       do
+               DIRECTORY=$MAIN_DIRECTORY/"node"$m
+               FILE_NAME=$FILE_NAME_TIMESTAMP"_node"$m".xml.gz"
+               cp $FILE_TEMPLATE $DIRECTORY/$FILE_NAME
+       done
+done
+
+while true
+do
+       sleep $(($UPDATE_MINS*60))
+       OLD_TIMESTAMP=${TIMESTAMP_ARRAY[$NUM_FILES-1]}
+       unset TIMESTAMP_ARRAY[$NUM_FILES-1]
+
+       DATE=$(date +"%Y%m%d")
+       TIME_END=$(date +"%H%M")
+       if [[ "$OSTYPE" == "linux-gnu" ]]; then         # Linux OS
+               TIME_START=$(date -d $(($UPDATE_MINS-1))" minutes ago" +"%H%M")
+       elif [[ "$OSTYPE" == "darwin"* ]]; then         # Mac OS
+               TIME_START=$(date -v "-"$(($UPDATE_MINS-1))"M" +"%H%M")
+       else
+               echo "ERROR: OS not supported"
+               exit 1
+       fi
+
+       NEW_TIMESTAMP="A"$DATE"."$TIME_START"-"$TIME_END
+       TIMESTAMP_ARRAY=("$NEW_TIMESTAMP" "${TIMESTAMP_ARRAY[@]}")
+
+       for ((m=1;m<=$NUM_NODES;m++))
+       do
+               DIRECTORY=$MAIN_DIRECTORY/"node"$m
+               OLD_FILE_NAME=$OLD_TIMESTAMP"_node"$m".xml.gz"
+               NEW_FILE_NAME=$NEW_TIMESTAMP"_node"$m".xml.gz"
+               mv $DIRECTORY/$OLD_FILE_NAME $DIRECTORY/$NEW_FILE_NAME
+               echo "Renamed OLD file: "$OLD_FILE_NAME" to NEW file: "$NEW_FILE_NAME
+       done
+done
diff --git a/test/mocks/mass-pnf-sim/mass-pnf-sim.py b/test/mocks/mass-pnf-sim/mass-pnf-sim.py
new file mode 100755 (executable)
index 0000000..9ec8c00
--- /dev/null
@@ -0,0 +1,144 @@
+#!/usr/bin/env python3
+import argparse
+import sys
+from subprocess import *
+from subprocess import STDOUT
+import subprocess
+import ipaddress
+import time
+
+parser = argparse.ArgumentParser()
+parser.add_argument(
+    '--bootstrap',
+    help='Bootstrapping the system',
+)
+
+parser.add_argument(
+    '--ipves',
+    help='IP of the VES collector',
+)
+
+parser.add_argument(
+    '--ipstart',
+    help='IP address range beginning',
+)
+
+parser.add_argument(
+    '--clean',
+    action='store_true',
+    help='Cleaning work-dirs',
+)
+
+parser.add_argument(
+    '--start',
+    help='Starting instances',
+)
+
+parser.add_argument(
+    '--status',
+    help='Status',
+)
+
+parser.add_argument(
+    '--stop',
+    help='Stopping instances',
+)
+
+args = parser.parse_args()
+
+if args.bootstrap and args.ipstart and args.ipves:
+    print("Bootstrap:")
+
+    for i in range(int(args.bootstrap)):
+        print("PNF simulator instance: " + str(i) + ".")
+
+        ip_subnet = ipaddress.ip_address(args.ipstart) + int(0 + (i * 16))
+        print("\tIp Subnet:" + str(ip_subnet))
+        # The IP ranges are in distance of 16 compared to each other.
+        # This is matching the /28 subnet mask used in the dockerfile inside.
+
+        ip_gw = ipaddress.ip_address(args.ipstart) + int(1 + (i * 16))
+        print("\tIP Gateway:" + str(ip_gw))
+
+        IpPnfSim = ipaddress.ip_address(args.ipstart) + int(2 + (i * 16))
+        print("\tIp Pnf SIM:" + str(IpPnfSim))
+
+        IpFtps = ipaddress.ip_address(args.ipstart) + int(3 + (i * 16))
+        print("\tIp Ftps: " + str(IpFtps))
+
+        IpSftp = ipaddress.ip_address(args.ipstart) + int(4 + (i * 16))
+        print("\tIp Sftp:" + str(IpSftp))
+
+        foldername = "pnf-sim-lw-" + str(i)
+        completed = subprocess.run('mkdir ' + foldername, shell=True)
+        print('\tCreating folder:', completed.stdout)
+        completed = subprocess.run(
+            'cp -r pnf-sim-lightweight/* ' +
+            foldername,
+            shell=True)
+        print('\tCloning folder:', completed.stdout)
+
+        composercmd = "./simulator.sh compose " +\
+            str(ip_gw) + " " +\
+            str(ip_subnet) + " " +\
+            str(i) + " " +\
+            str(args.ipves) + " " +\
+            str(IpPnfSim) + " " +\
+            str(IpFtps) + " " +\
+            str(IpSftp)
+
+        completed = subprocess.run(
+            'set -x; cd ' +
+            foldername +
+            '; ' +
+            composercmd,
+            shell=True)
+        print('Cloning:', completed.stdout)
+
+    sys.exit()
+
+if args.clean:
+    completed = subprocess.run('rm -rf ./pnf-sim-lw-*', shell=True)
+    print('Deleting:', completed.stdout)
+    sys.exit()
+
+if args.start:
+
+    for i in range(int(args.start)):
+        foldername = "pnf-sim-lw-" + str(i)
+
+        completed = subprocess.run(
+            'set -x ; cd ' +
+            foldername +
+            "; bash -x ./simulator.sh start",
+            shell=True)
+        print('Starting:', completed.stdout)
+
+        time.sleep(5)
+
+if args.status:
+
+    for i in range(int(args.status)):
+        foldername = "pnf-sim-lw-" + str(i)
+
+        completed = subprocess.run(
+            'cd ' +
+            foldername +
+            "; ./simulator.sh status",
+            shell=True)
+        print('Status:', completed.stdout)
+
+if args.stop:
+    for i in range(int(args.stop)):
+        foldername = "pnf-sim-lw-" + str(i)
+
+        completed = subprocess.run(
+            'cd ' +
+            foldername +
+            "; ./simulator.sh stop",
+            shell=True)
+        print('Stopping:', completed.stdout)
+
+else:
+    print("No instruction was defined")
+    sys.exit()
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json
new file mode 100644 (file)
index 0000000..f0ded4c
--- /dev/null
@@ -0,0 +1,35 @@
+{
+  "simulatorParams": {
+    "vesServerUrl": "http://localhost:10000/eventListener/v7",
+    "testDuration": "10",
+    "messageInterval": "1"
+  },
+  "commonEventHeaderParams": {
+    "eventName": "pnfRegistration_Nokia_5gDu",
+    "nfNamingCode": "gNB",
+    "nfcNamingCode": "oam",
+    "sourceName": "NOK6061ZW3",
+    "sourceId": "val13",
+    "reportingEntityName": "NOK6061ZW3"
+  },
+  "notificationParams": {
+    "changeIdentifier": "PM_MEAS_FILES",
+    "changeType": "FileReady",
+    "arrayOfNamedHashMap": [
+      {"name": "A20161221.1031-1041.bin.gz", "hashMap": {
+        "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz",
+        "compression": "gzip",
+        "fileFormatType": "org.3GPP.32.435#measCollec",
+        "fileFormatVersion": "V10"
+      }
+      },
+      {"name": "A20161222.1042-1102.bin.gz", "hashMap": {
+        "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz",
+        "compression": "gzip",
+        "fileFormatType": "org.3GPP.32.435#measCollec",
+        "fileFormatVersion": "V10"
+      }
+      }
+    ]
+  }
+}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env
new file mode 100644 (file)
index 0000000..6cf310a
--- /dev/null
@@ -0,0 +1,5 @@
+NETCONF_ADDRESS=netopeer
+NETCONF_PORT=830
+NETCONF_MODEL=pnf-simulator
+NETCONF_MAIN_CONTAINER=config
+TZ=Europe/Warsaw
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json
new file mode 100644 (file)
index 0000000..de1e957
--- /dev/null
@@ -0,0 +1,29 @@
+{
+  "simulatorParams": {
+    "vesServerUrl": "http://______$IP_OF_VES_____:_____$PORT_OF_VES/eventListener/v7",
+    "testDuration": "10",
+    "messageInterval": "1"
+  },
+  "commonEventHeaderParams": {
+    "eventName": "pnfRegistration_Nokia_5gDu",
+    "nfNamingCode": "gNB",
+    "nfcNamingCode": "oam",
+    "sourceName": "NOK6061ZW3",
+    "sourceId": "val13",
+    "reportingEntityName": "NOK6061ZW3"
+  },
+  "notificationParams": {
+    "changeIdentifier": "PM_MEAS_FILES",
+    "changeType": "FileReady",
+    "arrayOfNamedHashMap": [
+      {"name": "1MB.tar.gz", "hashMap": {
+        "location": "sftp://$IPSFTP}/1MB.tar.gz",
+        "compression": "gzip",
+        "fileFormatType": "org.3GPP.32.435#measCollec",
+        "fileFormatVersion": "V10"
+      }
+      }
+      }
+    ]
+  }
+}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json
new file mode 100644 (file)
index 0000000..c8c38b0
--- /dev/null
@@ -0,0 +1,28 @@
+{
+  "simulatorParams": {
+    "vesServerUrl": "http://______$IP_OF_VES_____:_____$PORT_OF_VES/eventListener/v7",
+    "testDuration": "10",
+    "messageInterval": "1"
+  },
+  "commonEventHeaderParams": {
+    "eventName": "pnfRegistration_Nokia_5gDu",
+    "nfNamingCode": "gNB",
+    "nfcNamingCode": "oam",
+    "sourceName": "NOK6061ZW3",
+    "sourceId": "val13",
+    "reportingEntityName": "NOK6061ZW3"
+  },
+  "notificationParams": {
+    "changeIdentifier": "PM_MEAS_FILES",
+    "changeType": "FileReady",
+    "arrayOfNamedHashMap": [
+      {"name": "1MB.tar.gz", "hashMap": {
+        "location": "ftps://$IP/1MB.tar.gz",
+        "compression": "gzip",
+        "fileFormatType": "org.3GPP.32.435#measCollec",
+        "fileFormatVersion": "V10"
+      }
+      }
+    ]
+  }
+}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl.conf b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/vsftpd_ssl.conf
new file mode 100644 (file)
index 0000000..99d64dc
--- /dev/null
@@ -0,0 +1,57 @@
+# Server Config
+anonymous_enable=NO
+local_enable=YES
+write_enable=YES
+local_umask=022
+dirmessage_enable=YES
+
+# Security and User auth
+chroot_local_user=YES
+pam_service_name=vsftpd_virtual
+virtual_use_local_privs=YES
+chmod_enable=NO
+user_config_dir=/etc/vsftpd/user_conf
+user_sub_token=$USER
+#local_root=/srv/$USER
+local_root=/srv/
+userlist_enable=NO
+allow_writeable_chroot=YES
+
+# Logging
+log_ftp_protocol=YES
+xferlog_enable=YES
+xferlog_std_format=YES
+#xferlog_file=/dev/stdout
+syslog_enable=NO
+dual_log_enable=YES
+
+# Remap all login users to this username
+guest_enable=YES
+guest_username=ftp
+hide_ids=YES
+
+# Networking
+connect_from_port_20=NO
+listen=YES
+tcp_wrappers=YES
+pasv_min_port=8001
+pasv_max_port=8010
+
+# SSL
+ssl_enable=Yes
+require_ssl_reuse=NO
+force_local_data_ssl=YES
+force_local_logins_ssl=YES
+ssl_ciphers=HIGH
+allow_anon_ssl=NO
+
+ssl_tlsv1=YES
+ssl_sslv2=YES
+ssl_sslv3=YES
+rsa_cert_file=/etc/ssl/private/ftp.crt
+rsa_private_key_file=/etc/ssl/private/ftp.key
+
+require_cert=YES
+ssl_request_cert=YES
+ca_certs_file=/etc/ssl/private/dfc.crt
+
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template.yml
new file mode 100644 (file)
index 0000000..4bf6758
--- /dev/null
@@ -0,0 +1,118 @@
+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_remove () {
+                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
+            }
+
+            docker_install_and_configure () {
+                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_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 () {
+                cd /root; git clone https://gerrit.onap.org/r/integration
+                printf "{\n  "simulatorParams": {\n    "vesServerUrl": "http://VES-HOST:VES-PORT/eventListener/v7",\n    "testDuration": "10",\n    "messageInterval": "1"\n  },\n  "commonEventHeaderParams": {\n    "eventName": "pnfRegistration_Nokia_5gDu",\n    "nfNamingCode": "gNB",\n    "nfcNamingCode": "oam",\n    "sourceName": "NOK6061ZW3",\n    "sourceId": "val13",\n    "reportingEntityName": "NOK6061ZW3"\n  },\n  "pnfRegistrationParams": {\n    "serialNumber": "6061ZW3",\n    "vendorName": "Nokia",\n    "oamV4IpAddress": "val3",\n    "oamV6IpAddress": "val4",\n    "unitFamily": "BBU",\n    "modelNumber": "val6",\n    "softwareVersion": "val7",\n    "unitType": "val8"\n  }\n}" > integration/test/mocks/pnfsimulator/config/config.json
+            }
+
+            start_simulator () {
+               docker login -u docker -p docker nexus3.onap.org:10003
+               cd ~/integration/test/mocks/pnfsimulator
+               ./simulator.sh start
+            }
+
+            set_versions
+            enable_root_ssh
+            update_os
+            docker_remove
+            docker_install_and_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 ] }
\ No newline at end of file
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/deployment/PnP_PNF_sim_heat_template_Ubuntu_16_04.yml
new file mode 100644 (file)
index 0000000..5dd8e6d
--- /dev/null
@@ -0,0 +1,165 @@
+description: Heat template that deploys PnP PNF simulator
+heat_template_version: '2013-05-23'
+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]
+parameters:
+  flavor_name:
+    description: Type of instance (flavor) to be used
+    label: Flavor
+    type: string
+  image_name:
+    description: Ubuntu 16.04 image to be used
+    label: Image name or ID
+    type: string
+  key_name:
+    description: Public/Private key pair name
+    label: Key pair name
+    type: string
+  private_net_id:
+    description: Private network id
+    label: Private network name or ID
+    type: string
+  private_subnet_id:
+    description: Private subnet id
+    label: Private subnetwork name or ID
+    type: string
+  public_net_id:
+    description: Public network that enables remote connection to VNF
+    label: Public network name or ID
+    type: string
+  security_group:
+    default: default
+    description: Security group to be used
+    label: Security Groups
+    type: string
+  proxy:
+    default: ''
+    description: Proxy
+    label: Proxy
+    type: string
+  correlation_id:
+    default: 'someId'
+    description: Correlation ID
+    label: Correlation ID
+    type: string
+  VES-HOST:
+    default: 'VES-HOST'
+    description: VES collector host ip
+    label: VES ip
+    type: string
+  VES-PORT:
+    default: 'VES-PORT'
+    description: VES collector host port
+    label: VES port
+    type: string
+resources:
+  PNF_PnP_simualtor:
+    properties:
+      flavor:
+        get_param: flavor_name
+      image:
+        get_param: image_name
+      key_name:
+        get_param: key_name
+      networks:
+      - port:
+          get_resource: PNF_PnP_simualtor_port0
+      user_data:
+        str_replace:
+          params:
+            $proxy:
+              get_param: proxy
+            $VES-PORT:
+              get_param: VES-PORT
+            $VES-HOST:
+              get_param: VES-HOST
+            $correlation_id:
+              get_param: correlation_id
+          template: |
+            #!/bin/bash
+
+            set_versions () {
+                DOCKER_VERSION=17.03
+                DOCKER_COMPOSE_VERSION=1.22.0
+                PROTOBUF_VERSION=3.6.1
+            }
+
+            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 "onap\nonap" | passwd root
+            }
+
+            update_os () {
+                rm -rf /var/lib/apt/lists/*
+                apt-get clean
+                apt-get update
+            }
+
+            docker_install_and_configure () {
+                curl "https://releases.rancher.com/install-docker/$DOCKER_VERSION.sh" | sh
+                mkdir -p /etc/systemd/system/docker.service.d/
+                cat > /etc/systemd/system/docker.service.d/docker.conf << EOF
+            [Service]
+            ExecStart=
+            ExecStart=/usr/bin/dockerd -H fd:// --insecure-registry=nexus3.onap.org:10003
+            Environment="HTTP_PROXY=$proxy"
+            Environment="HTTPS_PROXY=$proxy"
+            EOF
+                systemctl daemon-reload
+                systemctl restart docker
+                apt-mark hold docker-ce
+                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 () {
+                cd /root; git clone https://gerrit.onap.org/r/integration
+                printf "{\n  \"simulatorParams\": {\n    \"vesServerUrl\": \"http://$VES-HOST:$VES-PORT/eventListener/v7\",\n    \"testDuration\": \"10\",\n    \"messageInterval\": \"1\"\n  },\n  \"commonEventHeaderParams\": {\n    \"eventName\": \"pnfRegistration_Nokia_5gDu\",\n    \"nfNamingCode\": \"gNB\",\n    \"nfcNamingCode\": \"oam\",\n    \"sourceName\": \"$correlation_id\",\n    \"sourceId\": \"val13\",\n    \"reportingEntityName\": \"NOK6061ZW3\"\n  },\n  \"pnfRegistrationParams\": {\n    \"serialNumber\": \"6061ZW3\",\n    \"vendorName\": \"Nokia\",\n    \"oamV4IpAddress\": \"val3\",\n    \"oamV6IpAddress\": \"val4\",\n    \"unitFamily\": \"BBU\",\n    \"modelNumber\": \"val6\",\n    \"softwareVersion\": \"val7\",\n    \"unitType\": \"val8\"\n  }\n}" > integration/test/mocks/pnfsimulator/config/config.json
+            }
+
+            start_simulator () {
+               docker login -u docker -p docker nexus3.onap.org:10003
+               cd ~/integration/test/mocks/pnfsimulator
+               ./simulator.sh start
+            }
+
+            set_versions
+            enable_root_ssh
+            update_os
+            docker_install_and_configure
+            docker_compose_install
+            pnf_sim_file_checkout
+            start_simulator
+
+    type: OS::Nova::Server
+  PNF_PnP_simualtor_port0:
+    properties:
+      fixed_ips:
+      - subnet_id:
+          get_param: private_subnet_id
+      network_id:
+        get_param: private_net_id
+      security_groups:
+      - get_param: security_group
+    type: OS::Neutron::Port
+  PNF_PnP_simualtor_public:
+    properties:
+      floating_network_id:
+        get_param: public_net_id
+      port_id:
+        get_resource: PNF_PnP_simualtor_port0
+    type: OS::Neutron::FloatingIP
+
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/docker-compose-template.yml
new file mode 100644 (file)
index 0000000..f4ff7d8
--- /dev/null
@@ -0,0 +1,59 @@
+version: '2'
+networks:
+  front-${I}:
+    driver: bridge
+    ipam:
+      config:
+      - gateway: "${IPGW}"
+        subnet: "${IPSUBNET}/28"
+      driver: default
+services:
+  pnf-simulator-${I}:
+    container_name: pnf-simulator-${I}
+
+    image: nexus3.onap.org:10003/onap/pnf-simulator:4.0.0-SNAPSHOT
+    networks:
+      front-${I}:
+        ipv4_address: "${IPPNFSIM}"
+    volumes:
+      - ./logs:/var/log
+      - ./json_schema:/json_schema
+    env_file:
+      - ./config/netconf.env
+    restart: on-failure
+
+  sftp-server-${I}:
+    container_name: sftp-server-$I
+    image: atmoz/sftp:alpine
+    networks:
+      front-${I}:
+        ipv4_address: "${IPSFTP}"
+    volumes:
+      - ./files/onap/:/home/onap/
+    restart: on-failure
+    command: onap:pano:1001
+
+  ftpes-server-vsftpd-${I}:
+    container_name: ftpes-server-vsftpd-$I
+    image: docker.io/panubo/vsftpd
+    networks:
+      front-${I}:
+        ipv4_address: "${IPFTPS}"
+    environment:
+      FTP_USER: onap
+      FTP_PASSWORD: pano
+      PASV_ADDRESS: localhost
+      PASV_MIN_PORT: 8001
+      PASV_MAX_PORT: 8010
+    volumes:
+      - ./tls/ftp.crt:/etc/ssl/private/ftp.crt:ro
+      - ./tls/ftp.key:/etc/ssl/private/ftp.key:ro
+      - ./tls/dfc.crt:/etc/ssl/private/dfc.crt:ro
+      - ./config/vsftpd_ssl.conf:/etc/vsftpd_ssl.conf:ro
+      - ./files/onap/0.5MB.tar.gz:/srv/0.5MB.tar.gz:ro
+      - ./files/onap/1MB.tar.gz:/srv/1MB.tar.gz:ro
+      - ./files/onap/5MB.tar.gz:/srv/5MB.tar.gz:ro
+      - ./files/onap/10MB.tar.gz:/srv/10MB.tar.gz:ro
+    restart: on-failure
+    command: vsftpd /etc/vsftpd_ssl.conf
+
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/files/prepare-ROP-files.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/files/prepare-ROP-files.sh
new file mode 100755 (executable)
index 0000000..4c7c506
--- /dev/null
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "Creating ROP files"
+set -x
+mkdir -p onap
+
+dd if=/dev/urandom of=./onap/0.5MB.tar.gz bs=1k count=512
+dd if=/dev/urandom of=./onap/1MB.tar.gz bs=1M count=1
+dd if=/dev/urandom of=./onap/5MB.tar.gz bs=1M count=5
+dd if=/dev/urandom of=./onap/10MB.tar.gz bs=1M count=10
\ No newline at end of file
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/input_validator.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/input_validator.json
new file mode 100644 (file)
index 0000000..4e75e0a
--- /dev/null
@@ -0,0 +1,205 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "simulatorParams": {
+      "type": "object",
+      "properties": {
+        "vesServerUrl": {
+          "type": "string"
+        },
+        "testDuration": {
+          "type": "string"
+        },
+        "messageInterval": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "vesServerUrl",
+        "testDuration",
+        "messageInterval"
+      ]
+    },
+    "commonEventHeaderParams": {
+      "type": "object",
+      "properties": {
+        "eventName": {
+          "type": "string"
+        },
+        "nfNamingCode": {
+          "type": "string"
+        },
+        "nfcNamingCode": {
+          "type": "string"
+        },
+        "sourceName": {
+          "type": "string"
+        },
+        "sourceId": {
+          "type": "string"
+        },
+        "reportingEntityName": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "eventName",
+        "sourceName",
+        "sourceId",
+        "reportingEntityName"
+      ]
+    },
+
+
+    "pnfRegistrationParams": {
+      "type": "object",
+      "properties": {
+        "serialNumber": {
+          "type": "string"
+        },
+        "vendorName": {
+          "type": "string"
+        },
+        "oamV4IpAddress": {
+          "type": "string"
+        },
+        "oamV6IpAddress": {
+          "type": "string"
+        },
+        "unitFamily": {
+          "type": "string"
+        },
+        "modelNumber": {
+          "type": "string"
+        },
+        "softwareVersion": {
+          "type": "string"
+        },
+        "unitType": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "serialNumber",
+        "vendorName",
+        "oamV4IpAddress",
+        "oamV6IpAddress",
+        "unitFamily",
+        "modelNumber",
+        "softwareVersion",
+        "unitType"
+      ]
+    },
+    "notificationParams": {
+      "type": "object",
+      "properties": {
+        "changeIdentifier": {
+          "type": "string"
+        },
+        "changeType": {
+          "type": "string"
+        },
+        "arrayOfNamedHashMap": {
+          "type": "array",
+          "items": [
+            {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string"
+                },
+                "hashMap": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "type": "string"
+                    },
+                    "compression": {
+                      "type": "string"
+                    },
+                    "fileFormatType": {
+                      "type": "string"
+                    },
+                    "fileFormatVersion": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "compression",
+                    "fileFormatType",
+                    "fileFormatVersion"
+                  ]
+                }
+              },
+              "required": [
+                "name",
+                "hashMap"
+              ]
+            },
+            {
+              "type": "object",
+              "properties": {
+                "name": {
+                  "type": "string"
+                },
+                "hashMap": {
+                  "type": "object",
+                  "properties": {
+                    "location": {
+                      "type": "string"
+                    },
+                    "compression": {
+                      "type": "string"
+                    },
+                    "fileFormatType": {
+                      "type": "string"
+                    },
+                    "fileFormatVersion": {
+                      "type": "string"
+                    }
+                  },
+                  "required": [
+                    "location",
+                    "compression",
+                    "fileFormatType",
+                    "fileFormatVersion"
+                  ]
+                }
+              },
+              "required": [
+                "name",
+                "hashMap"
+              ]
+            }
+          ]
+        }
+      },
+      "required": [
+        "changeIdentifier",
+        "changeType",
+        "arrayOfNamedHashMap"
+      ]
+    }
+  },
+
+  "oneOf": [
+    {
+      "required": [
+        "simulatorParams",
+        "commonEventHeaderParams",
+        "pnfRegistrationParams"
+      ]
+    },
+    {
+      "required": [
+        "simulatorParams",
+        "commonEventHeaderParams",
+        "notificationParams"
+      ]
+    }
+  ]
+
+
+}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/json_schema/output_validator_ves_schema_30.0.1.json
new file mode 100644 (file)
index 0000000..76a661c
--- /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
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/simulator.sh
new file mode 100755 (executable)
index 0000000..12b2047
--- /dev/null
@@ -0,0 +1,217 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+COMPOSE_FILE_NAME=docker-compose.yml
+NETOPEER_CONTAINER_NAME=netopeer
+SIMULATOR_CONTAINER_NAME=pnf-simulator
+SIMULATOR_PORT=5000
+SIMULATOR_START_URL=http://localhost:$SIMULATOR_PORT/simulator/start
+SIMULATOR_STOP_URL=http://localhost:$SIMULATOR_PORT/simulator/stop
+SIMULATOR_STATUS_URL=http://localhost:$SIMULATOR_PORT/simulator/status
+RUNNING_COMPOSE_CONFIG=$COMPOSE_FILE_NAME
+
+function main(){
+
+    COMMAND=${1:-"help"}
+
+    case $COMMAND in
+       "compose")
+            compose $2 $3 $4 $5 $6 $7 $8;;
+             #IPGW, #IPSUBNET, #I, #IPVES, #IPPNFSIM, #IPFTP, #IPSFTP,
+        "build")
+            build_image;;
+        "start")
+            start $COMPOSE_FILE_NAME;;
+        "stop")
+            stop;;
+        "run-simulator")
+            run_simulator;;
+        "stop-simulator")
+            stop_simulator;;
+        "status")
+             get_status;;
+        "clear-logs")
+             clear_logs;;
+        *)
+            print_help;;
+    esac
+}
+
+function compose(){
+       #creating custom docker-compose based on IP arguments
+       #creting config.json by injecting the same IP
+
+       export IPGW=$1
+       export IPSUBNET=$2
+       export I=$3
+       export IPVES=$4
+       export IPPNFSIM=$5
+       export IPFTPS=$6
+       export IPSFTP=$7
+
+       #will insert $I to distinguish containers, networks properly
+       #docker compose cannot substitute these, as they are keys, not values.
+       envsubst < docker-compose-template.yml > docker-compose-temporary.yml
+       #variable substitution
+       docker-compose -f docker-compose-temporary.yml config > docker-compose.yml
+       rm docker-compose-temporary.yml
+
+       cd files
+       ./prepare-ROP-files.sh
+       cd -
+
+       set_vsftpd_file_owner
+
+       write_config $IPVES $IPFTPS $IPSFTP
+
+}
+
+function build_image(){
+    if [ -f pom.xml ]; then
+        mvn clean package docker:build
+    else
+        echo "pom.xml file not found"
+        exit 1
+    fi
+}
+
+function set_vsftpd_file_owner() {
+    sudo chown root ./config/vsftpd_ssl.conf
+}
+
+
+function write_config(){
+       #building a YML file for usage in Java
+       echo "---" > config/config.yml
+       echo "configuration:" >> config/config.yml
+       echo "  vesip: $1" >> config/config.yml
+       echo "  ipftps: $2" >> config/config.yml
+       echo "  ipsftp: $3" >> config/config.yml
+}
+
+function start(){
+
+    if [[ $(running_containers) ]]; then
+        echo "Simulator containers are already up"
+    else
+        echo "Starting simulator containers using netconf model specified in config/netconf.env"
+        set_vsftpd_file_owner
+        archive_logs
+        docker-compose -f $1 up -d
+        RUNNING_COMPOSE_CONFIG=$1
+    fi
+}
+
+function running_containers(){
+   docker-compose -f $COMPOSE_FILE_NAME ps -q
+}
+
+function stop(){
+
+    if [[ $(running_containers) ]]; then
+        docker-compose -f $RUNNING_COMPOSE_CONFIG down
+        docker-compose -f $RUNNING_COMPOSE_CONFIG rm
+    else
+        echo "Simulator containers are already down"
+    fi
+}
+
+function run_simulator(){
+
+cat << EndOfMessage
+Simulator response:
+$(curl -s -X POST -H "Content-Type: application/json" -H "X-ONAP-RequestID: 123" -H "X-InvocationID: 456" -d @config/$CONFIG_JSON $SIMULATOR_START_URL)
+EndOfMessage
+}
+
+function stop_simulator(){
+cat << EndOfMessage
+Simulator response:
+$(curl -s -X POST $SIMULATOR_STOP_URL)
+EndOfMessage
+}
+
+function get_status(){
+
+    if [[ $(running_containers) ]]; then
+        print_status
+    else
+        echo "Simulator containers are down"
+    fi
+}
+
+function print_status(){
+cat << EndOfMessage
+$(docker-compose -f $RUNNING_COMPOSE_CONFIG ps)
+
+Simulator response:
+$(curl -s -X GET $SIMULATOR_STATUS_URL)
+EndOfMessage
+}
+
+function print_help(){
+cat << EndOfMessage
+Available options:
+build - locally builds simulator image from existing code
+start - starts simulator and netopeer2 containers using remote simulator image and specified model name
+compose - customize the docker-compose and configuration based on arguments
+run-simulator - starts sending PNF registration messages with parameters specified in config.json
+stop-simulator - stop sending PNF registration messages
+stop - stops both containers
+status - prints simulator status
+clear-logs - deletes log folder
+
+Starting simulation:
+- Setup the instance of this simulator by:
+  - ./simulator.sh compose IPGW IPSUBNET I IPVES IPPNFSIM IPFTPS IPSFTP
+       where Gw and subnet will be used for docker network
+       where I is the integer suffix to differentiate instances
+       where IPVES is the address of the VES collector
+       where IPPNFSIM, IPFTPS, IPSFTP are the addresses for containers
+       e.g. ./simulator.sh compose 10.11.0.65 10.11.0.64 3 10.11.0.2 10.11.0.66 10.11.0.67 10.11.0.68
+
+- Setup environment with "./simulator.sh start". It will download required docker images from the internet and run them on docker machine
+- To start the simulation use "./simulator.sh run-simulator", which will start sending PNF registration messages with parameters specified in config.json    {TODO, might not be needed}
+
+To stop simulation use "./simulator.sh stop-simulator" command. To check simulator's status use "./simulator.sh status".
+If you want to change message parameters simply edit config.json, then start the simulation with "./simulator.sh run-simulator" again
+Logs are written to logs/pnf-simulator.log.
+
+If you change the source code you have to rebuild image with "./simulator.sh build" and run "./simulator.sh start" again
+EndOfMessage
+}
+
+function archive_logs(){
+
+    if [ -d logs ]; then
+        echo "Moving log file to archive"
+        DIR_PATH=logs/archive/simulator[$(timestamp)]
+        mkdir -p $DIR_PATH
+        if [ -f logs/pnfsimulator.log ]; then
+           mv logs/pnfsimulator.log $DIR_PATH
+        fi
+
+        if [ -f logs/*.xml ]; then
+            mv logs/*.xml $DIR_PATH
+        fi
+
+    else
+        mkdir logs
+    fi
+}
+
+function clear_logs(){
+
+    if [[ $(running_containers) ]]; then
+        echo "Cannot delete logs when simulator is running"
+    else
+         rm -rf logs
+    fi
+}
+
+function timestamp(){
+  date "+%Y-%m-%d_%T"
+}
+
+main $@
\ No newline at end of file
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/dfc.crt b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/dfc.crt
new file mode 100644 (file)
index 0000000..0c00a5a
--- /dev/null
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf4CCQCfuDKplruMfDANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJT
+RTEKMAgGA1UECAwBMDEKMAgGA1UEBwwBMDEKMAgGA1UECgwBMDEMMAoGA1UECwwD
+RVNUMQwwCgYDVQQDDANFU1QwHhcNMTkwMjA1MTQwMDQ5WhcNMjAwMjA1MTQwMDQ5
+WjBNMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBMDEKMAgGA1UEBwwBMDEKMAgGA1UE
+CgwBMDEMMAoGA1UECwwDRVNUMQwwCgYDVQQDDANFU1QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCzUSxAWVekRZ22WaDkPDUAK+ihxdoy9iXeakS2K4xR
+biT85qkyHP8kh/KgDTwcH/wJ5nSKxMh135s/EF1rJpLoDW+BR8HpAq/GX2V7N8lV
+E+cDyfLxTA/emptZ+sN6JKXpgwEs7B93EsomjBnu9G8lLHXBUMRywc9rRymivAVO
+DE+UsT6xO/thUgDtiKS4C37jmt0dabPblBcINY6a6dG3V+QsPXaHsKbg4O6y0jZL
+nLM4PBT47rL7grmngcEnXYb3zQPV9JxY3tAHJDyiMU2VkhSB1NbJ7rOMRImesJ5o
+cuLdKY12amTPQ2lwmTSL2ieGRYHo7OmZ+rPCWIksLbrbAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAE/UvlH4tfoMkEs9eTk8WgpyBVcLA2Vo9F1o2a2tvj4iXFUWGMZK
+SJ+j4tnEBgpsIWNpWEOnD00ngOKTLuedFuS62if3QW34Y6Hax6qP+FMStko5jZ4F
+OALZb4GZU5MR0hLSig6aB6zDa1Qe2iVK7Lr7BWG1O+8NsTUP6akIwSQufAllrpJ/
+Ng02CWK6WCaMV5Z1CnVheBw9vf/3ZVh1tm8gRrJQGlcau2/8Mg3M7yThHuDz/rPm
+VbkO6aMRl3C115whBTpd1+/rwg0BzsIQjv56Ab34pWAQc20KsV8WPPDxzZhlZUHD
+yc0HiF1+blZHlzc/ie/07DSklUMKJv63D1s=
+-----END CERTIFICATE-----
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.crt b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.crt
new file mode 100644 (file)
index 0000000..2893280
--- /dev/null
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf4CCQC2aMod08TgbDANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJT
+RTEKMAgGA1UECAwBMDEKMAgGA1UEBwwBMDEKMAgGA1UECgwBMDEMMAoGA1UECwwD
+RVNUMQwwCgYDVQQDDANFU1QwHhcNMTkwMjA1MTQwMDUwWhcNMjAwMjA1MTQwMDUw
+WjBNMQswCQYDVQQGEwJTRTEKMAgGA1UECAwBMDEKMAgGA1UEBwwBMDEKMAgGA1UE
+CgwBMDEMMAoGA1UECwwDRVNUMQwwCgYDVQQDDANFU1QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDUOXkcBkCqWEXri3TIB1xqd/reBSigsXb+54jRn8/1
+POQGE8BGE54RJd5xurtoLpqeuqgYl9jdLW0uyfZY/ef81K2qWwwmUtzMJmREyJ3x
+2QNoYfJKBbfQKHOQ1nEYBFWKo7nmWxNhJ7iBxEO1QL+jwgohF2gWgrx1KzV6Cu6S
+NX71jWEa3DkYNjc08dn6rMsLfXe8Rgc1EVLxfj+JG/CDnEyKavKmcxLZlk3zD0/i
+CCTaa23aeNCk4qOZ7k5T2Mlt82POlKztjjIBfpyxhoJmO2clRf6jso0BdRQ5r7yd
+4Y+FAUjNbS6A41SuxF8EbSIKtS2UAMUxf1fX74WOKLQPAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAIjhg0KMyqg2EFeZOKinmeCEY3f+AfW9AnPc+MMQH7ITPJXXB4hR
+3KVzn4aX19x5b6KjLKtYI+tNHpN9bECWTGPv0yloUSJttyAMmNHYX++9GYHRQoFc
+9RKTzc4tZP1/vVFz0zov9iRKk1uhrEW+B7N4e/WDJpD8QbgiPGwAUsfC9lxJIdpl
+2UKWhA3KazuUgH+w2udh1tDzBKmRpSMS/vFQ6cfUXBfcJYOtCIbVhZwjy1oGc+vX
+PvFQCL6x+n7v12IUjzH6k284UxdqVdKBfPgkr774pFlTioa9fHu/eRBUPGOllePF
+sY9S5Ba0hFWunQyyiT4d34hwDjRKojenULc=
+-----END CERTIFICATE-----
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.key b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/tls/ftp.key
new file mode 100644 (file)
index 0000000..05144b3
--- /dev/null
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA1Dl5HAZAqlhF64t0yAdcanf63gUooLF2/ueI0Z/P9TzkBhPA
+RhOeESXecbq7aC6anrqoGJfY3S1tLsn2WP3n/NStqlsMJlLczCZkRMid8dkDaGHy
+SgW30ChzkNZxGARViqO55lsTYSe4gcRDtUC/o8IKIRdoFoK8dSs1egrukjV+9Y1h
+Gtw5GDY3NPHZ+qzLC313vEYHNRFS8X4/iRvwg5xMimrypnMS2ZZN8w9P4ggk2mtt
+2njQpOKjme5OU9jJbfNjzpSs7Y4yAX6csYaCZjtnJUX+o7KNAXUUOa+8neGPhQFI
+zW0ugONUrsRfBG0iCrUtlADFMX9X1++Fjii0DwIDAQABAoIBAHydKsIL4dikcJn4
+jyANQnS58rJ/cPW6ftb6eVotbtzfXj07R8FeL4h+Jfm93eE0zFG75IxcTVjCHcRF
+jsN+g8Pv1fGb+KxgJ4owWNwSuLuT4+5c5PoWFXLC7ej0IgAqO1hm/veGLwDzY+G+
+rss1M9IiU/ROXC4roiFit8nrtV5fvUj7UzrLLuxoHH8v727ug/Z1U+RIaiTA0b/P
+4x4NTrS7QquvSk8O4IOZRVQKCN9KxOg3BBu8oM6/TOucBtRhfVoOGf9XFQPQctNu
+ORFAoB6OIVY/vdkyS62kD/MGD/MQsq9c58FyjVtWxBFWanhz4syb+kaOqPRi7GA1
+tBGxd+ECgYEA8ILjwiZEKUxz7dKxRJL98327WzH+vh4v2aiiCQF/QqO06edX6OLs
+UQSyhN2+XJsvmW9TxcsLdiMstKR1rEO0vU/LTyE4D8bZ0dVtK6eHJ0wPLJSf0LPL
+7vReFuMHMhKn6X3uLHpws4mibXQXij8hifF2f5AUPXdkwvpi3KqpUXcCgYEA4eQ+
+HaF9G5mh5X6/oNCbHj/nDpKUJSvvoHoJoTxRD/Hn13YTz1OEhleV4QX+QQ/RsPVR
+WC+RI+F9+aL82r1DJ/EA2B3tcupX/s66JQgSAA/mU09GXru7Nf5nJCRJLaeZq/zi
+xDQM3dyuyuOXWE+H80K5c6E4yLAc1pj2SR+0mCkCgYBNGZiLt5qoJpMPTTh4hCqW
+sNqrzGYeaizquI1hF7LFGRe41+mthXk+K6RSxYbtxu3GYRLY2FNPRs1hB0uVsoqx
+GXBSaJLBM/zFsIZztRu1dEN1BhwJWmnoqzuyWIsI+UQMrMr6RTH1zAxezBVzwvMs
+dlSHZhem8KxDeOLSXH801wKBgQCsO2vFCekrDyOqqM6RXhy3nr+ck9RS10IY2JPZ
+FPU1tBsyY/xMuwAzsjo73Wbz0ozuYM2J8JK4ieiUW1pxqZa3sIEVRxRR5y36wUKa
+k6Gt3HGgGbSs7HScgYHAw83r+nsn8GQydwFMdEPtvEQb+F/O8ZQW/tkd43HJic1X
+Cc6XqQKBgQDmGijg2uO8Mxqzv2JHNqUJ0djJG7dbT2NhzdrgXUmt6M3I0iJ+CSU7
+Ls87u7WMhyYsBynInhunaNRR0bQVab7bT61p6ru2FxRuVLVx2dXjzX0+vkSrT+wu
+e2oAmyPSRHtGXhnT1rqGHu7pvMTCqrhjdW6/YqZvHiAnM05iEBmjeQ==
+-----END RSA PRIVATE KEY-----
diff --git a/test/mocks/mass-pnf-sim/requirements.txt b/test/mocks/mass-pnf-sim/requirements.txt
new file mode 100644 (file)
index 0000000..442e1c3
--- /dev/null
@@ -0,0 +1,2 @@
+argparse
+ipaddress
diff --git a/test/mocks/mass-pnf-sim/setup.sh b/test/mocks/mass-pnf-sim/setup.sh
new file mode 100755 (executable)
index 0000000..4e49a7e
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+virtualenv --version > /dev/null || { echo 'Virtualenv command is not available, exiting' ; sleep 10; exit 1; }
+pip3 --version > /dev/null || { echo 'python3-pip package is not available, exiting' ; sleep 10; exit 1; }
+
+
+if [ -d ".env" ]; then
+       echo ".env is prepared"
+else
+       virtualenv --no-site-packages --distribute  -p python3 .env
+fi
+
+source .env/bin/activate && pip3 install -r requirements.txt
\ No newline at end of file
diff --git a/test/mocks/mass-pnf-sim/templates/file_template.xml.gz b/test/mocks/mass-pnf-sim/templates/file_template.xml.gz
new file mode 100644 (file)
index 0000000..0e6624a
Binary files /dev/null and b/test/mocks/mass-pnf-sim/templates/file_template.xml.gz differ
index 52ded35..bbb983f 100644 (file)
@@ -20,8 +20,10 @@ services:
     image: sysrepo/sysrepo-netopeer2:latest
     ports:
       - "830:830"
+      - "6513:6513"
     volumes:
       - ./netconf:/netconf
+      - ./netopeer_tls_cfg:/netopeer_tls_cfg
     env_file:
       - ./config/netconf.env
     restart: on-failure
@@ -29,6 +31,7 @@ services:
       - sftp-server
       - ftpes-server-pure-ftpd
       - ftpes-server-vsftpd
+    command: bash -c "/netopeer_tls_cfg/entrypoint.sh"
 
   sftp-server:
     container_name: sftp-server
index 4e75e0a..13ce589 100644 (file)
         "unitType": {
           "type": "string"
         }
-      },
-      "required": [
-        "serialNumber",
-        "vendorName",
-        "oamV4IpAddress",
-        "oamV6IpAddress",
-        "unitFamily",
-        "modelNumber",
-        "softwareVersion",
-        "unitType"
-      ]
+      }
     },
     "notificationParams": {
       "type": "object",
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/entrypoint.sh b/test/mocks/pnfsimulator/netopeer_tls_cfg/entrypoint.sh
new file mode 100755 (executable)
index 0000000..45b30a1
--- /dev/null
@@ -0,0 +1,2 @@
+nohup /netopeer_tls_cfg/update_tls.sh &
+exec /usr/bin/supervisord -c "/etc/supervisord.conf"
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.data b/test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.data
new file mode 100644 (file)
index 0000000..63872ee
--- /dev/null
@@ -0,0 +1,10 @@
+{
+  "mynetconf:netconflist": {
+    "netconf": [
+      {
+        "netconf-id": 3,
+        "netconf-param": 3
+      }
+    ]
+  }
+}
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.yang b/test/mocks/pnfsimulator/netopeer_tls_cfg/mynetconf.yang
new file mode 100644 (file)
index 0000000..a0c094b
--- /dev/null
@@ -0,0 +1,26 @@
+module mynetconf {
+  yang-version 1.1;
+  namespace "urn:mynetconf:test";
+
+  prefix nft;
+
+  organization "mynetconf";
+  contact "my netconf address";
+  description "yang model for mynetconf";
+  revision "2019-03-01"{
+    description "initial version";
+  }
+
+  container netconflist{
+    list netconf{
+      key netconf-id;
+      leaf netconf-id{ 
+        type uint16;
+      }
+      leaf netconf-param {
+        type uint32;
+      }
+    }
+
+  }
+}
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem b/test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem
new file mode 100644 (file)
index 0000000..d61c77b
--- /dev/null
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAsdI1TBjzX1PgQXFuPCw5/kQwU7qkrhirMcFAXhI8EoXepPa9
+fKAVuMjHW32P6nNzDpnhFe0YGdNloIEN3hJJ87cVOqj4o7zZMbq3zVG2L8As7MTA
+8tYXm2fSC/0rIxxRRemcGUXM0q+4LEACjZj2pOKonaivF5VbhgNjPCO1Jj/TamUc
+0aViE577C9L9EiObGM+bGbabWk/KWKLsvxUc+sKZXaJ7psTVgpggJAkUszlmwOQg
+FiMSR53E9/CAkQYhzGVCmH44Vs6Hzs3RZjOTbce4wr4ongiA5LbPeSNSCFjy9loK
+paE1rtOjkNBVdiNPCQTmLuODXUTKgkeL+9v/OwIDAQABAoIBAG/4MG1JbL4C/7vV
+pBcpth7Aaznd1eJ2UB4VVOWnT8JOH2L6p1h5KRRhAP9AMkXsCnAQPyZiVAG3FlAZ
+01SZaY2YJDr6uQ3JVW4155TWtgSdWux//Ass+lJ17lJ0SRxjsV13ez6CsDWeRjc+
+2xy0S+KJgqk71XzhJG9fZLYyuddp3U/i3xFPUAcQM9xXKxcaD7g6LJf+a9pt6rim
+Eqq/pjJxDgTsRLARsazYuxrlOB445mvnLiYhOf2/MvI80jIUKaj8BeAhg49UIg/k
+mIh0xdevkcxBFer/BjBjscWaFjx14D6nkFMw7vtCum5KfalLN2edZKAzByOudGD4
+5KnRp3ECgYEA6vnSoNGg9Do80JOpXRGYWhcR1lIDO5yRW5rVagncCcW5Pn/GMtNd
+x2q6k1ks8mXKR9CxZrxZGqeYObZ9a/5SLih7ZkpiVWXG8ZiBIPhP6lnwm5OeIqLa
+hr0BYWcRfrGg1phj5uySZgsVBE+D8jH42O9ccdvrWv1OiryAHfKIcwMCgYEAwbs+
+HfQtvHOQXSYNhtOeA7IetkGy3cKVg2oILNcROvI96hS0MZKt1Rko0UAapx96eCIr
+el7vfdT0eUzNqt2wTKp1zmiG+SnX3fMDJNzMwu/jb/b4wQ20IHWNDnqcqTUVRUnL
+iksLFoHbTxsN5NpEQExcSt/zzP4qi1W2Bmo18WkCgYEAnhrk16LVux9ohiulHONW
+8N9u+BeM51JtGAcxrDzgGo85Gs2czdwc0K6GxdiN/rfxCKtqgqcfCWlVaxfYgo7I
+OxiwF17blXx7BVrJICcUlqpX1Ebac5HCmkCYqjJQuj/I6jv1lI7/3rt8M79RF+j5
++PXt7Qq97SZd78nwJrZni4MCgYAiPjZ8lOyAouyhilhZvI3xmUpUbMhw6jQDRnqr
+clhZUvgeqAoxuPuA7zGHywzq/WVoVqHYv28Vjs6noiu4R/chlf+8vD0fTYYadRnZ
+Ki4HRt+sqrrNZN6x3hVQudt3DSr1VFXl293Z3JonIWETUoE93EFz+qHdWg+rETtb
+ZuqiAQKBgD+HI/syLECyO8UynuEaDD7qPl87PJ/CmZLMxa2/ZZUjhaXAW7CJMaS6
+9PIzsLk33y3O4Qer0wx/tEdfnxMTBJrgGt/lFFdAKhSJroZ45l5apiavg1oZYp89
+jSd0lVxWSmrBjBZLnqOl336gzaBVkBD5ND+XUPdR1UuVQExJlem4
+-----END RSA PRIVATE KEY-----
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem.pub b/test/mocks/pnfsimulator/netopeer_tls_cfg/test_server_key.pem.pub
new file mode 100644 (file)
index 0000000..9ccec4a
--- /dev/null
@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsdI1TBjzX1PgQXFuPCw5
+/kQwU7qkrhirMcFAXhI8EoXepPa9fKAVuMjHW32P6nNzDpnhFe0YGdNloIEN3hJJ
+87cVOqj4o7zZMbq3zVG2L8As7MTA8tYXm2fSC/0rIxxRRemcGUXM0q+4LEACjZj2
+pOKonaivF5VbhgNjPCO1Jj/TamUc0aViE577C9L9EiObGM+bGbabWk/KWKLsvxUc
++sKZXaJ7psTVgpggJAkUszlmwOQgFiMSR53E9/CAkQYhzGVCmH44Vs6Hzs3RZjOT
+bce4wr4ongiA5LbPeSNSCFjy9loKpaE1rtOjkNBVdiNPCQTmLuODXUTKgkeL+9v/
+OwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/test/mocks/pnfsimulator/netopeer_tls_cfg/update_tls.sh b/test/mocks/pnfsimulator/netopeer_tls_cfg/update_tls.sh
new file mode 100755 (executable)
index 0000000..4091bea
--- /dev/null
@@ -0,0 +1,28 @@
+#!/bin/bash
+sleep 20
+NETOPEER_CONFIG_PATH='/opt/dev/Netopeer2/server/configuration'
+MOUNT_PATH='/netopeer_tls_cfg'
+KEY_PATH='/usr/local/etc/keystored/keys'
+SUBSCRIBE_APP_PATH='/opt/dev/sysrepo/build/examples/application_changes_example'
+
+# This function uploads test_data and model into netopeer2 server
+upload_yang_data_model()
+{
+  sysrepoctl -i -g $MOUNT_PATH/mynetconf.yang
+  $SUBSCRIBE_APP_PATH mynetconf > /dev/null &
+  sysrepocfg --datastore=running --format=json mynetconf --import=$MOUNT_PATH/mynetconf.data
+}
+
+# This function configures server/trusted certificates into Netopeer
+configure_tls()
+{
+  sed -i "s/>test</>netconf</g" $NETOPEER_CONFIG_PATH/tls_listen.xml
+  sysrepocfg --datastore=running --format=xml ietf-keystore --merge=$NETOPEER_CONFIG_PATH/load_server_certs.xml
+  sysrepocfg --datastore=running --format=xml ietf-netconf-server --merge=$NETOPEER_CONFIG_PATH/tls_listen.xml
+}
+
+cp $MOUNT_PATH/test_server_key.pem $KEY_PATH
+cp $MOUNT_PATH/test_server_key.pem.pub $KEY_PATH
+configure_tls
+upload_yang_data_model
+
index 288ecb6..2a1402b 100644 (file)
 </parent>
 
 <properties>
-    <dockerLocation>${basedir}/target</dockerLocation>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>1.8</java.version>
+    <dockerLocation>${basedir}/target</dockerLocation>
+    <docker.tag>latest</docker.tag>
+    <docker.maven.plugin.version>1.2.0</docker.maven.plugin.version>
     <versions.jackson>2.8.9</versions.jackson>
     <jetty.version>9.2.22.v20170606</jetty.version>
     <start-class>org.onap.integration.test.mocks.sniroemulator.MockApplication</start-class>
         <plugin>
             <groupId>com.spotify</groupId>
             <artifactId>docker-maven-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>${docker.maven.plugin.version}</version>
             <configuration>
                 <verbose>true</verbose>
                 <registryUrl>${docker.push.registry}</registryUrl>
                 <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                 <dockerDirectory>${dockerLocation}</dockerDirectory>
                 <imageTags>
-                    <imageTag>latest</imageTag>
+                    <imageTag>${docker.tag}</imageTag>
                 </imageTags>
                 <forceTags>true</forceTags>
             </configuration>
index 05f3a5a..65e129a 100644 (file)
@@ -1,10 +1,13 @@
-FROM openjdk:8-jre
+FROM openjdk:8-jre-alpine
 
 MAINTAINER Geora Barsky <georab@amdocs.com>
 
+# need bash as most scripts expect it
+RUN apk --no-cache add bash
+
 RUN mkdir -p /var/wiremock/lib/ 
 
-ADD sniroemulator.jar /var/wiremock/lib/app.jar
+COPY sniroemulator.jar /var/wiremock/lib/app.jar
 
 WORKDIR /home/wiremock
 
index 94d86a6..0d89d8e 100644 (file)
@@ -14,15 +14,17 @@ onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
 onap/aaf/sms,3.0.1-SNAPSHOT-latest
 onap/aaf/smsquorumclient,3.0.1-SNAPSHOT-latest
 onap/aaf/testcaservice,3.0.0-SNAPSHOT-latest
-onap/aai-graphadmin,1.0-STAGING-latest
-onap/aai-resources,1.3-STAGING-latest
-onap/aai-traversal,1.3-STAGING-latest
+onap/aai-graphadmin,1.1-STAGING-latest
+onap/aai-resources,1.4-STAGING-latest
+onap/aai-schema-service,1.0-STAGING-latest
+onap/aai-traversal,1.4-STAGING-latest
 onap/aai/esr-gui,1.2.2-STAGING-latest
 onap/aai/esr-server,1.2.2-STAGING-latest
 onap/admportal-sdnc-image,1.4-STAGING-latest
 onap/appc-cdt-image,1.4.3-SNAPSHOT-latest
 onap/appc-image,1.5.0-SNAPSHOT-latest
 onap/babel,1.4-STAGING-latest
+onap/ccsdk-ansible-server-image,0.4.1-STAGING-latest
 onap/ccsdk-apps-ms-neng,0.4-STAGING-latest
 onap/ccsdk-controllerblueprints,0.4-STAGING-latest
 onap/ccsdk-dgbuilder-image,0.4-STAGING-latest
@@ -30,20 +32,20 @@ onap/ccsdk-odl-fluorine-alpine-image,0.4-STAGING-latest
 onap/ccsdk-odl-fluorine-ubuntu-image,0.4-STAGING-latest
 onap/ccsdk-odlsli-alpine-image,0.4-STAGING-latest
 onap/ccsdk-odlsli-image,0.4-STAGING-latest
-onap/champ,1.3-STAGING-latest
+onap/champ,1.4-STAGING-latest
 onap/clamp,3.0-STAGING-latest
 onap/clamp-dashboard-kibana,3.0-STAGING-latest
 onap/clamp-dashboard-logstash,3.0-STAGING-latest
 onap/cli,2.0.4
-onap/data-router,1.3-STAGING-latest
+onap/data-router,1.4-STAGING-latest
 onap/dcae-be,1.3-STAGING-latest
 onap/dcae-dt,1.2-STAGING-latest
 onap/dcae-fe,1.3-STAGING-latest
 onap/dcae-tools,1.3-STAGING-latest
 onap/dcae-tosca-app,1.3-STAGING-latest
 onap/dmaap/buscontroller,1.0.23
-onap/dmaap/datarouter-node,latest
-onap/dmaap/datarouter-prov,latest
+onap/dmaap/datarouter-node,2.0.1-SNAPSHOT
+onap/dmaap/datarouter-prov,2.0.1-SNAPSHOT
 onap/dmaap/dmaap-mr,1.1.10
 onap/dmaap/kafka01101,0.0.1
 onap/dmaap/zookeeper,1.0.0
@@ -52,7 +54,7 @@ onap/fproxy,2.1-STAGING-latest
 onap/gizmo,1.4-STAGING-latest
 onap/holmes/engine-management,1.2.2-STAGING-latest
 onap/holmes/rule-management,1.2.3-STAGING-latest
-onap/model-loader,1.3-STAGING-latest
+onap/model-loader,1.4-STAGING-latest
 onap/msb/msb_apigateway,1.2.2-STAGING-latest
 onap/msb/msb_discovery,1.2.2-STAGING-latest
 onap/multicloud/azure,1.2.1
@@ -68,38 +70,38 @@ onap/music/cassandra_job,3.0.24
 onap/music/cassandra_music,3.0.0
 onap/music/music,3.0.24
 onap/music/prom,1.0.5
-onap/network-discovery,1.4.2
+onap/network-discovery,1.5.0-SNAPSHOT-latest
 onap/oom/kube2msb,1.1.0
 onap/optf-cmso-dbinit,1.0.1
 onap/optf-cmso-service,1.0.1
 onap/optf-has,1.2.5
 onap/optf-osdf,1.2.4
-onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.1.1
+onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.1.1-SNAPSHOT
 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.1.0-SNAPSHOT
 onap/org.onap.dcaegen2.collectors.snmptrap,1.4.0
 onap/org.onap.dcaegen2.collectors.ves.vescollector,1.3.1
 onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
-onap/org.onap.dcaegen2.deployments.cm-container,1.5.0
-onap/org.onap.dcaegen2.deployments.healthcheck-container,1.2.3
-onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.7
+onap/org.onap.dcaegen2.deployments.cm-container,1.5.1
+onap/org.onap.dcaegen2.deployments.healthcheck-container,1.2.4
+onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.4.9
 onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
 onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
 onap/org.onap.dcaegen2.deployments.tls-init-container,1.0.0
 onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
 onap/org.onap.dcaegen2.platform.configbinding.app-app,2.2.3
-onap/org.onap.dcaegen2.platform.deployment-handler,3.1.0
+onap/org.onap.dcaegen2.platform.deployment-handler,3.2.0
 onap/org.onap.dcaegen2.platform.inventory-api,3.0.4
-onap/org.onap.dcaegen2.platform.policy-handler,4.6.0
+onap/org.onap.dcaegen2.platform.policy-handler,4.6.0-STAGING-latest
 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.5
 onap/org.onap.dcaegen2.services.prh.prh-app-server,1.2.1-SNAPSHOT
 onap/policy-apex-pdp,2.1-SNAPSHOT-latest
 onap/policy-distribution,2.1.0-SNAPSHOT-latest
 onap/policy-drools,1.4-SNAPSHOT-latest
 onap/policy-pe,1.4-SNAPSHOT-latest
-onap/pomba-aai-context-builder,1.3.3-SNAPSHOT-latest
-onap/pomba-context-aggregator,1.3.5-SNAPSHOT-latest
-onap/pomba-network-discovery-context-builder,1.3.2-SNAPSHOT-latest
-onap/pomba-sdc-context-builder,1.3.3-SNAPSHOT-latest
+onap/pomba-aai-context-builder,1.4.0-SNAPSHOT-latest
+onap/pomba-context-aggregator,1.4.0-SNAPSHOT-latest
+onap/pomba-network-discovery-context-builder,1.4.0-SNAPSHOT-latest
+onap/pomba-sdc-context-builder,1.4.0-SNAPSHOT-latest
 onap/portal-app,2.3.1
 onap/portal-db,2.3.1
 onap/portal-sdk,2.3.1
@@ -119,7 +121,7 @@ onap/sdnc-ansible-server-image,1.5-STAGING-latest
 onap/sdnc-dmaap-listener-image,1.5-STAGING-latest
 onap/sdnc-image,1.5-STAGING-latest
 onap/sdnc-ueb-listener-image,1.5-STAGING-latest
-onap/search-data-service,1.3-STAGING-latest
+onap/search-data-service,1.4-STAGING-latest
 onap/service-decomposition,1.4.2
 onap/sniroemulator,1.0.0
 onap/so/api-handler-infra,1.4.0-STAGING-latest
@@ -131,13 +133,13 @@ onap/so/sdc-controller,1.4.0-STAGING-latest
 onap/so/sdnc-adapter,1.4.0-STAGING-latest
 onap/so/so-monitoring,1.4.0-STAGING-latest
 onap/so/vfc-adapter,1.4.0-STAGING-latest
-onap/sparky-be,1.3-STAGING-latest
-onap/spike,1.3-STAGING-latest
+onap/sparky-be,1.4-STAGING-latest
+onap/spike,1.4-STAGING-latest
 onap/testsuite,1.4.0-STAGING-latest
 onap/tproxy-config,2.1-STAGING-latest
 onap/usecase-ui,1.2.2-STAGING-latest
 onap/usecase-ui-server,1.2.1-STAGING-latest
-onap/validation,1.3-STAGING-latest
+onap/validation,1.3.1
 onap/vfc/catalog,1.2.2-STAGING-latest
 onap/vfc/db,1.2.2-STAGING-latest
 onap/vfc/emsdriver,1.2.1-STAGING-latest
@@ -156,7 +158,7 @@ onap/vfc/wfengine-activiti,1.2.0-STAGING-latest
 onap/vfc/wfengine-mgrservice,1.2.0-STAGING-latest
 onap/vfc/ztesdncdriver,1.2.0-STAGING-latest
 onap/vfc/ztevnfmdriver,1.2.1-STAGING-latest
-onap/vid,3.2-STAGING-latest
+onap/vid,4.0-STAGING-latest
 onap/vnfsdk/ice,1.1.0
 onap/vnfsdk/refrepo,1.2.0
 onap/vnfsdk/refrepo/postgres,1.2.0
index efeb95a..8c84678 100644 (file)
@@ -41,8 +41,8 @@ onap/dcae-fe,1.3.0
 onap/dcae-tools,1.3.0
 onap/dcae-tosca-app,1.3.0
 onap/dmaap/buscontroller,1.0.23
-onap/dmaap/datarouter-node,2.0.0
-onap/dmaap/datarouter-prov,2.0.0
+onap/dmaap/datarouter-node,2.0.1
+onap/dmaap/datarouter-prov,2.0.1
 onap/dmaap/dmaap-mr,1.1.9
 onap/dmaap/kafka01101,0.0.1
 onap/dmaap/zookeeper,1.0.0
index 4116d94..209e7cc 100644 (file)
@@ -196,8 +196,8 @@ org.onap.dcaegen2.services.prh,prh-aai-client,1.1.1
 org.onap.dcaegen2.services.prh,prh-app-server,1.1.1
 org.onap.dcaegen2.services.prh,prh-commons,1.1.1
 org.onap.dcaegen2.services.prh,prh-dmaap-client,1.1.1
-org.onap.dmaap.datarouter.datarouter-node,2.0.0
-org.onap.dmaap.datarouter.datarouter-prov,2.0.0
+org.onap.dmaap.datarouter.datarouter-node,2.0.1
+org.onap.dmaap.datarouter.datarouter-prov,2.0.1
 org.onap.dmaap.messagerouter.dmaapclient,dmaapClient,1.0.0
 org.onap.dmaap.messagerouter.messageservice,dmaapMR1,1.0.1
 org.onap.dmaap.messagerouter.mirroragent,dmaapMMAgent,1.0.0