openstack
/
neutron
Code Issues Proposed changes

Merge "ml2: Simplify _process_provider_create"

This commit is contained in:
Jenkins 2015-02-15 08:41:37 +00:00 committed by Gerrit Code Review
parent 7a0a2a1ff6 a3ab3eb276
commit 12b0d4d979
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/managers.py
View File

@ -89,10 +89,6 @@ class TypeManager(stevedore.named.NamedExtensionManager):
msg = _("network_type required")
raise exc.InvalidInput(error_message=msg)
def _get_segment_attributes(self, network):
return {attr: self._get_attribute(network, attr)
for attr in provider.ATTRIBUTES}
def _process_provider_create(self, network):
if any(attributes.is_attr_set(network.get(attr))
for attr in provider.ATTRIBUTES):
@ -100,9 +96,7 @@ class TypeManager(stevedore.named.NamedExtensionManager):
# at the same time.
if attributes.is_attr_set(network.get(mpnet.SEGMENTS)):
raise mpnet.SegmentsSetInConjunctionWithProviders()
segments = [self._get_segment_attributes(network)]
return [self._process_provider_segment(s) for s in segments]
return [self._process_provider_segment(network)]
elif attributes.is_attr_set(network.get(mpnet.SEGMENTS)):
segments = [self._process_provider_segment(s)
for s in network[mpnet.SEGMENTS]]