Fixed VNF descriptor for tests

[osm/RO.git] / utils.py

diff --git a/utils.py b/utils.py
old mode 100755 (executable)
new mode 100644 (file)
index 8102773..a5a7858
--- a/utils.py
+++ b/utils.py
@@ -167,9 +167,15 @@ def convert_str2boolean(data, items):
 
 def check_valid_uuid(uuid):
     id_schema = {"type" : "string", "pattern": "^[a-fA-F0-9]{8}(-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}$"}
+    id_schema2 = {"type" : "string", "pattern": "^[a-fA-F0-9]{32}$"}
     try:
         js_v(uuid, id_schema)
         return True
     except js_e.ValidationError:
-        return False
+        try:
+            js_v(uuid, id_schema2)
+            return True
+        except js_e.ValidationError:
+            return False
+    return False