openstack
/
neutron
Code Issues Proposed changes

Merge "Rename create_flows_for_ip_address to reflect it accepts (ip, mac)"

This commit is contained in:
Zuul 2024-05-20 11:27:06 +00:00 committed by Gerrit Code Review
parent 527e712a18 d040a38f49
commit dcfe7c4a4d
4 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,11 +415,11 @@ class ConjIPFlowManager(object):
flow_state, addr_to_conj, direction, ethertype, vlan_tag)
for conj_id_set in conj_id_to_remove:
# Remove any remaining flow with remote SG/AG ID conj_id_to_remove
for current_ip, conj_ids in flow_state.items():
for (current_ip, current_mac), conj_ids in flow_state.items():
conj_ids_to_remove = conj_id_set & set(conj_ids)
self.driver.delete_flow_for_ip(
current_ip, direction, ethertype, vlan_tag,
conj_ids_to_remove)
current_ip, current_mac, direction, ethertype,
vlan_tag, conj_ids_to_remove)
# NOTE(hangyang): Handle add/delete overlapped IPs among
# remote security groups and remote address groups
@ -451,8 +451,8 @@ class ConjIPFlowManager(object):
# match flow priority or actions for different conjunction
# ids, therefore we need to recreate the affected flows.
continue
for flow in rules.create_flows_for_ip_address(
(addr, mac), direction, ethertype, vlan_tag, conj_ids):
for flow in rules.create_flows_for_ip_address_and_mac(
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):
@ -1621,23 +1621,24 @@ class OVSFirewallDriver(firewall.FirewallDriver):
self, flow_state, addr_to_conj, direction, ethertype, vlan_tag):
# Remove rules for deleted IPs and action=conjunction(conj_id, 1/2)
removed_ips = set(flow_state.keys()) - set(addr_to_conj.keys())
for removed_ip in removed_ips:
conj_ids = flow_state[removed_ip]
self.delete_flow_for_ip(removed_ip, direction, ethertype, vlan_tag,
conj_ids)
for removed_ip, removed_mac in removed_ips:
conj_ids = flow_state[(removed_ip, removed_mac)]
self.delete_flow_for_ip(
removed_ip, removed_mac, direction,
ethertype, vlan_tag, conj_ids)
if not cfg.CONF.AGENT.explicitly_egress_direct:
return
for ip_addr in removed_ips:
for ip, mac in removed_ips:
# Generate deletion template with bogus conj_id.
self.delete_flow_for_ip(ip_addr, direction, ethertype, vlan_tag,
[0])
self.delete_flow_for_ip(
ip, mac, direction, ethertype, vlan_tag, [0])
def delete_flow_for_ip(self, ip_address, direction, ethertype,
def delete_flow_for_ip(self, ip, mac, direction, ethertype,
vlan_tag, conj_ids):
for flow in rules.create_flows_for_ip_address(
ip_address, direction, ethertype, vlan_tag, conj_ids):
for flow in rules.create_flows_for_ip_address_and_mac(
ip, mac, direction, ethertype, vlan_tag, conj_ids):
# The following del statements are partly for
# complying the OpenFlow spec. It forbids the use of
# these field in non-strict delete flow messages, and

9
neutron/agent/linux/openvswitch_firewall/rules.py
View File

@ -294,12 +294,11 @@ def _flow_priority_offset_from_conj_id(conj_id):
return conj_id % 8 // 2
def create_flows_for_ip_address(ip_address, direction, ethertype,
vlan_tag, conj_ids):
"""Create flows from a rule and an ip_address derived from
remote_group_id or remote_address_group_id
def create_flows_for_ip_address_and_mac(ip_address, mac_address, direction,
ethertype, vlan_tag, conj_ids):
"""Create flows from a rule, ip, and mac addresses derived from
remote_group_id or remote_address_group_id.
"""
ip_address, mac_address = ip_address
net = netaddr.IPNetwork(str(ip_address))
any_src_ip = net.prefixlen == 0

40
neutron/tests/unit/agent/linux/openvswitch_firewall/test_firewall.py
View File

@ -506,7 +506,7 @@ class TestConjIPFlowManager(base.BaseTestCase):
# "conj_id_to_remove" is populated with the remote_sg conj_id assigned,
# "_update_flows_for_vlan_subr" will call "delete_flow_for_ip".
self.driver.delete_flow_for_ip.assert_called_once_with(
('10.22.3.4', 'ff:ee:dd:cc:bb:aa'), 'ingress', 'IPv4', 100,
'10.22.3.4', 'ff:ee:dd:cc:bb:aa', 'ingress', 'IPv4', 100,
{self.conj_id})
@ -1206,40 +1206,54 @@ class TestOVSFirewallDriver(base.BaseTestCase):
vlan_tag = 'taaag'
with mock.patch.object(self.firewall, 'delete_flow_for_ip') as \
mock_delete_flow_for_ip:
flow_state = {'addr1': {8, 16, 24}, 'addr2': {32, 40}}
flow_state = {
('addr1', 'mac1'): {8, 16, 24},
('addr2', 'mac2'): {32, 40},
}
cfg.CONF.set_override('explicitly_egress_direct',
explicitly_egress_direct, 'AGENT')
self.firewall.delete_flows_for_flow_state(
flow_state, addr_to_conj, direction, ethertype, vlan_tag)
calls = []
for removed_ip in flow_state.keys() - addr_to_conj.keys():
calls.append(mock.call(removed_ip, direction, ethertype, vlan_tag,
flow_state[removed_ip]))
for removed_ip, removed_mac in flow_state.keys() - addr_to_conj.keys():
calls.append(mock.call(removed_ip, removed_mac, direction,
ethertype, vlan_tag,
flow_state[(removed_ip, removed_mac)]))
if explicitly_egress_direct:
calls.append(mock.call(removed_ip, direction, ethertype,
vlan_tag, [0]))
mock_delete_flow_for_ip.assert_has_calls(calls)
calls.append(mock.call(removed_ip, removed_mac, direction,
ethertype, vlan_tag, [0]))
mock_delete_flow_for_ip.assert_has_calls(calls, any_order=True)
def test_delete_flows_for_flow_state_no_removed_ips_exp_egress(self):
addr_to_conj = {'addr1': {8, 16, 24}, 'addr2': {32, 40}}
addr_to_conj = {
('addr1', 'mac1'): {8, 16, 24},
('addr2', 'mac2'): {32, 40},
}
self._test_delete_flows_for_flow_state(addr_to_conj)
def test_delete_flows_for_flow_state_no_removed_ips_no_exp_egress(self):
addr_to_conj = {'addr1': {8, 16, 24}, 'addr2': {32, 40}}
addr_to_conj = {
('addr1', 'mac1'): {8, 16, 24},
('addr2', 'mac2'): {32, 40},
}
self._test_delete_flows_for_flow_state(addr_to_conj, False)
def test_delete_flows_for_flow_state_removed_ips_exp_egress(self):
addr_to_conj = {'addr2': {32, 40}}
addr_to_conj = {
('mac2', 'addr2'): {32, 40},
}
self._test_delete_flows_for_flow_state(addr_to_conj)
def test_delete_flows_for_flow_state_removed_ips_no_exp_egress(self):
addr_to_conj = {'addr1': {8, 16, 24}}
addr_to_conj = {
('mac1', 'addr1'): {8, 16, 24},
}
self._test_delete_flows_for_flow_state(addr_to_conj, False)
def test_delete_flow_for_ip_using_cookie_any(self):
with mock.patch.object(self.firewall, '_delete_flows') as \
mock_delete_flows:
self.firewall.delete_flow_for_ip(('10.1.2.3', None),
self.firewall.delete_flow_for_ip('10.1.2.3', None,
constants.INGRESS_DIRECTION,
constants.IPv4, 100, [0])
_, kwargs = mock_delete_flows.call_args

4
neutron/tests/unit/agent/linux/openvswitch_firewall/test_rules.py
View File

@ -348,8 +348,8 @@ class TestCreateFlowsForIpAddress(base.BaseTestCase):
}
conj_ids = [12, 20]
flows = rules.create_flows_for_ip_address(
('192.168.0.1', 'fa:16:3e:aa:bb:cc'),
flows = rules.create_flows_for_ip_address_and_mac(
'192.168.0.1', 'fa:16:3e:aa:bb:cc',
constants.EGRESS_DIRECTION, constants.IPv4,
0x123, conj_ids)