Revert "tests: shell: avoid single-value anon sets"

This reverts commit b7459b0c854fc7a0d6cd86151b81035a8edf8e63.

13 files changed, 20 insertions, 20 deletions

diff --git a/tests/shell/testcases/cache/0001_cache_handling_0 b/tests/shell/testcases/cache/0001_cache_handling_0
index a110be79..f3dc9a34 100755
--- a/tests/shell/testcases/cache/0001_cache_handling_0
+++ b/tests/shell/testcases/cache/0001_cache_handling_0
@@ -9,7 +9,7 @@ table inet test {
 
 	chain test {
 		ip saddr @test counter accept
-		ip daddr 2.2.2.2 counter accept
+		ip daddr { 2.2.2.2} counter accept
 	}
 }'
 
diff --git a/tests/shell/testcases/cache/dumps/0001_cache_handling_0.nft b/tests/shell/testcases/cache/dumps/0001_cache_handling_0.nft
index 47d744e9..f6dd6541 100644
--- a/tests/shell/testcases/cache/dumps/0001_cache_handling_0.nft
+++ b/tests/shell/testcases/cache/dumps/0001_cache_handling_0.nft
@@ -5,8 +5,8 @@ table inet test {
 	}
 
 	chain test {
-		ip daddr 2.2.2.2 counter packets 0 bytes 0 accept
+		ip daddr { 2.2.2.2 } counter packets 0 bytes 0 accept
 		ip saddr @test counter packets 0 bytes 0 accept
-		ip daddr 2.2.2.2 counter packets 0 bytes 0 accept
+		ip daddr { 2.2.2.2 } counter packets 0 bytes 0 accept
 	}
 }
diff --git a/tests/shell/testcases/netns/0001nft-f_0 b/tests/shell/testcases/netns/0001nft-f_0
index 89bf5a3d..83448087 100755
--- a/tests/shell/testcases/netns/0001nft-f_0
+++ b/tests/shell/testcases/netns/0001nft-f_0
@@ -16,7 +16,7 @@ RULESET="table ip t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip saddr @s drop
 		jump other
 	}
@@ -32,7 +32,7 @@ table ip6 t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip6 saddr @s drop
 		jump other
 	}
@@ -48,7 +48,7 @@ table inet t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip6 saddr @s drop
 		jump other
 	}
diff --git a/tests/shell/testcases/netns/0002loosecommands_0 b/tests/shell/testcases/netns/0002loosecommands_0
index abef50a1..e6278280 100755
--- a/tests/shell/testcases/netns/0002loosecommands_0
+++ b/tests/shell/testcases/netns/0002loosecommands_0
@@ -30,9 +30,9 @@ netns_exec $NETNS_NAME "$NFT add table ip t"
 netns_exec $NETNS_NAME "$NFT add chain ip t c"
 netns_exec $NETNS_NAME "$NFT add chain ip t other"
 netns_exec $NETNS_NAME "$NFT add set ip t s { type ipv4_addr; }"
-netns_exec $NETNS_NAME "$NFT add element ip t s {1.1.0.0}"
+netns_exec $NETNS_NAME "$NFT add element ip t s {1.1.0.0 }"
 netns_exec $NETNS_NAME "$NFT add rule ip t c ct state new"
-netns_exec $NETNS_NAME "$NFT add rule ip t c udp dport 12345"
+netns_exec $NETNS_NAME "$NFT add rule ip t c udp dport { 12345 }"
 netns_exec $NETNS_NAME "$NFT add rule ip t c ip saddr @s drop"
 netns_exec $NETNS_NAME "$NFT add rule ip t c jump other"
 
@@ -44,7 +44,7 @@ RULESET="table ip t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip saddr @s drop
 		jump other
 	}
diff --git a/tests/shell/testcases/netns/0003many_0 b/tests/shell/testcases/netns/0003many_0
index 36b29cfb..61ad37bd 100755
--- a/tests/shell/testcases/netns/0003many_0
+++ b/tests/shell/testcases/netns/0003many_0
@@ -19,7 +19,7 @@ RULESET="table ip t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip saddr @s drop
 		jump other
 	}
@@ -35,7 +35,7 @@ table ip6 t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip6 saddr @s drop
 		jump other
 	}
@@ -51,7 +51,7 @@ table inet t {
 
 	chain c {
 		ct state new
-		udp dport 12345
+		udp dport { 12345 }
 		ip6 saddr @s drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/0002rollback_rule_0 b/tests/shell/testcases/nft-f/0002rollback_rule_0
index e459b4d4..da3cdc0b 100755
--- a/tests/shell/testcases/nft-f/0002rollback_rule_0
+++ b/tests/shell/testcases/nft-f/0002rollback_rule_0
@@ -11,7 +11,7 @@ GOOD_RULESET="table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/0003rollback_jump_0 b/tests/shell/testcases/nft-f/0003rollback_jump_0
index 06fc50e4..1238f150 100755
--- a/tests/shell/testcases/nft-f/0003rollback_jump_0
+++ b/tests/shell/testcases/nft-f/0003rollback_jump_0
@@ -11,7 +11,7 @@ GOOD_RULESET="table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/0004rollback_set_0 b/tests/shell/testcases/nft-f/0004rollback_set_0
index bf779e9e..25fc870c 100755
--- a/tests/shell/testcases/nft-f/0004rollback_set_0
+++ b/tests/shell/testcases/nft-f/0004rollback_set_0
@@ -11,7 +11,7 @@ GOOD_RULESET="table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/0005rollback_map_0 b/tests/shell/testcases/nft-f/0005rollback_map_0
index 188f459a..90108e72 100755
--- a/tests/shell/testcases/nft-f/0005rollback_map_0
+++ b/tests/shell/testcases/nft-f/0005rollback_map_0
@@ -11,7 +11,7 @@ GOOD_RULESET="table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft
index 2014d502..f6f26158 100644
--- a/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0002rollback_rule_0.nft
@@ -6,7 +6,7 @@ table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft
index 2014d502..f6f26158 100644
--- a/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0003rollback_jump_0.nft
@@ -6,7 +6,7 @@ table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft
index 2014d502..f6f26158 100644
--- a/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0004rollback_set_0.nft
@@ -6,7 +6,7 @@ table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}
diff --git a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft
index 2014d502..f6f26158 100644
--- a/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft
+++ b/tests/shell/testcases/nft-f/dumps/0005rollback_map_0.nft
@@ -6,7 +6,7 @@ table ip t {
 
 	chain c {
 		ct state new
-		tcp dport 22222
+		tcp dport { 22222 }
 		ip saddr @t drop
 		jump other
 	}