tests: py: Update payload records

This is the bulk change of py test suite payload records with improved
data reg printing in libnftnl using data (component) size and byteorder
collected in nftables.

Aside from printing values in the right byte order and padded with
zeroes to match their actual size, this patch also exposes the improved
set element dump format:
* No '[end]' marker, 'element' clearly separates elements
* No semi-colon for non-map elements
* 'flags' value printed only if non-zero and prefixed by 'flags' to
  distinguish from element data

Signed-off-by: Phil Sutter <phil@nwl.cc>

1 files changed, 35 insertions, 36 deletions

diff --git a/tests/py/ip6/masquerade.t.payload.ip6 b/tests/py/ip6/masquerade.t.payload.ip6
index 086a6dda..89940900 100644
--- a/tests/py/ip6/masquerade.t.payload.ip6
+++ b/tests/py/ip6/masquerade.t.payload.ip6
@@ -1,98 +1,98 @@
 # udp dport 53 masquerade
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq ]
 
 # udp dport 53 masquerade random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x4 ]
 
 # udp dport 53 masquerade random,persistent
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0xc ]
 
 # udp dport 53 masquerade random,persistent,fully-random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x1c ]
 
 # udp dport 53 masquerade random,fully-random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x14 ]
 
 # udp dport 53 masquerade random,fully-random,persistent
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x1c ]
 
 # udp dport 53 masquerade persistent
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x8 ]
 
 # udp dport 53 masquerade persistent,random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0xc ]
 
 # udp dport 53 masquerade persistent,random,fully-random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x1c ]
 
 # udp dport 53 masquerade persistent,fully-random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x18 ]
 
 # udp dport 53 masquerade persistent,fully-random,random
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ masq flags 0x1c ]
 
 # tcp dport { 1,2,3,4,5,6,7,8,101,202,303,1001,2002,3003} masquerade
 __set%d test-ip6 3
 __set%d test-ip6 0
-	element 00000100  : 0 [end]	element 00000200  : 0 [end]	element 00000300  : 0 [end]	element 00000400  : 0 [end]	element 00000500  : 0 [end]	element 00000600  : 0 [end]	element 00000700  : 0 [end]	element 00000800  : 0 [end]	element 00006500  : 0 [end]	element 0000ca00  : 0 [end]	element 00002f01  : 0 [end]	element 0000e903  : 0 [end]	element 0000d207  : 0 [end]	element 0000bb0b  : 0 [end]
+	element 0001	element 0002	element 0003	element 0004	element 0005	element 0006	element 0007	element 0008	element 0065	element 00ca	element 012f	element 03e9	element 07d2	element 0bbb
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
+  [ cmp eq reg 1 0x06 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ lookup reg 1 set __set%d ]
   [ masq ]
@@ -100,26 +100,26 @@ ip6 test-ip6 postrouting
 # ip6 daddr fe00::1-fe00::200 udp dport 53 counter masquerade
 ip6 test-ip6 postrouting
   [ payload load 16b @ network header + 24 => reg 1 ]
-  [ range eq reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 0x000000fe 0x00000000 0x00000000 0x00020000 ]
+  [ range eq reg 1 0xfe000000 0x00000000 0x00000000 0x00000001 0xfe000000 0x00000000 0x00000000 0x00000200 ]
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000011 ]
+  [ cmp eq reg 1 0x11 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
-  [ cmp eq reg 1 0x00003500 ]
+  [ cmp eq reg 1 0x0035 ]
   [ counter pkts 0 bytes 0 ]
   [ masq ]
 
 # iifname "eth0" ct state established,new tcp dport vmap {22 : drop, 222 : drop } masquerade
 __map%d test-ip6 b
 __map%d test-ip6 0
-	element 00001600  : drop 0 [end]	element 0000de00  : drop 0 [end]
+	element 0016 : drop	element 00de : drop
 ip6 test-ip6 postrouting
   [ meta load iifname => reg 1 ]
-  [ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
+  [ cmp eq reg 1 0x65746830 0x00000000 0x00000000 0x00000000 ]
   [ ct load state => reg 1 ]
   [ bitwise reg 1 = ( reg 1 & 0x0000000a ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00000000 ]
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
+  [ cmp eq reg 1 0x06 ]
   [ payload load 2b @ transport header + 2 => reg 1 ]
   [ lookup reg 1 set __map%d dreg 0 ]
   [ masq ]
@@ -127,15 +127,14 @@ ip6 test-ip6 postrouting
 # meta l4proto 6 masquerade to :1024
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ immediate reg 1 0x00000004 ]
+  [ cmp eq reg 1 0x06 ]
+  [ immediate reg 1 0x0400 ]
   [ masq proto_min reg 1 flags 0x2 ]
 
 # meta l4proto 6 masquerade to :1024-2048
 ip6 test-ip6 postrouting
   [ meta load l4proto => reg 1 ]
-  [ cmp eq reg 1 0x00000006 ]
-  [ immediate reg 1 0x00000004 ]
-  [ immediate reg 2 0x00000008 ]
+  [ cmp eq reg 1 0x06 ]
+  [ immediate reg 1 0x0400 ]
+  [ immediate reg 2 0x0800 ]
   [ masq proto_min reg 1 proto_max reg 2 flags 0x2 ]
-