From: Numan Siddique <[email protected]>
If a virtual port has 2 parents and if both of them are scheduled
on the same chassis, then virtual port binding doesn't work.
For virtual port binding we have the below logical flows:
inport == p1 && !is_chassis_resident("vip-port") && arp ..
actions=bind_vport(vip-port); next;
inport == p2 && !is_chassis_resident("vip-port") && arp ..
actions=bind_vport(vip-port); next;
Since we have !is_chassis_resident, as soon as p1 binds the port, the
corresponding OF flows
for both the logical flows above are deleted. Because of this, when p2 becomes
the
parent of vip-port it can't bind it.
This patch fixes this issue by removing this condition.
Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=1762341
Acked-by: Dumitru Ceara <[email protected]>
Signed-off-by: Numan Siddique <[email protected]>
(cherry picked from OVN commit 4fae57bdb9749b2fb3e6727112e87026d2b02b87)
---
ovn/northd/ovn-northd.8.xml | 2 +-
ovn/northd/ovn-northd.c | 3 +--
tests/ovn.at | 39 ++++++++++++++++++++++++++++++++-------
3 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ovn/northd/ovn-northd.8.xml b/ovn/northd/ovn-northd.8.xml
index 6d2fbe3..aea20c5 100644
--- a/ovn/northd/ovn-northd.8.xml
+++ b/ovn/northd/ovn-northd.8.xml
@@ -575,7 +575,7 @@
column with the match
</p>
<pre>
-<code>inport == <var>P</var> && !is_chassis_resident(<var>V</var>)
&& ((arp.op == 1 && arp.spa == <var>VIP</var> &&
arp.tpa == <var>VIP</var>) || (arp.op == 2 && arp.spa ==
<var>VIP</var>))</code>
+<code>inport == <var>P</var> && && ((arp.op == 1 &&
arp.spa == <var>VIP</var> && arp.tpa == <var>VIP</var>) || (arp.op == 2
&& arp.spa == <var>VIP</var>))</code>
</pre>
<p>
diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c
index a079ca3..8b2c0a4 100644
--- a/ovn/northd/ovn-northd.c
+++ b/ovn/northd/ovn-northd.c
@@ -4922,11 +4922,10 @@ build_lswitch_flows(struct hmap *datapaths, struct hmap
*ports,
ds_clear(&match);
ds_put_format(&match, "inport == \"%s\" && "
- "!is_chassis_resident(%s) && "
"((arp.op == 1 && arp.spa == %s && "
"arp.tpa == %s) || (arp.op == 2 && "
"arp.spa == %s))",
- vparent, op->json_key, virtual_ip, virtual_ip,
+ vparent, virtual_ip, virtual_ip,
virtual_ip);
ds_clear(&actions);
ds_put_format(&actions,
diff --git a/tests/ovn.at b/tests/ovn.at
index df8c47a..e8125cc 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -14500,7 +14500,7 @@ ovn-nbctl lsp-set-addresses sw0-vir "50:54:00:00:00:10
10.0.0.10"
ovn-nbctl lsp-set-port-security sw0-vir "50:54:00:00:00:10 10.0.0.10"
ovn-nbctl lsp-set-type sw0-vir virtual
ovn-nbctl set logical_switch_port sw0-vir options:virtual-ip=10.0.0.10
-ovn-nbctl set logical_switch_port sw0-vir options:virtual-parents=sw0-p1,sw0-p2
+ovn-nbctl set logical_switch_port sw0-vir
options:virtual-parents=sw0-p1,sw0-p2,sw0-p3
ovn-nbctl lsp-add sw0 sw0-p1
ovn-nbctl lsp-set-addresses sw0-p1 "50:54:00:00:00:03 10.0.0.3"
@@ -14512,7 +14512,7 @@ ovn-nbctl lsp-set-port-security sw0-p2
"50:54:00:00:00:04 10.0.0.4 10.0.0.10"
ovn-nbctl lsp-add sw0 sw0-p3
ovn-nbctl lsp-set-addresses sw0-p3 "50:54:00:00:00:05 10.0.0.5"
-ovn-nbctl lsp-set-port-security sw0-p3 "50:54:00:00:00:05 10.0.0.5"
+ovn-nbctl lsp-set-port-security sw0-p3 "50:54:00:00:00:05 10.0.0.5 10.0.0.10"
# Create the second logical switch with one port
ovn-nbctl ls-add sw1
@@ -14543,8 +14543,9 @@ ovn-nbctl --wait=hv sync
ovn-sbctl dump-flows sw0 | grep ls_in_arp_rsp | grep bind_vport > lflows.txt
AT_CHECK([cat lflows.txt], [0], [dnl
- table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p1" &&
!is_chassis_resident("sw0-vir") && ((arp.op == 1 && arp.spa == 10.0.0.10 &&
arp.tpa == 10.0.0.10) || (arp.op == 2 && arp.spa == 10.0.0.10))),
action=(bind_vport("sw0-vir", inport); next;)
- table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p2" &&
!is_chassis_resident("sw0-vir") && ((arp.op == 1 && arp.spa == 10.0.0.10 &&
arp.tpa == 10.0.0.10) || (arp.op == 2 && arp.spa == 10.0.0.10))),
action=(bind_vport("sw0-vir", inport); next;)
+ table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p1" &&
((arp.op == 1 && arp.spa == 10.0.0.10 && arp.tpa == 10.0.0.10) || (arp.op == 2
&& arp.spa == 10.0.0.10))), action=(bind_vport("sw0-vir", inport); next;)
+ table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p2" &&
((arp.op == 1 && arp.spa == 10.0.0.10 && arp.tpa == 10.0.0.10) || (arp.op == 2
&& arp.spa == 10.0.0.10))), action=(bind_vport("sw0-vir", inport); next;)
+ table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p3" &&
((arp.op == 1 && arp.spa == 10.0.0.10 && arp.tpa == 10.0.0.10) || (arp.op == 2
&& arp.spa == 10.0.0.10))), action=(bind_vport("sw0-vir", inport); next;)
])
ovn-sbctl dump-flows lr0 | grep lr_in_arp_resolve | grep "reg0 == 10.0.0.10" \
@@ -14592,6 +14593,29 @@ AT_CHECK([cat lflows.txt], [0], [dnl
table=9 (lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-sw0"
&& reg0 == 10.0.0.10), action=(eth.dst = 50:54:00:00:00:03; next;)
])
+# From sw0-p3 send GARP for 10.0.0.10. hv1 should claim sw0-vir
+# and sw0-p3 should be its virtual_parent.
+eth_src=505400000005
+eth_dst=ffffffffffff
+spa=$(ip_to_hex 10 0 0 10)
+tpa=$(ip_to_hex 10 0 0 10)
+send_garp 1 2 $eth_src $eth_dst $spa $tpa
+
+OVS_WAIT_UNTIL([test x$(ovn-sbctl --bare --columns chassis find port_binding \
+logical_port=sw0-vir) = x$hv1_ch_uuid], [0], [])
+
+OVS_WAIT_UNTIL([test x$(ovn-sbctl --bare --columns virtual_parent find
port_binding \
+logical_port=sw0-vir) = xsw0-p3])
+
+ovn-sbctl dump-flows lr0 | grep lr_in_arp_resolve | grep "reg0 == 10.0.0.10" \
+> lflows.txt
+
+# There should be an arp resolve flow to resolve the virtual_ip with the
+# sw0-p2's MAC.
+AT_CHECK([cat lflows.txt], [0], [dnl
+ table=9 (lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-sw0"
&& reg0 == 10.0.0.10), action=(eth.dst = 50:54:00:00:00:05; next;)
+])
+
# send the garp from sw0-p2 (in hv2). hv2 should claim sw0-vir
# and sw0-p2 shpuld be its virtual_parent.
eth_src=505400000004
@@ -14610,7 +14634,7 @@ ovn-sbctl dump-flows lr0 | grep lr_in_arp_resolve |
grep "reg0 == 10.0.0.10" \
> lflows.txt
# There should be an arp resolve flow to resolve the virtual_ip with the
-# sw0-p2's MAC.
+# sw0-p3's MAC.
AT_CHECK([cat lflows.txt], [0], [dnl
table=9 (lr_in_arp_resolve ), priority=100 , match=(outport == "lr0-sw0"
&& reg0 == 10.0.0.10), action=(eth.dst = 50:54:00:00:00:04; next;)
])
@@ -14655,7 +14679,7 @@ AT_CHECK([cat lflows.txt], [0], [dnl
])
# Now send arp reply from sw0-p2. hv2 should claim sw0-vir
-# and sw0-p2 shpuld be its virtual_parent.
+# and sw0-p2 should be its virtual_parent.
eth_src=505400000004
eth_dst=ffffffffffff
spa=$(ip_to_hex 10 0 0 10)
@@ -14698,7 +14722,8 @@ ovn-nbctl --wait=hv set logical_switch_port sw0-vir
options:virtual-ip=10.0.0.10
ovn-sbctl dump-flows sw0 | grep ls_in_arp_rsp | grep bind_vport > lflows.txt
AT_CHECK([cat lflows.txt], [0], [dnl
- table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p1" &&
!is_chassis_resident("sw0-vir") && ((arp.op == 1 && arp.spa == 10.0.0.10 &&
arp.tpa == 10.0.0.10) || (arp.op == 2 && arp.spa == 10.0.0.10))),
action=(bind_vport("sw0-vir", inport); next;)
+ table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p1" &&
((arp.op == 1 && arp.spa == 10.0.0.10 && arp.tpa == 10.0.0.10) || (arp.op == 2
&& arp.spa == 10.0.0.10))), action=(bind_vport("sw0-vir", inport); next;)
+ table=11(ls_in_arp_rsp ), priority=100 , match=(inport == "sw0-p3" &&
((arp.op == 1 && arp.spa == 10.0.0.10 && arp.tpa == 10.0.0.10) || (arp.op == 2
&& arp.spa == 10.0.0.10))), action=(bind_vport("sw0-vir", inport); next;)
])
ovn-nbctl --wait=hv remove logical_switch_port sw0-vir options virtual-parents
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
