openstack/neutron
Code Issues Proposed changes

ml2: Simplify _process_provider_create

Browse Source 
There's little point to extract attributes from a dict,
construct another dict, and make _process_provider_segment
extract attributes from the dict again.

Change-Id: I19ad6e8805aaaeaff2c60e8a2854681b2b59d2fa
This commit is contained in:
YAMAMOTO Takashi 2015-01-29 16:10:27 +09:00
parent e18f0cb003
commit a3ab3eb276
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

@ -86,10 +86,6 @@ class TypeManager(stevedore.named.NamedExtensionManager):
msg = _("network_type required") msg = _("network_type required")
raise exc.InvalidInput(error_message=msg) 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): def _process_provider_create(self, network):
if any(attributes.is_attr_set(network.get(attr)) if any(attributes.is_attr_set(network.get(attr))
for attr in provider.ATTRIBUTES): for attr in provider.ATTRIBUTES):
@ -97,9 +93,7 @@ class TypeManager(stevedore.named.NamedExtensionManager):
# at the same time. # at the same time.
if attributes.is_attr_set(network.get(mpnet.SEGMENTS)): if attributes.is_attr_set(network.get(mpnet.SEGMENTS)):
raise mpnet.SegmentsSetInConjunctionWithProviders() raise mpnet.SegmentsSetInConjunctionWithProviders()
return [self._process_provider_segment(network)]
segments = [self._get_segment_attributes(network)]
return [self._process_provider_segment(s) for s in segments]
elif attributes.is_attr_set(network.get(mpnet.SEGMENTS)): elif attributes.is_attr_set(network.get(mpnet.SEGMENTS)):
segments = [self._process_provider_segment(s) segments = [self._process_provider_segment(s)
for s in network[mpnet.SEGMENTS]] for s in network[mpnet.SEGMENTS]]