X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Fvalidation.py;h=e5c2a0328fe2addfbad187fd8aef8325b7f3fe15;hb=5f3111606f278c4b21c9f0d37b7c5c9af92cfe43;hp=4dafed5dc66497486da89a2f58b8629fffd3d417;hpb=acdb5d4d3d2452b5a7f3be87190875d3a06e6999;p=osm%2FNBI.git

diff --git a/osm_nbi/validation.py b/osm_nbi/validation.py
index 4dafed5..e5c2a03 100644
--- a/osm_nbi/validation.py
+++ b/osm_nbi/validation.py
@@ -35,10 +35,6 @@ shortname_schema = {
     "pattern": "^[^,;()\\.\\$'\"]+$",
 }
 passwd_schema = {"type": "string", "minLength": 1, "maxLength": 60}
-user_passwd_schema = {
-    "type": "string",
-    "pattern": "^.*(?=.{8,})((?=.*[!@#$%^&*()\\-_=+{};:,<.>]){1})(?=.*\\d)((?=.*[a-z]){1})((?=.*[A-Z]){1}).*$",
-}
 name_schema = {
     "type": "string",
     "minLength": 1,
@@ -1086,7 +1082,7 @@ user_new_schema = {
     "properties": {
         "username": string_schema,
         "domain_name": shortname_schema,
-        "password": user_passwd_schema,
+        "password": passwd_schema,
         "projects": nameshort_list_schema,
         "project_role_mappings": project_role_mappings,
     },
@@ -1098,16 +1094,13 @@ user_edit_schema = {
     "title": "User edit schema for administrators",
     "type": "object",
     "properties": {
-        "password": user_passwd_schema,
+        "password": passwd_schema,
         "old_password": passwd_schema,
         "username": string_schema,  # To allow User Name modification
         "projects": {"oneOf": [nameshort_list_schema, array_edition_schema]},
         "project_role_mappings": project_role_mappings,
         "add_project_role_mappings": project_role_mappings,
         "remove_project_role_mappings": project_role_mappings_optional,
-        "system_admin_id": id_schema,
-        "unlock": bool_schema,
-        "renew": bool_schema,
     },
     "minProperties": 1,
     "additionalProperties": False,