openstack
/
neutron
Code Issues Proposed changes

Merge "ML2: remove underscore from public method"

This commit is contained in:
Jenkins 2015-02-19 19:40:25 +00:00 committed by Gerrit Code Review
parent 34a44ae074 cc5d0f418a
commit fc0b6ae80a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@ class TypeManager(stevedore.named.NamedExtensionManager):
value = None
return value
def _extend_network_dict_provider(self, context, network):
def extend_network_dict_provider(self, context, network):
id = network['id']
segments = db.get_network_segments(context.session, id)
if not segments:

10
neutron/plugins/ml2/plugin.py
View File

@ -593,7 +593,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
net_data['id'] = result['id']
self.type_manager.create_network_segments(context, net_data,
tenant_id)
self.type_manager._extend_network_dict_provider(context, result)
self.type_manager.extend_network_dict_provider(context, result)
mech_context = driver_context.NetworkContext(self, context,
result)
self.mechanism_manager.create_network_precommit(mech_context)
@ -628,8 +628,8 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
original_network)
self._process_l3_update(context, updated_network,
network['network'])
self.type_manager._extend_network_dict_provider(context,
updated_network)
self.type_manager.extend_network_dict_provider(context,
updated_network)
mech_context = driver_context.NetworkContext(
self, context, updated_network,
original_network=original_network)
@ -646,7 +646,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
session = context.session
with session.begin(subtransactions=True):
result = super(Ml2Plugin, self).get_network(context, id, None)
self.type_manager._extend_network_dict_provider(context, result)
self.type_manager.extend_network_dict_provider(context, result)
return self._fields(result, fields)
@ -658,7 +658,7 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2,
self).get_networks(context, filters, None, sorts,
limit, marker, page_reverse)
for net in nets:
self.type_manager._extend_network_dict_provider(context, net)
self.type_manager.extend_network_dict_provider(context, net)
nets = self._filter_nets_provider(context, nets, filters)
nets = self._filter_nets_l3(context, nets, filters)

4
neutron/tests/unit/ml2/test_ml2_plugin.py
View File

@ -946,8 +946,8 @@ class TestMultiSegmentNetworks(Ml2PluginV2TestCase):
def test_extend_dictionary_no_segments(self):
network = dict(name='net_no_segment', id='5', tenant_id='tenant_one')
self.driver.type_manager._extend_network_dict_provider(self.context,
network)
self.driver.type_manager.extend_network_dict_provider(self.context,
network)
self.assertIsNone(network[pnet.NETWORK_TYPE])
self.assertIsNone(network[pnet.PHYSICAL_NETWORK])
self.assertIsNone(network[pnet.SEGMENTATION_ID])