Partial revert "tests: py: move meter tests to tests/shell"

c4c740117f6fbf39dd67dd87635ea8b497718ad7

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

2 files changed, 24 insertions, 96 deletions

diff --git a/tests/shell/testcases/sets/dumps/meter_0.json-nft b/tests/shell/testcases/sets/dumps/meter_0.json-nft
index c318e4f2..0428ebd3 100644
--- a/tests/shell/testcases/sets/dumps/meter_0.json-nft
+++ b/tests/shell/testcases/sets/dumps/meter_0.json-nft
@@ -23,40 +23,6 @@
       }
     },
     {
-      "set": {
-        "family": "ip6",
-        "name": "acct_out",
-        "table": "test",
-        "type": [
-          "iface_index",
-          "ipv6_addr"
-        ],
-        "handle": 0,
-        "size": 4096,
-        "flags": [
-          "timeout",
-          "dynamic"
-        ]
-      }
-    },
-    {
-      "set": {
-        "family": "ip6",
-        "name": "acct_out2",
-        "table": "test",
-        "type": [
-          "ipv6_addr",
-          "iface_index"
-        ],
-        "handle": 0,
-        "size": 12345,
-        "flags": [
-          "timeout",
-          "dynamic"
-        ]
-      }
-    },
-    {
       "rule": {
         "family": "ip6",
         "table": "test",
@@ -64,9 +30,8 @@
         "handle": 0,
         "expr": [
           {
-            "set": {
-              "op": "update",
-              "elem": {
+            "meter": {
+              "key": {
                 "elem": {
                   "val": {
                     "concat": [
@@ -86,12 +51,11 @@
                   "timeout": 600
                 }
               },
-              "set": "@acct_out",
-              "stmt": [
-                {
-                  "counter": null
-                }
-              ]
+              "stmt": {
+                "counter": null
+              },
+              "size": 4096,
+              "name": "acct_out"
             }
           }
         ]
@@ -105,9 +69,8 @@
         "handle": 0,
         "expr": [
           {
-            "set": {
-              "op": "update",
-              "elem": {
+            "meter": {
+              "key": {
                 "elem": {
                   "val": {
                     "concat": [
@@ -127,12 +90,11 @@
                   "timeout": 600
                 }
               },
-              "set": "@acct_out2",
-              "stmt": [
-                {
-                  "counter": null
-                }
-              ]
+              "stmt": {
+                "counter": null
+              },
+              "size": 12345,
+              "name": "acct_out2"
             }
           }
         ]
@@ -154,20 +116,6 @@
       }
     },
     {
-      "set": {
-        "family": "ip",
-        "name": "xyz",
-        "table": "test",
-        "type": "ipv4_addr",
-        "handle": 0,
-        "size": 8192,
-        "flags": [
-          "timeout",
-          "dynamic"
-        ]
-      }
-    },
-    {
       "rule": {
         "family": "ip",
         "table": "test",
@@ -175,9 +123,8 @@
         "handle": 0,
         "expr": [
           {
-            "set": {
-              "op": "update",
-              "elem": {
+            "meter": {
+              "key": {
                 "elem": {
                   "val": {
                     "payload": {
@@ -188,12 +135,11 @@
                   "timeout": 30
                 }
               },
-              "set": "@xyz",
-              "stmt": [
-                {
-                  "counter": null
-                }
-              ]
+              "stmt": {
+                "counter": null
+              },
+              "size": 8192,
+              "name": "xyz"
             }
           }
         ]
diff --git a/tests/shell/testcases/sets/dumps/meter_0.nft b/tests/shell/testcases/sets/dumps/meter_0.nft
index 3843f9a9..f05c275b 100644
--- a/tests/shell/testcases/sets/dumps/meter_0.nft
+++ b/tests/shell/testcases/sets/dumps/meter_0.nft
@@ -1,29 +1,11 @@
 table ip6 test {
-	set acct_out {
-		type iface_index . ipv6_addr
-		size 4096
-		flags dynamic,timeout
-	}
-
-	set acct_out2 {
-		type ipv6_addr . iface_index
-		size 12345
-		flags dynamic,timeout
-	}
-
 	chain test {
-		update @acct_out { iif . ip6 saddr timeout 10m counter }
-		update @acct_out2 { ip6 saddr . iif timeout 10m counter }
+		meter acct_out size 4096 { iif . ip6 saddr timeout 10m counter }
+		meter acct_out2 size 12345 { ip6 saddr . iif timeout 10m counter }
 	}
 }
 table ip test {
-	set xyz {
-		type ipv4_addr
-		size 8192
-		flags dynamic,timeout
-	}
-
 	chain test {
-		update @xyz { ip saddr timeout 30s counter }
+		meter xyz size 8192 { ip saddr timeout 30s counter }
 	}
 }