Revert "evaluate: translate meter into dynamic set"

This reverts commit b8f8ddfff7335d3a8bebf5d85085974ae36f4099 upstream.

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

diff --git a/tests/shell/testcases/sets/0022type_selective_flush_0 b/tests/shell/testcases/sets/0022type_selective_flush_0
index 48f6875bf459fda9dd10e11c90f3381dfdf4c36d..6062913b52729a16581fce98fdd39d75d3fe3b2d 100755 (executable)
--- 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 7c37c1d81131bb90eb4721c85c33b9a77d00885b..e9e0f6fb02b14f28779b902f8b6f84232afea5df 100755 (executable)
--- 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 c617139235c239598fbfa2cb8a145aab023029b6..ce391a6c37f9cc8970f0a46c22d18cd850094c28 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0022type_selective_flush_0.json-nft
@@ -41,19 +41,6 @@
         "map": "inet_service"
       }
     },
-    {
-      "set": {
-        "family": "ip",
-        "name": "f",
-        "table": "t",
-        "type": "ipv4_addr",
-        "handle": 0,
-        "size": 1024,
-        "flags": [
-          "dynamic"
-        ]
-      }
-    },
     {
       "rule": {
         "family": "ip",
@@ -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 38987ded39e0d3699bb2d94047c594d523b641e4..0a4cb0a54d73030ba46eb4d687c2cd78667e0485 100644 (file)
--- 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 5b13f59a72615f2e45ccabae03199211d3947c71..40b86f82eba331a9c0ef4be1b11d2371b7175c96 100644 (file)
--- a/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/0038meter_list_0.json-nft
@@ -36,19 +36,6 @@
         ]
       }
     },
-    {
-      "set": {
-        "family": "ip",
-        "name": "m",
-        "table": "t",
-        "type": "ipv4_addr",
-        "handle": 0,
-        "size": 128,
-        "flags": [
-          "dynamic"
-        ]
-      }
-    },
     {
       "rule": {
         "family": "ip",
@@ -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 8037dfa502b4d491a31119ca1171bd31d2547c1a..f274086b5285431462f7651c00010cb90b23ab96 100644 (file)
--- 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 }
        }
 }