Commit f84974e7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tc-testing-dnat-tuple-collision' 



Marcelo Ricardo Leitner says:

====================
tc-testing: add test for ct DNAT tuple collision

That was fixed in 13c62f53 ("net/sched: act_ct: handle DNAT tuple
collision").

For that, it requires that tdc is able to send diverse packets with
scapy, which is then done on the 2nd patch of this series.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1b134d8d e4690564

tools/testing/selftests/tc-testing/plugin-lib/scapyPlugin.py

+23 −19
Original line number Diff line number Diff line
@@ -29,14 +29,18 @@ class SubPlugin(TdcPlugin): 
            return



        # Check for required fields

        scapyinfo = self.args.caseinfo['scapy']

        lscapyinfo = self.args.caseinfo['scapy']

        if type(lscapyinfo) != list:

            lscapyinfo = [ lscapyinfo, ]



        for scapyinfo in lscapyinfo:

            scapy_keys = ['iface', 'count', 'packet']

            missing_keys = []

            keyfail = False

            for k in scapy_keys:

                if k not in scapyinfo:

                    keyfail = True

                missing_keys.add(k)

                    missing_keys.append(k)

            if keyfail:

                print('{}: Scapy block present in the test, but is missing info:'

                    .format(self.sub_class))

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

+45 −0
Original line number Diff line number Diff line
@@ -406,5 +406,50 @@ 
        "teardown": [

            "$TC actions flush action ct"

        ]

    },

    {

        "id": "3992",

        "name": "Add ct action triggering DNAT tuple conflict",

        "category": [

            "actions",

            "ct",

	    "scapy"

        ],

	"plugins": {

		"requires": [

			"nsPlugin",

			"scapyPlugin"

		]

	},

        "setup": [

            [

                "$TC qdisc del dev $DEV1 ingress",

                0,

                1,

		2,

                255

            ],

	    "$TC qdisc add dev $DEV1 ingress"

        ],

        "cmdUnderTest": "$TC filter add dev $DEV1 ingress protocol ip prio 1 flower ct_state -trk action ct commit nat dst addr 20.0.0.1 port 10 pipe action drop",

	"scapy": [

	    {

		"iface": "$DEV0",

		"count": 1,

		"packet": "Ether(type=0x800)/IP(src='10.0.0.10',dst='10.0.0.10')/TCP(sport=5000,dport=10)"

	    },

	    {

		"iface": "$DEV0",

		"count": 1,

		"packet": "Ether(type=0x800)/IP(src='10.0.0.10',dst='10.0.0.20')/TCP(sport=5000,dport=10)"

	    }

	],

        "expExitCode": "0",

        "verifyCmd": "cat /proc/net/nf_conntrack",

        "matchPattern": "dst=10.0.0.20",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 ingress"

        ]

    }

]