openstack
/
neutron
Code Issues Proposed changes

Merge "[OVN] Fix db-sync-util Traceback when port security not enabled" into stable/ussuri

This commit is contained in:
Zuul 2020-07-15 10:49:01 +00:00 committed by Gerrit Code Review
parent 92471bb1b3 34c93c6c77
commit 3f4c7eeff4
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,6 +264,11 @@ UNKNOWN_ADDR = 'unknown'
PORT_CAP_SWITCHDEV = 'switchdev' PORT_CAP_SWITCHDEV = 'switchdev'
# The name of the port security group attribute is currently not in neutron nor
# neutron-lib api definitions or constants. To avoid importing the extension
# code directly we keep a copy here.
PORT_SECURITYGROUPS = 'security_groups'
# TODO(lucasagomes): Create constants for other LSP types # TODO(lucasagomes): Create constants for other LSP types
LSP_TYPE_LOCALNET = 'localnet' LSP_TYPE_LOCALNET = 'localnet'
LSP_TYPE_VIRTUAL = 'virtual' LSP_TYPE_VIRTUAL = 'virtual'

4
neutron/common/ovn/utils.py
View File

@ -210,6 +210,10 @@ def is_port_security_enabled(port):
return port.get(psec.PORTSECURITY) return port.get(psec.PORTSECURITY)
def is_security_groups_enabled(port):
return port.get(constants.PORT_SECURITYGROUPS)
def validate_and_get_data_from_binding_profile(port): def validate_and_get_data_from_binding_profile(port):
if (constants.OVN_PORT_BINDING_PROFILE not in port or if (constants.OVN_PORT_BINDING_PROFILE not in port or
not validators.is_attr_set( not validators.is_attr_set(

4
neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py
View File

@ -220,8 +220,8 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
# already exists in OVN. The rest will be added during the # already exists in OVN. The rest will be added during the
# ports sync operation later. # ports sync operation later.
for n_port in db_ports: for n_port in db_ports:
if ((n_port['security_groups'] or if ((utils.is_security_groups_enabled(n_port) or
n_port['port_security_enabled']) and utils.is_port_security_enabled(n_port)) and
n_port['id'] in ovn_ports): n_port['id'] in ovn_ports):
txn.add(self.ovn_api.pg_add_ports( txn.add(self.ovn_api.pg_add_ports(
pg, n_port['id'])) pg, n_port['id']))

6
neutron/tests/unit/common/ovn/test_utils.py
View File

@ -88,6 +88,12 @@ class TestUtils(base.BaseTestCase):
self.assertEqual( self.assertEqual(
[], utils.get_chassis_availability_zones(chassis)) [], utils.get_chassis_availability_zones(chassis))
def test_is_security_groups_enabled(self):
self.assertTrue(utils.is_security_groups_enabled(
{constants.PORT_SECURITYGROUPS: ['fake']}))
self.assertFalse(utils.is_security_groups_enabled(
{}))
class TestGateWayChassisValidity(base.BaseTestCase): class TestGateWayChassisValidity(base.BaseTestCase):