tests: py: complete icmp and icmpv6 update

Update json update and leftover payload update to complete
5fecd2a6ef61 ("src: disentangle ICMP code types").

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/ip/icmp.t.json b/tests/py/ip/icmp.t.json
index 4f0525094cf0454df531f93a46559e6d48fcb2e8..45e04c7802fb001e4496eea0a02afd1b855c8bc1 100644 (file)
--- a/tests/py/ip/icmp.t.json
+++ b/tests/py/ip/icmp.t.json
@@ -459,8 +459,8 @@
             "op": "!=",
             "right": {
                 "set": [
-                    "prot-unreachable",
-                    "frag-needed",
+                    2,
+                    4,
                     33,
                     54,
                     56
@@ -1488,7 +1488,7 @@
                 }
             },
             "op": "==",
-            "right": "host-unreachable"
+            "right": 1
         }
     }
 ]

diff --git a/tests/py/ip/icmp.t.json.output b/tests/py/ip/icmp.t.json.output
index 5a075858e8fae6bdd1015520ae3aa579446dcb84..52fd6016e116b4ee71c9289b7c77160015344065 100644 (file)
--- a/tests/py/ip/icmp.t.json.output
+++ b/tests/py/ip/icmp.t.json.output
@@ -11,8 +11,8 @@
             "op": "==",
             "right": {
                 "set": [
-                    "prot-unreachable",
-                    "frag-needed",
+                    2,
+                    4,
                     33,
                     54,
                     56

diff --git a/tests/py/ip6/icmpv6.t.json b/tests/py/ip6/icmpv6.t.json
index 224a8e817c85c53d3fb0cb46d60bd2c4112986e0..9df886dd2277261f0fd0d61bbcf6e34f627938ed 100644 (file)
--- a/tests/py/ip6/icmpv6.t.json
+++ b/tests/py/ip6/icmpv6.t.json
@@ -532,8 +532,8 @@
             "op": "!=",
             "right": {
                 "set": [
-                    "policy-fail",
-                    "reject-route",
+                    5,
+                    6,
                     7
                 ]
             }
@@ -1136,7 +1136,7 @@
     }
 ]
 
-# icmpv6 type parameter-problem icmpv6 code no-route
+# icmpv6 type parameter-problem icmpv6 code 0
 [
     {
         "match": {
@@ -1159,7 +1159,7 @@
                 }
             },
             "op": "==",
-            "right": "no-route"
+            "right": 0
         }
     }
 ]

diff --git a/tests/py/ip6/icmpv6.t.json.output b/tests/py/ip6/icmpv6.t.json.output
index 7b8f5c1909dbd91621b1bbef77845eecc4e27ef6..f29b346c0c9baa63c9983426ae36c2387d32a7db 100644 (file)
--- a/tests/py/ip6/icmpv6.t.json.output
+++ b/tests/py/ip6/icmpv6.t.json.output
@@ -104,7 +104,7 @@
                 }
             },
             "op": "==",
-            "right": "port-unreachable"
+            "right": 4
         }
     }
 ]
@@ -122,7 +122,7 @@
             "op": "==",
             "right": {
                 "range": [
-                    "addr-unreachable",
+                    3,
                     66
                 ]
             }
@@ -143,8 +143,8 @@
             "op": "==",
             "right": {
                 "set": [
-                    "policy-fail",
-                    "reject-route",
+                    5,
+                    6,
                     7
                 ]
             }

diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6
index fcaf4812244d115b45fe296f86864bca4f71d67e..5b6035d10f701661c03ff5dedfa5babeacc012c0 100644 (file)
--- a/tests/py/ip6/icmpv6.t.payload.ip6
+++ b/tests/py/ip6/icmpv6.t.payload.ip6
@@ -554,7 +554,7 @@ ip6 test-ip6 input
   [ payload load 2b @ transport header + 4 => reg 1 ]
   [ lookup reg 1 set __set%d 0x1 ]
 
-# icmpv6 type parameter-problem icmpv6 code no-route
+# icmpv6 type parameter-problem icmpv6 code 0
 ip6 
   [ meta load l4proto => reg 1 ]
   [ cmp eq reg 1 0x0000003a ]