openstack
/
neutron
Code Issues Proposed changes

Make it explicit ovs_firewall operates with ip, mac pairs 

The semantics changed since I2e3aa7c400d7bb17cc117b65faaa160b41013dde
but the code was not updated to reflect it explicitly.

This patch modifies _update_flows_for_vlan_subr.

Change-Id: Id5e0d8bcc379f19dc85b23b4602be4e0e82f3d00
This commit is contained in:
Ihar Hrachyshka 2024-04-26 22:39:28 -04:00
parent ae704369b5
commit a69bd0dd60
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
neutron/agent/linux/openvswitch_firewall/firewall.py
View File

@ -423,16 +423,18 @@ class ConjIPFlowManager(object):
# NOTE(hangyang): Handle add/delete overlapped IPs among
# remote security groups and remote address groups
removed_ips = set([str(netaddr.IPNetwork(addr[0]).cidr) for addr in (
set(flow_state.keys()) - set(addr_to_conj.keys()))])
removed_ips = {
str(netaddr.IPNetwork(addr).cidr)
for addr, _ in set(flow_state) - set(addr_to_conj)
}
ip_to_conj = collections.defaultdict(set)
for addr, conj_ids in addr_to_conj.items():
for (addr, mac), conj_ids in addr_to_conj.items():
# Addresses from remote security groups have mac addresses,
# others from remote address groups have not.
ip_to_conj[str(netaddr.IPNetwork(addr[0]).cidr)].update(conj_ids)
ip_to_conj[str(netaddr.IPNetwork(addr).cidr)].update(conj_ids)
for addr in addr_to_conj.keys():
ip_cidr = str(netaddr.IPNetwork(addr[0]).cidr)
for addr, mac in addr_to_conj:
ip_cidr = str(netaddr.IPNetwork(addr).cidr)
# When the overlapped IP in remote security group and remote
# address group have different conjunction ids but with the
# same priority offset, we need to combine the conj_ids together
@ -440,7 +442,8 @@ class ConjIPFlowManager(object):
# creation sequence.
conj_ids = list(ip_to_conj[ip_cidr])
conj_ids.sort()
if flow_state.get(addr) == conj_ids and ip_cidr not in removed_ips:
if (flow_state.get((addr, mac)) == conj_ids and
ip_cidr not in removed_ips):
# When there are IP overlaps among remote security groups
# and remote address groups, removal of the overlapped ips
# from one remote group will also delete the flows for the
@ -449,7 +452,7 @@ class ConjIPFlowManager(object):
# ids, therefore we need to recreate the affected flows.
continue
for flow in rules.create_flows_for_ip_address(
addr, direction, ethertype, vlan_tag, conj_ids):
(addr, mac), direction, ethertype, vlan_tag, conj_ids):
self.driver._add_flow(flow_group_id=ofport, **flow)
def update_flows_for_vlan(self, vlan_tag, ofport, conj_id_to_remove=None):