Commit ca9e5d3d authored by Pedro Tammela's avatar Pedro Tammela Committed by Jakub Kicinski
Browse files

selftests: tc-testing: fix nat regex matching 

In iproute 6.14, the nat ip mask logic was fixed to remove an undefined
behaviour[1]. So now instead of reporting '0.0.0.0/32' on x86 and potentially
'0.0.0.0/0' in other platforms, it reports '0.0.0.0/0' in all platforms.

[1] https://lore.kernel.org/netdev/20250306112520.188728-1-torben.nielsen@prevas.dk/



Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Link: https://patch.msgid.link/20250401144908.568140-1-pctammela@mojatatu.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 96844075

tools/testing/selftests/tc-testing/tc-tests/actions/nat.json

+7 −7
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ 
        "cmdUnderTest": "$TC actions add action nat ingress default 10.10.10.1 index 12",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 12",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/32 10.10.10.1 pass.*index 12 ref",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/0 10.10.10.1 pass.*index 12 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -332,7 +332,7 @@ 
        "cmdUnderTest": "$TC actions add action nat ingress any 10.10.10.1 index 12",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 12",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/32 10.10.10.1 pass.*index 12 ref",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/0 10.10.10.1 pass.*index 12 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -359,7 +359,7 @@ 
        "cmdUnderTest": "$TC actions add action nat ingress all 10.10.10.1 index 12",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 12",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/32 10.10.10.1 pass.*index 12 ref",

        "matchPattern": "action order [0-9]+:  nat ingress 0.0.0.0/0 10.10.10.1 pass.*index 12 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -548,7 +548,7 @@ 
        "cmdUnderTest": "$TC actions add action nat egress default 20.20.20.1 pipe index 10",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 10",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/32 20.20.20.1 pipe.*index 10 ref",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/0 20.20.20.1 pipe.*index 10 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -575,7 +575,7 @@ 
        "cmdUnderTest": "$TC actions add action nat egress any 20.20.20.1 pipe index 10",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 10",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/32 20.20.20.1 pipe.*index 10 ref",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/0 20.20.20.1 pipe.*index 10 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -602,7 +602,7 @@ 
        "cmdUnderTest": "$TC actions add action nat egress all 20.20.20.1 pipe index 10",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 10",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/32 20.20.20.1 pipe.*index 10 ref",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/0 20.20.20.1 pipe.*index 10 ref",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"
@@ -629,7 +629,7 @@ 
        "cmdUnderTest": "$TC actions add action nat egress all 20.20.20.1 pipe index 10 cookie aa1bc2d3eeff112233445566778800a1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action nat index 10",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/32 20.20.20.1 pipe.*index 10 ref.*cookie aa1bc2d3eeff112233445566778800a1",

        "matchPattern": "action order [0-9]+:  nat egress 0.0.0.0/0 20.20.20.1 pipe.*index 10 ref.*cookie aa1bc2d3eeff112233445566778800a1",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action nat"