Revert "evaluate: translate meter into dynamic set"

This reverts commit b8f8ddfff7335d3a8bebf5d85085974ae36f4099.

Only tests/shell, since translation of meter to dynamic set is not
available in 1.0.6.y

6 files changed, 24 insertions, 71 deletions

diff --git a/tests/shell/testcases/sets/0022type_selective_flush_0 b/tests/shell/testcases/sets/0022type_selective_flush_0
index 48f6875b..6062913b 100755
--- a/tests/shell/testcases/sets/0022type_selective_flush_0
+++ b/tests/shell/testcases/sets/0022type_selective_flush_0
@@ -16,7 +16,7 @@ $NFT -f - <<< "$RULESET"
 # Commands that should be invalid
 
 declare -a cmds=(
-		"flush set t m"
+		"flush set t m" "flush set t f"
 		"flush map t s" "flush map t f"
 		"flush meter t s" "flush meter t m"
 		)
diff --git a/tests/shell/testcases/sets/0038meter_list_0 b/tests/shell/testcases/sets/0038meter_list_0
index 7c37c1d8..e9e0f6fb 100755
--- a/tests/shell/testcases/sets/0038meter_list_0
+++ b/tests/shell/testcases/sets/0038meter_list_0
@@ -14,12 +14,7 @@ RULESET="
 "
 
 expected_output="table ip t {
-	set s {
-		type ipv4_addr
-		size 256
-		flags dynamic,timeout
-	}
-	set m {
+	meter m {
 		type ipv4_addr
 		size 128
 		flags dynamic
diff --git a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
index c6171392..ce391a6c 100644
--- a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
@@ -42,19 +42,6 @@
       }
     },
     {
-      "set": {
-        "family": "ip",
-        "name": "f",
-        "table": "t",
-        "type": "ipv4_addr",
-        "handle": 0,
-        "size": 1024,
-        "flags": [
-          "dynamic"
-        ]
-      }
-    },
-    {
       "rule": {
         "family": "ip",
         "table": "t",
@@ -74,24 +61,22 @@
             }
           },
           {
-            "set": {
-              "op": "add",
-              "elem": {
+            "meter": {
+              "key": {
                 "payload": {
                   "protocol": "ip",
                   "field": "saddr"
                 }
               },
-              "set": "@f",
-              "stmt": [
-                {
-                  "limit": {
-                    "rate": 10,
-                    "burst": 5,
-                    "per": "second"
-                  }
+              "stmt": {
+                "limit": {
+                  "rate": 10,
+                  "burst": 5,
+                  "per": "second"
                 }
-              ]
+              },
+              "size": 1024,
+              "name": "f"
             }
           }
         ]
diff --git a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.nft b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.nft
index 38987ded..0a4cb0a5 100644
--- a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.nft
+++ b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.nft
@@ -7,13 +7,7 @@ table ip t {
 		type ipv4_addr : inet_service
 	}
 
-	set f {
-		type ipv4_addr
-		size 1024
-		flags dynamic
-	}
-
 	chain c {
-		tcp dport 80 add @f { ip saddr limit rate 10/second burst 5 packets }
+		tcp dport 80 meter f size 1024 { ip saddr limit rate 10/second burst 5 packets }
 	}
 }
diff --git a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
index 5b13f59a..40b86f82 100644
--- a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
@@ -37,19 +37,6 @@
       }
     },
     {
-      "set": {
-        "family": "ip",
-        "name": "m",
-        "table": "t",
-        "type": "ipv4_addr",
-        "handle": 0,
-        "size": 128,
-        "flags": [
-          "dynamic"
-        ]
-      }
-    },
-    {
       "rule": {
         "family": "ip",
         "table": "t",
@@ -69,24 +56,22 @@
             }
           },
           {
-            "set": {
-              "op": "add",
-              "elem": {
+            "meter": {
+              "key": {
                 "payload": {
                   "protocol": "ip",
                   "field": "saddr"
                 }
               },
-              "set": "@m",
-              "stmt": [
-                {
-                  "limit": {
-                    "rate": 10,
-                    "burst": 5,
-                    "per": "second"
-                  }
+              "stmt": {
+                "limit": {
+                  "rate": 10,
+                  "burst": 5,
+                  "per": "second"
                 }
-              ]
+              },
+              "size": 128,
+              "name": "m"
             }
           }
         ]
diff --git a/tests/shell/testcases/sets/dumps/0038meter_list_0.nft b/tests/shell/testcases/sets/dumps/0038meter_list_0.nft
index 8037dfa5..f274086b 100644
--- a/tests/shell/testcases/sets/dumps/0038meter_list_0.nft
+++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.nft
@@ -5,13 +5,7 @@ table ip t {
 		flags dynamic,timeout
 	}
 
-	set m {
-		type ipv4_addr
-		size 128
-		flags dynamic
-	}
-
 	chain c {
-		tcp dport 80 add @m { ip saddr limit rate 10/second burst 5 packets }
+		tcp dport 80 meter m size 128 { ip saddr limit rate 10/second burst 5 packets }
 	}
 }