From 2673610db7b876ced4b296dd28d2fb5a40fee438 Mon Sep 17 00:00:00 2001
From: deen1985 <damian.nowak@nokia.com>
Date: Mon, 16 Nov 2020 15:48:55 +0100
Subject: [VES CommonEventSchema] More restrictive ipv4 and ipv6 checks for
 pnfRegistration fields.

pnfRegistrationFields.oamV4IpAddress and pnfRegistrationFields.oamV6IpAddress using format "ipv4" and "ipv6" respectively.

Signed-off-by: Damian Nowak <damian.nowak@nokia.com>
Change-Id: I81ad30ffa9616da76d4c932ee631e692256c3d3a
Issue-ID: VNFRQTS-933
---
 .../ves_7_2/CommonEventFormat_30.2_ONAP.json         | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/Chapter8/ves_7_2/CommonEventFormat_30.2_ONAP.json b/docs/Chapter8/ves_7_2/CommonEventFormat_30.2_ONAP.json
index 75923c4..6ee76cb 100644
--- a/docs/Chapter8/ves_7_2/CommonEventFormat_30.2_ONAP.json
+++ b/docs/Chapter8/ves_7_2/CommonEventFormat_30.2_ONAP.json
@@ -20,21 +20,21 @@
           "type": "string"
         },
         "lastUpdatedBy": {
-          "description": "tl2972",
+          "description": "damian.nowak@nokia.com",
           "type": "string"
         },
         "schemaDate": {
-          "description": "June 2, 2020",
+          "description": "Jan 04, 2021",
           "type": "string"
         },
         "schemaVersion": {
-          "description": "30.2.0",
+          "description": "30.2.1",
           "type": "number"
         }
       }
     },
     "schemaLicenseAndCopyrightNotice": {
-      "description": "Copyright (c) 2020, AT&T Intellectual Property.  All rights reserved",
+      "description": "Copyright (c) 2020, AT&T Intellectual Property.  All rights reserved. Modification Copyright (c) 2021, Nokia Solutions and Networks.",
       "type": "object",
       "properties": {
         "apacheLicense2.0": {
@@ -200,7 +200,8 @@
             "7.0.1",
             "7.1",
             "7.1.1",
-            "7.2"
+            "7.2",
+            "7.2.1"
           ]
         }
       },
@@ -2558,17 +2559,20 @@
         },
         "oamV4IpAddress": {
           "description": "IPv4 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
+          "type": "string",
+          "format":"ipv4"
         },
         "oamV6IpAddress": {
           "description": "IPv6 m-plane IP address to be used by the manager to contact the PNF",
-          "type": "string"
+          "type": "string",
+          "format":"ipv6"
         },
         "pnfRegistrationFieldsVersion": {
           "description": "version of the pnfRegistrationFields block",
           "type": "string",
           "enum": [
-            "2.0"
+            "2.0",
+            "2.1"
           ]
         },
         "serialNumber": {
-- 
cgit 1.2.3-korg