From 5a0caaaf7084d1fc55ac56feb033ad21bd6fa95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elvira=20Garc=C3=ADa?= Date: Thu, 11 Feb 2021 10:56:48 +0100 Subject: [PATCH] Remove OVN_SG_NAME_EXT_ID_KEY constant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is no longer needed after the Rocky Release Signed-off-by: Elvira García Change-Id: I59ec5e301c012f6c61e066db862fa144ad967510 --- neutron/common/ovn/constants.py | 2 -- .../ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/neutron/common/ovn/constants.py b/neutron/common/ovn/constants.py index 236b74d6eb9..031cf065fcc 100644 --- a/neutron/common/ovn/constants.py +++ b/neutron/common/ovn/constants.py @@ -15,8 +15,6 @@ import re from neutron_lib.api.definitions import portbindings from neutron_lib import constants as const -# TODO(lucasagomes): Remove OVN_SG_NAME_EXT_ID_KEY in the Rocky release -OVN_SG_NAME_EXT_ID_KEY = 'neutron:security_group_name' OVN_SG_EXT_ID_KEY = 'neutron:security_group_id' OVN_SG_RULE_EXT_ID_KEY = 'neutron:security_group_rule_id' OVN_ML2_MECH_DRIVER_NAME = 'ovn' diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py index 6243e1c9515..0c6d1dff306 100644 --- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py +++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py @@ -538,10 +538,7 @@ class OvsdbNbOvnIdl(nb_impl_idl.OvnNbApiIdlImpl, Backend): def get_address_sets(self): address_sets = {} for row in self._tables['Address_Set'].rows.values(): - # TODO(lucasagomes): Remove OVN_SG_NAME_EXT_ID_KEY in the - # Rocky release - if not (ovn_const.OVN_SG_EXT_ID_KEY in row.external_ids or - ovn_const.OVN_SG_NAME_EXT_ID_KEY in row.external_ids): + if not (ovn_const.OVN_SG_EXT_ID_KEY in row.external_ids): continue name = getattr(row, 'name') data = {}