Perform deletion of the stale flows in physical bridges consistently with
br-int and br-tun, respecting drop_flows_on_start configuration option.
Added tests for auxiliary bridge and functional tests for the physical
bridge using VLAN/flat external network. Fixes part of the bug 1514056;
together with [1] and [2], the bug should be considered fixed.
The commit also fixes inconsistency between netmask of allocated IP
addresses assigned in _create_test_port_dict and ip_len in _plug_ports
of base.py.
Further, this commit sets agent UUID to physical bridges similarly to
tun and int bridges. This is necessary for stale flows cleanup to work
correctly. In upstream, it is treated using OVSBridgeCookieMixin.
Reviewed: https:/ /review. openstack. org/300424 /git.openstack. org/cgit/ openstack/ neutron/ commit/ ?id=8d29f38356f c5b840fa8b5c31f cd9d76c0fdd336
Committed: https:/
Submitter: Jenkins
Branch: stable/liberty
commit 8d29f38356fc5b8 40fa8b5c31fcd9d 76c0fdd336
Author: Hynek Mlnarik <email address hidden>
Date: Thu Feb 25 11:34:15 2016 +0100
Cleanup stale OVS flows for physical bridges
Perform deletion of the stale flows in physical bridges consistently with
br-int and br-tun, respecting drop_flows_on_start configuration option.
Added tests for auxiliary bridge and functional tests for the physical
bridge using VLAN/flat external network. Fixes part of the bug 1514056;
together with [1] and [2], the bug should be considered fixed.
The commit also fixes inconsistency between netmask of allocated IP test_port_ dict and ip_len in _plug_ports
addresses assigned in _create_
of base.py.
Further, this commit sets agent UUID to physical bridges similarly to Mixin.
tun and int bridges. This is necessary for stale flows cleanup to work
correctly. In upstream, it is treated using OVSBridgeCookie
[1] https:/ /review. openstack. org/#/c/ 297211/ /review. openstack. org/#/c/ 297818/
[2] https:/
Conflicts: tests/functiona l/agent/ l2/base. py tests/unit/ plugins/ ml2/drivers/ openvswitch/ agent/test_ ovs_tunnel. py
neutron/
neutron/
Co-Authored-By: Jian Wen <email address hidden> 9a0e6358982e113 6637634a521 7005e555b452133 2da95d3cf4)
Co-Authored-By: Clayton O'Neill <email address hidden>
Partial-Bug: 1514056
Change-Id: I9801b76829021c
(cherry picked from commit cacde308eef6f1d