mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

python: ovs: flow: Fix nested check_pkt_len acts.

Browse Source 
Add check_pkt_len action to the decoder list that it, itself, uses.

This makes nested check_pkt_len (i.e:a check_pkt_len inside another)
work.

Fixes: 076663b31e ("python: Add ovs datapath flow parsing.")
Reported-by: Ilya Maximets <i.maximets@ovn.org>
Acked-by: Eelco Chaudron <echaudro@redhat.com>
Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
This commit is contained in:
Adrian Moreno
2024-06-06 17:15:46 +02:00
committed by Ilya Maximets
parent fad8c8f7f6
commit 2c1a432e2f
2 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
python/ovs/flow/odp.py
View File

@@ -365,29 +365,30 @@ class ODPFlow(Flow):
is_list=True, is_list=True,
) )
_decoders["check_pkt_len"] = nested_kv_decoder(
KVDecoders(
{
"size": decode_int,
"gt": nested_kv_decoder(
KVDecoders(
decoders=_decoders,
default_free=decode_free_output,
),
is_list=True,
),
"le": nested_kv_decoder(
KVDecoders(
decoders=_decoders,
default_free=decode_free_output,
),
is_list=True,
),
}
)
)
return { return {
**_decoders, **_decoders,
"check_pkt_len": nested_kv_decoder(
KVDecoders(
{
"size": decode_int,
"gt": nested_kv_decoder(
KVDecoders(
decoders=_decoders,
default_free=decode_free_output,
),
is_list=True,
),
"le": nested_kv_decoder(
KVDecoders(
decoders=_decoders,
default_free=decode_free_output,
),
is_list=True,
),
}
)
),
} }
@staticmethod @staticmethod

29
python/ovs/tests/test_odp.py
View File

@@ -541,6 +541,35 @@ def test_odp_fields(input_string, expected):
), ),
], ],
), ),
(
"actions:check_pkt_len(size=200,gt(check_pkt_len(size=400,gt(4),le(2))),le(check_pkt_len(size=100,gt(1),le(drop))))", # noqa: E501
[
KeyValue(
"check_pkt_len",
{
"size": 200,
"gt": [
{
"check_pkt_len": {
"size": 400,
"gt": [{"output": {"port": 4}}],
"le": [{"output": {"port": 2}}],
}
}
],
"le": [
{
"check_pkt_len": {
"size": 100,
"gt": [{"output": {"port": 1}}],
"le": [{"drop": True}],
}
}
],
},
)
],
),
( (
"actions:meter(1),hash(l4(0))", "actions:meter(1),hash(l4(0))",
[ [