openstack
/
neutron
Code Issues Proposed changes

Allow ovn_db_sync to continue on duplicate normalised CIDR 

OVN now uses normalised CIDR when adding a security group rule[1]. It
uses may_exist=True for adding ACL (secgroup rule), in case there are
multiple CIDRs in neutron that normalises to the same.

Do the same in ovn_db_sync, so that the sync don't fail hard on such
duplicates.

[1] https://review.opendev.org/c/openstack/neutron/+/736386/

Change-Id: I9d9c21e460029e4a6a845520bfcc2889ad20429b
Related-Bug: #1869129
Closes-Bug: #1961112
(cherry picked from commit 5a0a2b7847)
This commit is contained in:
Jake Yip 2021-07-20 17:03:08 +10:00 committed by Slawek Kaplonski
parent c6d3f90bee
commit bf308a12a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,7 +297,7 @@ class OvnNbSynchronizer(OvnDbSynchronizer):
for acla in neutron_acls:
LOG.warning('ACL found in Neutron but not in '
'OVN DB for port group %s', acla['port_group'])
txn.add(self.ovn_api.pg_acl_add(**acla))
txn.add(self.ovn_api.pg_acl_add(**acla, may_exist=True))
with self.ovn_api.transaction(check_error=True) as txn:
for aclr in ovn_acls: