openstack
/
neutron
Code Issues Proposed changes

Fix pep8 endless loop in "test_update_flows_for_vlan_remote_group" 

To be honest, I don't know the reason why pep8 was stopped when
checking "test_update_flows_for_vlan_remote_group". This patch
indents the "mock.call" list and creates a variable, instead
of passing the list inside the assert method.

I've manually tested the pep8 job. In my development environment
not takes 43 seconds, instead of 14 minutes.

Closes-Bug: #1973221
Change-Id: Ic5849b88553ce7ef860e8c2020cb92d06ba9e1b4
This commit is contained in:
Rodolfo Alonso Hernandez 2022-05-12 04:32:43 +00:00
parent cbb4c2274a
commit 8c5cde363e
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,23 +455,24 @@ class TestConjIPFlowManager(base.BaseTestCase):
self.manager.add(self.vlan_tag, 'sg', 'remote_id',
constants.INGRESS_DIRECTION, constants.IPv4, 3)
self.manager.update_flows_for_vlan(self.vlan_tag, 'ofport1')
self.assertEqual(self.driver._add_flow.call_args_list,
[mock.call(actions='conjunction(16,1/2)', ct_state='+est-rel-rpl',
dl_type=2048, nw_src='10.22.3.4/32', priority=70,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(17,1/2)', ct_state='+new-est',
dl_type=2048, nw_src='10.22.3.4/32', priority=70,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(22,1/2)', ct_state='+est-rel-rpl',
dl_type=2048, nw_src='10.22.3.4/32', priority=73,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(23,1/2)', ct_state='+new-est',
dl_type=2048, nw_src='10.22.3.4/32', priority=73,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1')])
calls = [
mock.call(actions='conjunction(16,1/2)', ct_state='+est-rel-rpl',
dl_type=2048, nw_src='10.22.3.4/32', priority=70,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(17,1/2)', ct_state='+new-est',
dl_type=2048, nw_src='10.22.3.4/32', priority=70,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(22,1/2)', ct_state='+est-rel-rpl',
dl_type=2048, nw_src='10.22.3.4/32', priority=73,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1'),
mock.call(actions='conjunction(23,1/2)', ct_state='+new-est',
dl_type=2048, nw_src='10.22.3.4/32', priority=73,
reg_net=self.vlan_tag, table=82,
flow_group_id='ofport1')]
self.assertEqual(self.driver._add_flow.call_args_list, calls)
def _sg_removed(self, sg_name):
with mock.patch.object(self.manager.conj_id_map,