tests: py: missing ip/dnat.t json updates

Missing json update for three new tests added recently.

Fixes: 640dc0c8a3da ("tests: py: extend coverage for dnat with classic range representation")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/tests/py/ip/dnat.t.json b/tests/py/ip/dnat.t.json
index 0481a36837529354f586a83d861223bace97ce5b..ede4d04bdb10995ed3173be4cfa0ee518a9fdee0 100644 (file)
--- a/tests/py/ip/dnat.t.json
+++ b/tests/py/ip/dnat.t.json
@@ -262,3 +262,336 @@
     }
 ]
 
+# iifname "eth0" tcp dport 81 dnat to 192.168.3.2:8080-8999
+[
+    {
+       "match": {
+           "left": {
+               "meta": {
+                   "key": "iifname"
+               }
+           },
+           "op": "==",
+           "right": "eth0"
+       }
+    },
+    {
+       "match": {
+           "left": {
+               "payload": {
+                   "field": "dport",
+                   "protocol": "tcp"
+               }
+           },
+           "op": "==",
+           "right": 81
+       }
+    },
+    {
+       "dnat": {
+           "addr": "192.168.3.2",
+           "port": {
+               "range": [
+                   8080,
+                   8999
+               ]
+           }
+       }
+    }
+]
+
+# iifname "eth0" tcp dport 81 dnat to 192.168.3.2-192.168.3.4:8080-8999
+[
+    {
+       "match": {
+           "left": {
+               "meta": {
+                   "key": "iifname"
+               }
+           },
+           "op": "==",
+           "right": "eth0"
+       }
+    },
+    {
+       "match": {
+           "left": {
+               "payload": {
+                   "field": "dport",
+                   "protocol": "tcp"
+               }
+           },
+           "op": "==",
+           "right": 81
+       }
+    },
+    {
+       "dnat": {
+           "addr": {
+               "range": [
+                   "192.168.3.2",
+                   "192.168.3.4"
+               ]
+           },
+           "port": {
+               "range": [
+                   8080,
+                   8999
+               ]
+           }
+       }
+    }
+]
+
+# iifname "eth0" tcp dport 81 dnat to 192.168.3.2-192.168.3.4:8080
+[
+    {
+       "match": {
+           "left": {
+               "meta": {
+                   "key": "iifname"
+               }
+           },
+           "op": "==",
+           "right": "eth0"
+       }
+    },
+    {
+       "match": {
+           "left": {
+               "payload": {
+                   "field": "dport",
+                   "protocol": "tcp"
+               }
+           },
+           "op": "==",
+           "right": 81
+       }
+    },
+    {
+       "dnat": {
+           "addr": {
+               "range": [
+                   "192.168.3.2",
+                   "192.168.3.4"
+               ]
+           },
+           "port": 8080
+       }
+    }
+]
+
+# dnat ip to ip saddr . tcp dport map { 192.168.1.2 . 80 : 10.141.10.2 . 8888 - 8999 }
+[
+    {
+       "dnat": {
+           "addr": {
+               "map": {
+                   "data": {
+                       "set": [
+                           [
+                               {
+                                   "concat": [
+                                       "192.168.1.2",
+                                       80
+                                   ]
+                               },
+                               {
+                                   "concat": [
+                                       "10.141.10.2",
+                                       {
+                                           "range": [
+                                               8888,
+                                               8999
+                                           ]
+                                       }
+                                   ]
+                               }
+                           ]
+                       ]
+                   },
+                   "key": {
+                       "concat": [
+                           {
+                               "payload": {
+                                   "field": "saddr",
+                                   "protocol": "ip"
+                               }
+                           },
+                           {
+                               "payload": {
+                                   "field": "dport",
+                                   "protocol": "tcp"
+                               }
+                           }
+                       ]
+                   }
+               }
+           },
+           "family": "ip"
+       }
+    }
+]
+
+# dnat ip to ip saddr . tcp dport map { 192.168.1.2 . 80 : 10.141.10.0/24  . 8888 - 8999 }
+[
+    {
+       "dnat": {
+           "addr": {
+               "map": {
+                   "data": {
+                       "set": [
+                           [
+                               {
+                                   "concat": [
+                                       "192.168.1.2",
+                                       80
+                                   ]
+                               },
+                               {
+                                   "concat": [
+                                       {
+                                           "prefix": {
+                                               "addr": "10.141.10.0",
+                                               "len": 24
+                                           }
+                                       },
+                                       {
+                                           "range": [
+                                               8888,
+                                               8999
+                                           ]
+                                       }
+                                   ]
+                               }
+                           ]
+                       ]
+                   },
+                   "key": {
+                       "concat": [
+                           {
+                               "payload": {
+                                   "field": "saddr",
+                                   "protocol": "ip"
+                               }
+                           },
+                           {
+                               "payload": {
+                                   "field": "dport",
+                                   "protocol": "tcp"
+                               }
+                           }
+                       ]
+                   }
+               }
+           },
+           "family": "ip"
+       }
+    }
+]
+
+# dnat ip to ip saddr . tcp dport map { 192.168.1.2 . 80 : 10.141.10.0/24  . 80 }
+[
+    {
+       "dnat": {
+           "addr": {
+               "map": {
+                   "data": {
+                       "set": [
+                           [
+                               {
+                                   "concat": [
+                                       "192.168.1.2",
+                                       80
+                                   ]
+                               },
+                               {
+                                   "concat": [
+                                       {
+                                           "prefix": {
+                                               "addr": "10.141.10.0",
+                                               "len": 24
+                                           }
+                                       },
+                                       80
+                                   ]
+                               }
+                           ]
+                       ]
+                   },
+                   "key": {
+                       "concat": [
+                           {
+                               "payload": {
+                                   "field": "saddr",
+                                   "protocol": "ip"
+                               }
+                           },
+                           {
+                               "payload": {
+                                   "field": "dport",
+                                   "protocol": "tcp"
+                               }
+                           }
+                       ]
+                   }
+               }
+           },
+           "family": "ip"
+       }
+    }
+]
+
+# ip daddr 192.168.0.1 dnat ip to tcp dport map { 443 : 10.141.10.4 . 8443, 80 : 10.141.10.4 . 8080 }
+[
+    {
+       "match": {
+           "left": {
+               "payload": {
+                   "field": "daddr",
+                   "protocol": "ip"
+               }
+           },
+           "op": "==",
+           "right": "192.168.0.1"
+       }
+    },
+    {
+       "dnat": {
+           "addr": {
+               "map": {
+                   "data": {
+                       "set": [
+                           [
+                               80,
+                               {
+                                   "concat": [
+                                       "10.141.10.4",
+                                       8080
+                                   ]
+                               }
+                           ],
+                           [
+                               443,
+                               {
+                                   "concat": [
+                                       "10.141.10.4",
+                                       8443
+                                   ]
+                               }
+                           ]
+                       ]
+                   },
+                   "key": {
+                       "payload": {
+                           "field": "dport",
+                           "protocol": "tcp"
+                       }
+                   }
+               }
+           },
+           "family": "ip"
+       }
+    }
+]
+