ML2: remove underscore from public method

In some refactors the private method was used from
outside the class but name wasn't updated.

Change-Id: I594af2661c4773e0d2c35ec924a4142057442086

diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py
index 408d22a95d4aef85b8a6dcea3340243e683f0e07..25d148e0aeef0f22f64c11074a5ccdfd65d975c0 100644 (file)
--- a/neutron/plugins/ml2/managers.py
+++ b/neutron/plugins/ml2/managers.py
@@ -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:

diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py
index 85b87c76af2af059c9c091167f9c9a19ed50965f..ac0c90968ba0cb179aef8d8aacebbf1837336597 100644 (file)
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@ -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)

diff --git a/neutron/tests/unit/ml2/test_ml2_plugin.py b/neutron/tests/unit/ml2/test_ml2_plugin.py
index 33d7b0d4906103d9862ccc4792bb0c426c80c731..dd459eb9d5ad2ea1e25cef0cc8c53255d8dfc217 100644 (file)
--- a/neutron/tests/unit/ml2/test_ml2_plugin.py
+++ b/neutron/tests/unit/ml2/test_ml2_plugin.py
@@ -862,8 +862,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])