python: Fix datapath flow decoders.
Fix the following erros in odp decoding:
Missing push_mpls action
Typos in collector_set_id, tp_src/tp_dst and csum
Missing two fields in vxlan match
Acked-by: Mike Pattrick
@@ -225,7 +225,7 @@ class ODPFlow(Flow):
KVDecoders(
{
"probability": decode_int,
- "collector_sed_id": decode_int,
+ "collector_set_id": decode_int,
"obs_domain_id": decode_int,
"obs_point_id": decode_int,
"output_port": decode_default,
@@ -303,6 +303,21 @@ class ODPFlow(Flow):
),
"pop_nsh": decode_flag,
"tnl_pop": decode_int,
+ "pop_mpls": KVDecoders({"eth_type": decode_int}),
+ **dict.fromkeys(
+ ["push_mpls", "add_mpls"],
+ nested_kv_decoder(
+ KVDecoders(
+ {
+ "label": decode_int,
+ "tc": decode_int,
+ "ttl": decode_int,
+ "bos": decode_int,
+ "eth_type": decode_int,
+ }
+ )
+ ),
+ ),
"ct_clear": decode_flag,
"ct": nested_kv_decoder(
KVDecoders(
@@ -412,7 +427,7 @@ class ODPFlow(Flow):
{
"src": decode_int,
"dst": decode_int,
- "dsum": Mask16,
+ "csum": Mask16,
}
)
),
@@ -499,8 +514,8 @@ class ODPFlow(Flow):
"src": IPMask,
"dst": IPMask,
"proto": Mask8,
- "tcp_src": Mask16,
- "tcp_dst": Mask16,
+ "tp_src": Mask16,
+ "tp_dst": Mask16,
}
)
),
@@ -541,6 +556,8 @@ class ODPFlow(Flow):
"vxlan": nested_kv_decoder(
KVDecoders(
{
+ "flags": decode_int,
+ "vni": decode_int,
"gbp": nested_kv_decoder(
KVDecoders(
{
@@ -548,7 +565,7 @@ class ODPFlow(Flow):
"flags": Mask8,
}
)
- )
+ ),
}
)
),
