Restore _validate_subnet/uuid_list not to break subproject gates

https://review.openstack.org/#/c/258867/ removed
_validate_subnet_list and _validate_uuid_list.
_validate_subnet_list is being used in VPNaaS and VPNaaS gate
is now broken. We need to remove validators more carefully
because subprojects may use them.
This commit restores them once.

Change-Id: I9c40b9d67a8364f698cc9bf604e4e1f4caea413e
Closes-Bug: #1528435

diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index e3a6a0591242e2144514ac8fb81d51f9ca1b3205..6756ca782ad4baef164045029724a12e3e8f07fa 100644 (file)
--- a/neutron/api/v2/attributes.py
+++ b/neutron/api/v2/attributes.py
@@ -357,6 +357,10 @@ def _validate_subnet_or_none(data, valid_values=None):
         return _validate_subnet(data, valid_values)
 
 
+_validate_subnet_list = functools.partial(_validate_list_of_items,
+                                          _validate_subnet)
+
+
 def _validate_regex(data, valid_values=None):
     try:
         if re.match(valid_values, data):
@@ -396,6 +400,10 @@ def _validate_uuid_or_none(data, valid_values=None):
         return _validate_uuid(data)
 
 
+_validate_uuid_list = functools.partial(_validate_list_of_items,
+                                        _validate_uuid)
+
+
 def _validate_dict_item(key, key_validator, data):
     # Find conversion function, if any, and apply it
     conv_func = key_validator.get('convert_to')
@@ -611,15 +619,13 @@ validators = {'type:dict': _validate_dict,
               'type:not_empty_string_or_none':
               _validate_not_empty_string_or_none,
               'type:subnet': _validate_subnet,
-              'type:subnet_list': functools.partial(_validate_list_of_items,
-                                                    _validate_subnet),
+              'type:subnet_list': _validate_subnet_list,
               'type:subnet_or_none': _validate_subnet_or_none,
               'type:subnetpool_id': _validate_subnetpool_id,
               'type:subnetpool_id_or_none': _validate_subnetpool_id_or_none,
               'type:uuid': _validate_uuid,
               'type:uuid_or_none': _validate_uuid_or_none,
-              'type:uuid_list': functools.partial(_validate_list_of_items,
-                                                  _validate_uuid),
+              'type:uuid_list': _validate_uuid_list,
               'type:values': _validate_values,
               'type:boolean': _validate_boolean,
               'type:list_of_unique_strings': validate_list_of_unique_strings}