From ff946b9d51dc5642e58af0c33a663cdfbf6c77d5 Mon Sep 17 00:00:00 2001 From: Oleg Bondarev Date: Wed, 24 Feb 2021 16:31:48 +0400 Subject: [PATCH] Remove redundant _ensure_default_security_group _ensure_default_security_group() is done in _ensure_default_security_group_handler [1] on each port BEFORE_CREATE event. No need to ensure once again right after sending this event. [1] https://github.com/openstack/neutron/blob/084fa99874e882649aa6895941fa913b2b852868/neutron/db/securitygroups_db.py#L894 TrivialFix Change-Id: I1bfe2a50b52502b5ab3631c016a617f7a9756cc6 (cherry picked from commit bdf1416958f79e8076397fcbf2fbbc920f964b37) --- neutron/plugins/ml2/plugin.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/neutron/plugins/ml2/plugin.py b/neutron/plugins/ml2/plugin.py index ff0604facb9..c77e088f465 100644 --- a/neutron/plugins/ml2/plugin.py +++ b/neutron/plugins/ml2/plugin.py @@ -1385,9 +1385,6 @@ class Ml2Plugin(db_base_plugin_v2.NeutronDbPluginV2, registry.notify(resources.PORT, events.BEFORE_CREATE, self, context=context, port=attrs) - # NOTE(kevinbenton): triggered outside of transaction since it - # emits 'AFTER' events if it creates. - self._ensure_default_security_group(context, attrs['tenant_id']) def _create_port_db(self, context, port): attrs = port[port_def.RESOURCE_NAME]