tests: regression: adapt nat tests to use random-fully

This adapts test to the change that happened in d9a9a79 ('stmt: rename
nat "random-fully" option to "fully-random"').

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

diff --git a/tests/regression/ip/masquerade.t b/tests/regression/ip/masquerade.t
index 981e57ba530d8683617f8afea2d090c276e169c0..95c96fdd50107aefa7a4b22898e6e3ca5f43cdd3 100644 (file)
--- a/tests/regression/ip/masquerade.t
+++ b/tests/regression/ip/masquerade.t
@@ -6,14 +6,14 @@
 udp dport 53 masquerade;ok
 udp dport 53 masquerade random;ok
 udp dport 53 masquerade random,persistent;ok
-udp dport 53 masquerade random,persistent,random-fully;ok;udp dport 53 masquerade random,random-fully,persistent
-udp dport 53 masquerade random,random-fully;ok
-udp dport 53 masquerade random,random-fully,persistent;ok
+udp dport 53 masquerade random,persistent,fully-random;ok;udp dport 53 masquerade random,fully-random,persistent
+udp dport 53 masquerade random,fully-random;ok
+udp dport 53 masquerade random,fully-random,persistent;ok
 udp dport 53 masquerade persistent;ok
 udp dport 53 masquerade persistent,random;ok;udp dport 53 masquerade random,persistent
-udp dport 53 masquerade persistent,random,random-fully;ok;udp dport 53 masquerade random,random-fully,persistent
-udp dport 53 masquerade persistent,random-fully;ok;udp dport 53 masquerade random-fully,persistent
-udp dport 53 masquerade persistent,random-fully,random;ok;udp dport 53 masquerade random,random-fully,persistent
+udp dport 53 masquerade persistent,random,fully-random;ok;udp dport 53 masquerade random,fully-random,persistent
+udp dport 53 masquerade persistent,fully-random;ok;udp dport 53 masquerade fully-random,persistent
+udp dport 53 masquerade persistent,fully-random,random;ok;udp dport 53 masquerade random,fully-random,persistent
 
 # masquerade is a terminal statement
 tcp dport 22 masquerade counter packets 0 bytes 0 accept;fail

diff --git a/tests/regression/ip/redirect.t b/tests/regression/ip/redirect.t
index cb230e2b6128aa7b79a3ceb5f98f06e0be08208d..e51bb3b4db954b2adf2806ac06cfa0d5a3148109 100644 (file)
--- a/tests/regression/ip/redirect.t
+++ b/tests/regression/ip/redirect.t
@@ -7,14 +7,14 @@ udp dport 53 redirect;ok
 # nf_nat flags combination
 udp dport 53 redirect random;ok
 udp dport 53 redirect random,persistent;ok
-udp dport 53 redirect random,persistent,random-fully;ok;udp dport 53 redirect random,random-fully,persistent
-udp dport 53 redirect random,random-fully;ok
-udp dport 53 redirect random,random-fully,persistent;ok
+udp dport 53 redirect random,persistent,fully-random;ok;udp dport 53 redirect random,fully-random,persistent
+udp dport 53 redirect random,fully-random;ok
+udp dport 53 redirect random,fully-random,persistent;ok
 udp dport 53 redirect persistent;ok
 udp dport 53 redirect persistent,random;ok;udp dport 53 redirect random,persistent
-udp dport 53 redirect persistent,random,random-fully;ok;udp dport 53 redirect random,random-fully,persistent
-udp dport 53 redirect persistent,random-fully;ok;udp dport 53 redirect random-fully,persistent
-udp dport 53 redirect persistent,random-fully,random;ok;udp dport 53 redirect random,random-fully,persistent
+udp dport 53 redirect persistent,random,fully-random;ok;udp dport 53 redirect random,fully-random,persistent
+udp dport 53 redirect persistent,fully-random;ok;udp dport 53 redirect fully-random,persistent
+udp dport 53 redirect persistent,fully-random,random;ok;udp dport 53 redirect random,fully-random,persistent
 
 # port specification
 tcp dport 22 redirect :22;ok
@@ -26,13 +26,13 @@ redirect :12341111;fail
 
 # both port and nf_nat flags
 tcp dport 9128 redirect :993 random;ok
-tcp dport 9128 redirect :993 random-fully;ok
+tcp dport 9128 redirect :993 fully-random;ok
 tcp dport 9128 redirect :123 persistent;ok
 tcp dport 9128 redirect :123 random,persistent;ok
 
 # nf_nat flags is the last argument
 udp dport 1234 redirect random :123;fail
-udp dport 21234 redirect persistent,random-fully :431;fail
+udp dport 21234 redirect persistent,fully-random :431;fail
 
 # redirect is a terminal statement
 tcp dport 22 redirect counter packets 0 bytes 0 accept;fail

diff --git a/tests/regression/ip6/masquerade.t b/tests/regression/ip6/masquerade.t
index 05a3d48c369d25753072a9db0bd9fef7b0d44fa4..c9221d29f34f5c4fc5a294f622d82f8c4845d969 100644 (file)
--- a/tests/regression/ip6/masquerade.t
+++ b/tests/regression/ip6/masquerade.t
@@ -6,14 +6,14 @@
 udp dport 53 masquerade;ok
 udp dport 53 masquerade random;ok
 udp dport 53 masquerade random,persistent;ok
-udp dport 53 masquerade random,persistent,random-fully;ok;udp dport 53 masquerade random,random-fully,persistent
-udp dport 53 masquerade random,random-fully;ok
-udp dport 53 masquerade random,random-fully,persistent;ok
+udp dport 53 masquerade random,persistent,fully-random;ok;udp dport 53 masquerade random,fully-random,persistent
+udp dport 53 masquerade random,fully-random;ok
+udp dport 53 masquerade random,fully-random,persistent;ok
 udp dport 53 masquerade persistent;ok
 udp dport 53 masquerade persistent,random;ok;udp dport 53 masquerade random,persistent
-udp dport 53 masquerade persistent,random,random-fully;ok;udp dport 53 masquerade random,random-fully,persistent
-udp dport 53 masquerade persistent,random-fully;ok;udp dport 53 masquerade random-fully,persistent
-udp dport 53 masquerade persistent,random-fully,random;ok;udp dport 53 masquerade random,random-fully,persistent
+udp dport 53 masquerade persistent,random,fully-random;ok;udp dport 53 masquerade random,fully-random,persistent
+udp dport 53 masquerade persistent,fully-random;ok;udp dport 53 masquerade fully-random,persistent
+udp dport 53 masquerade persistent,fully-random,random;ok;udp dport 53 masquerade random,fully-random,persistent
 
 # masquerade is a terminal statement
 tcp dport 22 masquerade counter packets 0 bytes 0 accept;fail

diff --git a/tests/regression/ip6/redirect.t b/tests/regression/ip6/redirect.t
index dce4794a683023c267ad288daf75c794d7db22c7..5f125d7610f92ebc5eacc6da32606f2d4c8b044a 100644 (file)
--- a/tests/regression/ip6/redirect.t
+++ b/tests/regression/ip6/redirect.t
@@ -9,14 +9,14 @@ ip6 saddr fe00::cafe counter packets 0 bytes 0 redirect;ok
 # nf_nat flags combination
 udp dport 53 redirect random;ok
 udp dport 53 redirect random,persistent;ok
-udp dport 53 redirect random,persistent,random-fully;ok;udp dport 53 redirect random,random-fully,persistent
-udp dport 53 redirect random,random-fully;ok
-udp dport 53 redirect random,random-fully,persistent;ok
+udp dport 53 redirect random,persistent,fully-random;ok;udp dport 53 redirect random,fully-random,persistent
+udp dport 53 redirect random,fully-random;ok
+udp dport 53 redirect random,fully-random,persistent;ok
 udp dport 53 redirect persistent;ok
 udp dport 53 redirect persistent,random;ok;udp dport 53 redirect random,persistent
-udp dport 53 redirect persistent,random,random-fully;ok;udp dport 53 redirect random,random-fully,persistent
-udp dport 53 redirect persistent,random-fully;ok;udp dport 53 redirect random-fully,persistent
-udp dport 53 redirect persistent,random-fully,random;ok;udp dport 53 redirect random,random-fully,persistent
+udp dport 53 redirect persistent,random,fully-random;ok;udp dport 53 redirect random,fully-random,persistent
+udp dport 53 redirect persistent,fully-random;ok;udp dport 53 redirect fully-random,persistent
+udp dport 53 redirect persistent,fully-random,random;ok;udp dport 53 redirect random,fully-random,persistent
 
 # port specification
 udp dport 1234 redirect :1234;ok
@@ -27,7 +27,7 @@ redirect :12341111;fail
 
 # both port and nf_nat flags
 tcp dport 9128 redirect :993 random;ok
-tcp dport 9128 redirect :993 random-fully,persistent;ok
+tcp dport 9128 redirect :993 fully-random,persistent;ok
 
 # nf_nat flags are the last argument
 tcp dport 9128 redirect persistent :123;fail