openstack
/
neutron
Code Issues Proposed changes

Remove OVN_SG_NAME_EXT_ID_KEY constant 

It is no longer needed after the Rocky Release

Signed-off-by: Elvira García <egarciar@redhat.com>
Change-Id: I59ec5e301c012f6c61e066db862fa144ad967510
This commit is contained in:
Elvira García 2021-02-11 10:56:48 +01:00
parent a3dc80b509
commit 5a0caaaf70
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/common/ovn/constants.py
View File

@ -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'

5
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/impl_idl_ovn.py
View File

@ -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 = {}