Merge "Use neutron-lib add_validator for registration"

neutron/api/v2/attributes.py

@@ -430,8 +430,9 @@ def convert_value(attr_info, res_dict, exc_cls=ValueError):
         if 'validate' not in attr_vals:
             continue
         for rule in attr_vals['validate']:
-            res = lib_validators.validators[rule](res_dict[attr],
-                                                  attr_vals['validate'][rule])
+            validator = lib_validators.get_validator(rule)
+            res = validator(res_dict[attr], attr_vals['validate'][rule])
+
             if res:
                 msg_dict = dict(attr=attr, reason=res)
                 msg = _("Invalid input for %(attr)s. "

neutron/extensions/allowedaddresspairs.py

@@ -93,8 +93,8 @@ def _validate_allowed_address_pairs(address_pairs, valid_values=None):
         if msg:
             raise webob.exc.HTTPBadRequest(msg)
 
-validators.validators['type:validate_allowed_address_pairs'] = (
-    _validate_allowed_address_pairs)
+validators.add_validator('validate_allowed_address_pairs',
+                         _validate_allowed_address_pairs)
 
 ADDRESS_PAIRS = 'allowed_address_pairs'
 EXTENDED_ATTRIBUTES_2_0 = {

neutron/extensions/availability_zone.py

@@ -48,9 +48,8 @@ def _validate_availability_zone_hints(data, valid_value=None):
         msg = _("Too many availability_zone_hints specified")
         raise exceptions.InvalidInput(error_message=msg)
 
-
-validators.validators['type:availability_zone_hints'] = (
-    _validate_availability_zone_hints)
+validators.add_validator('availability_zone_hints',
+                         _validate_availability_zone_hints)
 
 # Attribute Map
 RESOURCE_NAME = 'availability_zone'

neutron/extensions/dns.py

@@ -196,11 +196,9 @@ def convert_to_lowercase(data):
     msg = _("'%s' cannot be converted to lowercase string") % data
     raise n_exc.InvalidInput(error_message=msg)
 
-
-validators.validators['type:dns_name'] = _validate_dns_name
-validators.validators['type:fip_dns_name'] = _validate_fip_dns_name
-validators.validators['type:dns_domain'] = _validate_dns_domain
-
+validators.add_validator('dns_name', _validate_dns_name)
+validators.add_validator('fip_dns_name', _validate_fip_dns_name)
+validators.add_validator('dns_domain', _validate_dns_domain)
 
 DNSNAME = 'dns_name'
 DNSDOMAIN = 'dns_domain'

neutron/extensions/extra_dhcp_opt.py

@@ -62,9 +62,8 @@ def _validate_extra_dhcp_opt(data, key_specs=None):
             if msg:
                 raise ExtraDhcpOptBadData(data=msg)
 
-
-validators.validators['type:list_of_extra_dhcp_opts'] = (
-    _validate_extra_dhcp_opt)
+validators.add_validator('list_of_extra_dhcp_opts',
+                         _validate_extra_dhcp_opt)
 
 # Attribute Map
 EXTRADHCPOPTS = 'extra_dhcp_opts'

neutron/extensions/flavors.py

@@ -78,8 +78,8 @@ def _validate_flavor_service_type(validate_type, valid_values=None):
     if validate_type not in plugins:
         raise InvalidFlavorServiceType(service_type=validate_type)
 
-validators.validators['type:validate_flavor_service_type'] = (
-    _validate_flavor_service_type)
+validators.add_validator('validate_flavor_service_type',
+                         _validate_flavor_service_type)
 
 FLAVORS = 'flavors'
 SERVICE_PROFILES = 'service_profiles'

neutron/extensions/multiprovidernet.py

@@ -67,10 +67,8 @@ def check_duplicate_segments(segments, is_partial_func=None):
     if len(set(fully_specifieds)) != len(fully_specifieds):
         raise SegmentsContainDuplicateEntry()
 
-
-validators.validators['type:convert_segments'] = (
-    _convert_and_validate_segments)
-
+validators.add_validator('convert_segments',
+                         _convert_and_validate_segments)
 
 EXTENDED_ATTRIBUTES_2_0 = {
     'networks': {

neutron/extensions/securitygroup.py

@@ -207,8 +207,7 @@ def _validate_name_not_default(data, valid_values=None):
     if data.lower() == "default":
         raise SecurityGroupDefaultAlreadyExists()
 
-
-validators.validators['type:name_not_default'] = _validate_name_not_default
+validators.add_validator('name_not_default', _validate_name_not_default)
 
 sg_supported_protocols = ([None] + list(const.IP_PROTOCOL_MAP.keys()))
 sg_supported_ethertypes = ['IPv4', 'IPv6']