X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=utils.py;h=a5a7858e359d0f92a7284112f5670be65d2ea876;hb=refs%2Fchanges%2F06%2F506%2F1;hp=81a01588701a63265664fd416f0d348c25d79be4;hpb=42fcc3be3eab33e0d934b8774a33629f07d47674;p=osm%2FRO.git diff --git a/utils.py b/utils.py old mode 100755 new mode 100644 index 81a01588..a5a7858e --- a/utils.py +++ b/utils.py @@ -22,7 +22,7 @@ ## ''' -auxiliary_functions is a module that implements functions that are used by all openmano modules, +utils is a module that implements functions that are used by all openmano modules, dealing with aspects such as reading/writing files, formatting inputs/outputs for quick translation from dictionaries to appropriate database dictionaries, etc. ''' @@ -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