From 6fffe3bf841667e9a303351cf6dc05e6643b9291 Mon Sep 17 00:00:00 2001 From: Sam Betts Date: Fri, 5 Sep 2014 16:16:01 +0100 Subject: [PATCH] Remove second call to get_subnets in delete_subnet delete_subnet made calls to both get_subnet and _get_subnet, get_subnet uses _get_subnet so multiple database requests were being made, this patch removes the call to get_subnet and directly calls _make_subnet_dict using the result of _get_subnet Change-Id: I9982821dbb9447e35a4b6e50bc5ad31cec417ca5 Closes-Bug: 1366056 --- neutron/plugins/ml2/plugin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index 0de4e26d2..86100e02f 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -708,7 +708,8 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, # wait timeout' errors. with contextlib.nested(lockutils.lock('db-access'), session.begin(subtransactions=True)): - subnet = self.get_subnet(context, id) + record = self._get_subnet(context, id) + subnet = self._make_subnet_dict(record, None) # Get ports to auto-deallocate allocated = (session.query(models_v2.IPAllocation). filter_by(subnet_id=id). @@ -731,7 +732,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, mech_context) LOG.debug(_("Deleting subnet record")) - record = self._get_subnet(context, id) session.delete(record) LOG.debug(_("Committing transaction")) -- 2.45.2