From a3ab3eb276ef9a5927efa748337bd699086b1623 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Thu, 29 Jan 2015 16:10:27 +0900 Subject: [PATCH] ml2: Simplify _process_provider_create 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 --- neutron/plugins/ml2/managers.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index 84142f877..d1bbe4820 100644 --- a/neutron/plugins/ml2/managers.py +++ b/neutron/plugins/ml2/managers.py @@ -86,10 +86,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): @@ -97,9 +93,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]] -- 2.45.2