tests: py: remove duplicate payloads.

nft-test.py only needs one payload per rule, but a number of rules have
duplicates, typically one per address family, so just keep the last
payload for rules listed more than once.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>

4 files changed, 0 insertions, 221 deletions

diff --git a/tests/py/inet/ether-ip.t.payload.netdev b/tests/py/inet/ether-ip.t.payload.netdev
index 16b09212..b0fa6d84 100644
--- a/tests/py/inet/ether-ip.t.payload.netdev
+++ b/tests/py/inet/ether-ip.t.payload.netdev
@@ -13,21 +13,6 @@ netdev test-netdev ingress
   [ payload load 6b @ link header + 6 => reg 1 ]
   [ cmp eq reg 1 0x0c540f00 0x00000411 ]
 
-# tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04
-netdev test-netdev ingress 
-  [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00001600 ]
-  [ meta load protocol => reg 1 ]
-  [ cmp eq reg 1 0x00000008 ]
-  [ payload load 4b @ network header + 16 => reg 1 ]
-  [ cmp eq reg 1 0x04030201 ]
-  [ meta load iiftype => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-  [ payload load 6b @ link header + 6 => reg 1 ]
-  [ cmp eq reg 1 0x0c540f00 0x00000411 ]
-
 # tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept
 netdev test-netdev ingress 
   [ meta load l4proto => reg 1 ]
diff --git a/tests/py/inet/osf.t.payload b/tests/py/inet/osf.t.payload
index 6f5fba34..6ddab976 100644
--- a/tests/py/inet/osf.t.payload
+++ b/tests/py/inet/osf.t.payload
@@ -1,80 +1,24 @@
 # osf name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
 # osf ttl loose name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl loose name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl loose name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
 # osf ttl skip name "Linux"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl skip name "Linux"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
-
-# osf ttl skip name "Linux"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x00000078 0x00000000 0x00000000 ]
 
 # osf ttl skip version "Linux:3.0"
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
-
-# osf ttl skip version "Linux:3.0"
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
-
-# osf ttl skip version "Linux:3.0"
 inet osfinet osfchain
   [ osf dreg 1 ]
   [ cmp eq reg 1 0x756e694c 0x2e333a78 0x00000030 0x00000000 ]
 
 # osf name { "Windows", "MacOs" }
-__set%d osfip 3 size 2
-__set%d osfip 0
-	element 646e6957 0073776f 00000000 00000000  : 0 [end]	element 4f63614d 00000073 00000000 00000000  : 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf name { "Windows", "MacOs" }
-__set%d osfip6 3 size 2
-__set%d osfip6 0
-	element 646e6957 0073776f 00000000 00000000  : 0 [end]	element 4f63614d 00000073 00000000 00000000  : 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf name { "Windows", "MacOs" }
 __set%d osfinet 3 size 2
 __set%d osfinet 0
 	element 646e6957 0073776f 00000000 00000000  : 0 [end]	element 4f63614d 00000073 00000000 00000000  : 0 [end]
@@ -83,22 +27,6 @@ inet osfinet osfchain
   [ lookup reg 1 set __set%d ]
 
 # osf version { "Windows:XP", "MacOs:Sierra" }
-__set%d osfip 3 size 2
-__set%d osfip 0
-	element 646e6957 3a73776f 00005058 00000000  : 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf version { "Windows:XP", "MacOs:Sierra" }
-__set%d osfip6 3 size 2
-__set%d osfip6 0
-	element 646e6957 3a73776f 00005058 00000000  : 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __set%d ]
-
-# osf version { "Windows:XP", "MacOs:Sierra" }
 __set%d osfinet 3 size 2
 __set%d osfinet 0
 	element 646e6957 3a73776f 00005058 00000000  : 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 0 [end]
@@ -107,24 +35,6 @@ inet osfinet osfchain
   [ lookup reg 1 set __set%d ]
 
 # ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
-__map%d osfip b size 2
-__map%d osfip 0
-	element 646e6957 0073776f 00000000 00000000  : 00000001 0 [end]	element 4f63614d 00000073 00000000 00000000  : 00000002 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
-__map%d osfip6 b size 2
-__map%d osfip6 0
-	element 646e6957 0073776f 00000000 00000000  : 00000001 0 [end]	element 4f63614d 00000073 00000000 00000000  : 00000002 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf name map { "Windows" : 0x00000001, "MacOs" : 0x00000002 }
 __map%d osfinet b size 2
 __map%d osfinet 0
 	element 646e6957 0073776f 00000000 00000000  : 00000001 0 [end]	element 4f63614d 00000073 00000000 00000000  : 00000002 0 [end]
@@ -134,24 +44,6 @@ inet osfinet osfchain
   [ ct set mark with reg 1 ]
 
 # ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
-__map%d osfip b size 2
-__map%d osfip 0
-	element 646e6957 3a73776f 00005058 00000000  : 00000003 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 00000004 0 [end]
-ip osfip osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
-__map%d osfip6 b size 2
-__map%d osfip6 0
-	element 646e6957 3a73776f 00005058 00000000  : 00000003 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 00000004 0 [end]
-ip6 osfip6 osfchain
-  [ osf dreg 1 ]
-  [ lookup reg 1 set __map%d dreg 1 ]
-  [ ct set mark with reg 1 ]
-
-# ct mark set osf version map { "Windows:XP" : 0x00000003, "MacOs:Sierra" : 0x00000004 }
 __map%d osfinet b size 2
 __map%d osfinet 0
 	element 646e6957 3a73776f 00005058 00000000  : 00000003 0 [end]	element 4f63614d 69533a73 61727265 00000000  : 00000004 0 [end]
diff --git a/tests/py/inet/socket.t.payload b/tests/py/inet/socket.t.payload
index 79fcea79..e66ccbf7 100644
--- a/tests/py/inet/socket.t.payload
+++ b/tests/py/inet/socket.t.payload
@@ -1,74 +1,24 @@
 # socket transparent 0
-ip sockip4 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket transparent 0
-ip6 sockip6 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket transparent 0
 inet sockin sockchain 
   [ socket load transparent => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
 # socket transparent 1
-ip sockip4 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket transparent 1
-ip6 sockip6 sockchain 
-  [ socket load transparent => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket transparent 1
 inet sockin sockchain 
   [ socket load transparent => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
 
 # socket mark 0x00000005
-ip sockip4 sockchain 
-  [ socket load mark => reg 1 ]
-  [ cmp eq reg 1 0x00000005 ]
-
-# socket mark 0x00000005
-ip6 sockip6 sockchain 
-  [ socket load mark => reg 1 ]
-  [ cmp eq reg 1 0x00000005 ]
-
-# socket mark 0x00000005
 inet sockin sockchain 
   [ socket load mark => reg 1 ]
   [ cmp eq reg 1 0x00000005 ]
 
 # socket wildcard 0
-ip sockip4 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket wildcard 0
-ip6 sockip6 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000000 ]
-
-# socket wildcard 0
 inet sockin sockchain
   [ socket load wildcard => reg 1 ]
   [ cmp eq reg 1 0x00000000 ]
 
 # socket wildcard 1
-ip sockip4 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket wildcard 1
-ip6 sockip6 sockchain
-  [ socket load wildcard => reg 1 ]
-  [ cmp eq reg 1 0x00000001 ]
-
-# socket wildcard 1
 inet sockin sockchain
   [ socket load wildcard => reg 1 ]
   [ cmp eq reg 1 0x00000001 ]
diff --git a/tests/py/inet/synproxy.t.payload b/tests/py/inet/synproxy.t.payload
index 2e6feaaf..dd318b9a 100644
--- a/tests/py/inet/synproxy.t.payload
+++ b/tests/py/inet/synproxy.t.payload
@@ -1,72 +1,24 @@
 # synproxy
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
 # synproxy mss 1460 wscale 7
-ip synproxyip synproxychain
-  [ synproxy mss 1460 wscale 7 ]
-
-# synproxy mss 1460 wscale 7
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 1460 wscale 7 ]
-
-# synproxy mss 1460 wscale 7
 inet synproxyinet synproxychain
   [ synproxy mss 1460 wscale 7 ]
 
 # synproxy mss 1460 wscale 5 timestamp sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 1460 wscale 5 ]
-
-# synproxy mss 1460 wscale 5 timestamp sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 1460 wscale 5 ]
-
-# synproxy mss 1460 wscale 5 timestamp sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 1460 wscale 5 ]
 
 # synproxy timestamp sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
 # synproxy timestamp
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy timestamp
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]
 
 # synproxy sack-perm
-ip synproxyip synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy sack-perm
-ip6 synproxyip6 synproxychain
-  [ synproxy mss 0 wscale 0 ]
-
-# synproxy sack-perm
 inet synproxyinet synproxychain
   [ synproxy mss 0 wscale 0 ]