From 20a608ce0d4a849f30d7125cf1dd63e81dc8cccc Mon Sep 17 00:00:00 2001 From: tierno Date: Tue, 2 Oct 2018 13:43:47 +0200 Subject: [PATCH] fix bug 555 Change extended pci validation schema for sdn port mapping Change-Id: I04eb9e35d313dcd61203e96f80a1c21ba78b6088 Signed-off-by: tierno --- openmanod | 4 ++-- osm_ro/openmano_schemas.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openmanod b/openmanod index a6f5fc7e..f842acc7 100755 --- a/openmanod +++ b/openmanod @@ -48,8 +48,8 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "0.5.78-r588" -version_date = "Sep 2018" +__version__ = "0.5.79-r589" +version_date = "Oct 2018" database_version = 32 # expected database schema version diff --git a/osm_ro/openmano_schemas.py b/osm_ro/openmano_schemas.py index e3c4c672..4238237d 100644 --- a/osm_ro/openmano_schemas.py +++ b/osm_ro/openmano_schemas.py @@ -37,7 +37,8 @@ description_schema={"type" : ["string","null"], "maxLength":255, "pattern" : "^[ id_schema_fake = {"type" : "string", "minLength":2, "maxLength":36 } #"pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" id_schema = {"type" : "string", "pattern": "^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$"} pci_schema={"type":"string", "pattern":"^[0-9a-fA-F]{4}(:[0-9a-fA-F]{2}){2}\.[0-9a-fA-F]$"} -pci_extended_schema = {"type": "string", "pattern": "^[0-9a-fA-F.:-\[\]]$"} +# allows [] for wildcards. For that reason huge length limit is set +pci_extended_schema = {"type": "string", "pattern": "^[0-9a-fA-F.:-\[\]]{12,40}$"} http_schema={"type":"string", "pattern":"^https?://[^'\"=]+$"} bandwidth_schema={"type":"string", "pattern" : "^[0-9]+ *([MG]bps)?$"} -- 2.25.1