import validate_regex from neutron_lib

Code Issues Proposed changes

With this change we now import validate_regex from neutron_lib.
Additionally, we remove useless code (the plurals in our API are
not special).
Change-Id: I5bdf8b66274d5808c9e49e0e03da3c1e88f76e0a

This commit is contained in:

Thomas Morin

2016年10月04日 11:26:03 +02:00

parent fb3a21e394

commit 82a445eaa1

1 changed files with 1 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

10
networking_bgpvpn/neutron/extensions/bgpvpn.py

View File

@@ -18,7 +18,6 @@ import abc

import six

from neutron.api import extensions

from neutron.api.v2 import attributes as attr

from neutron.api.v2 import base

from neutron.api.v2 import resource_helper

from neutron import manager

@@ -110,7 +109,7 @@ def _validate_rt_list(data, valid_values=None):

return msg

for item in data:

msg = attr._validate_regex(item, constants.RT_REGEX)

msg = api.validators.validate_regex(item, constants.RT_REGEX)

if msg:

LOG.debug(msg)

return msg

@@ -241,13 +240,6 @@ class Bgpvpn(extensions.ExtensionDescriptor):

def get_resources(cls):

plural_mappings = resource_helper.build_plural_mappings(

{}, RESOURCE_ATTRIBUTE_MAP)

plural_mappings['route_targets'] = 'route_target'

plural_mappings['import_targets'] = 'import_target'

plural_mappings['export_targets'] = 'export_target'

plural_mappings['route_distinguishers'] = 'route_distinguishers'

plural_mappings['network_associations'] = 'network_association'

plural_mappings['router_associations'] = 'router_association'

attr.PLURALS.update(plural_mappings)

resources = resource_helper.build_resource_info(plural_mappings,

RESOURCE_ATTRIBUTE_MAP,

constants.BGPVPN,

import validate_regex from neutron_lib

10 networking_bgpvpn/neutron/extensions/bgpvpn.py Unescape Escape View File

10
networking_bgpvpn/neutron/extensions/bgpvpn.py

View File