The option that northd actually reads to control MAC learning into the
FDB is "lsp_learn_fdb" (see lsp_can_learn_mac() in northd/northd.h), but
ovn-nb.xml, NEWS and the existing inline Network Function tests in
tests/ovn.at and tests/ovn-northd.at referred to it as "lsp_learn_mac",
which is not recognized. Configuring "lsp_learn_mac=false" was a no-op
and FDB learning remained enabled.
Rename all references to "lsp_learn_fdb".
Fixes: 8e2d6fa14804 ("northd, tests: Network Function insertion logical flow
programming.")
Reported-by: Dumitru Ceara <[email protected]>
Signed-off-by: Naveen Yerramneni <[email protected]>
---
NEWS | 2 +-
ovn-nb.xml | 2 +-
tests/ovn-northd.at | 16 ++++++++--------
tests/ovn.at | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/NEWS b/NEWS
index d1a6ad27f..e512dc9af 100644
--- a/NEWS
+++ b/NEWS
@@ -136,7 +136,7 @@ OVN v26.03.0 - xxx xx xxxx
and support both ingress (from-lport) and egress (to-lport) traffic flows.
Two new options have been added to Logical_Switch_Port which need to
be set to false for ports used as network function inport or outport.
- - "lsp_learn_mac": This can be used to control mac learning on the port.
+ - "lsp_learn_fdb": This can be used to control mac learning on the port.
- "receive_multicast": This can used to control whether multicast packets
can be received by the port.
NOTE:
diff --git a/ovn-nb.xml b/ovn-nb.xml
index 33a6dc676..bbac409fa 100644
--- a/ovn-nb.xml
+++ b/ovn-nb.xml
@@ -1667,7 +1667,7 @@
Default: <code>false</code>.
</column>
- <column name="options" key="lsp_learn_mac"
+ <column name="options" key="lsp_learn_fdb"
type='{"type": "boolean"}'>
If set to <code>false</code>, source MAC address is not learnt by FDB
when packets are received on this port. The default value is
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index 1827f8956..4f228eca7 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -19854,10 +19854,10 @@ check ovn-nbctl ls-add sw0
check ovn-nbctl lsp-add sw0 sw0-nf-p1
check ovn-nbctl lsp-add sw0 sw0-nf-p2
check ovn-nbctl set logical_switch_port sw0-nf-p1 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw0-nf-p2
check ovn-nbctl set logical_switch_port sw0-nf-p2 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw0-nf-p1
check ovn-nbctl nf-add nf0 101 sw0-nf-p1 sw0-nf-p2
check ovn-nbctl nfg-add nfg0 201 inline nf0
@@ -19976,10 +19976,10 @@ AS_BOX([Create another NF and add it to a to-lport
ACL.])
check ovn-nbctl lsp-add sw0 sw0-nf-p3
check ovn-nbctl lsp-add sw0 sw0-nf-p4
check ovn-nbctl set logical_switch_port sw0-nf-p3 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw0-nf-p4
check ovn-nbctl set logical_switch_port sw0-nf-p4 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw0-nf-p3
check ovn-nbctl nf-add nf1 102 sw0-nf-p3 sw0-nf-p4
check ovn-nbctl nfg-add nfg1 202 inline nf1
@@ -20057,16 +20057,16 @@ check ovn-nbctl lsp-add sw1 sw1-nf-p2 sw0-nf-p2 100
check ovn-nbctl lsp-add sw1 sw1-nf-p3 sw0-nf-p3 100
check ovn-nbctl lsp-add sw1 sw1-nf-p4 sw0-nf-p4 100
check ovn-nbctl set logical_switch_port sw1-nf-p1 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw1-nf-p2
check ovn-nbctl set logical_switch_port sw1-nf-p2 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw1-nf-p1
check ovn-nbctl set logical_switch_port sw1-nf-p3 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw1-nf-p4
check ovn-nbctl set logical_switch_port sw1-nf-p4 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=sw1-nf-p3
check ovn-nbctl --wait=sb sync
diff --git a/tests/ovn.at b/tests/ovn.at
index 6bbbbc91c..cb4909d09 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -44761,10 +44761,10 @@ create_logical_topology() {
check ovn-nbctl lsp-add $sw $sw-nf-p$i -- lsp-set-addresses $sw-nf-p$i
"f0:00:00:00:01:0$i"
done
check ovn-nbctl set logical_switch_port $sw-nf-p1 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=$sw-nf-p2
check ovn-nbctl set logical_switch_port $sw-nf-p2 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=$sw-nf-p1
check ovn-nbctl nf-add nf0 1 $sw-nf-p1 $sw-nf-p2
check ovn-nbctl nfg-add nfg0 1 inline nf0
@@ -44894,10 +44894,10 @@ create_logical_topology() {
check ovn-nbctl lsp-add $sw $sw-nf-p$i -- lsp-set-addresses $sw-nf-p$i
"f0:00:00:00:01:0$i"
done
check ovn-nbctl set logical_switch_port $sw-nf-p1 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=$sw-nf-p2
check ovn-nbctl set logical_switch_port $sw-nf-p2 \
- options:receive_multicast=false options:lsp_learn_mac=false \
+ options:receive_multicast=false options:lsp_learn_fdb=false \
options:is-nf=true options:nf-linked-port=$sw-nf-p1
check ovn-nbctl nf-add nf0 1 $sw-nf-p1 $sw-nf-p2
check ovn-nbctl nfg-add nfg0 1 inline nf0
--
2.43.5
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
