From 46e8fab43f6411b4eb191519c49d3bb29ecfb828 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 12 Dec 2014 18:45:03 +0100 Subject: 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 --- tests/regression/ip/masquerade.t | 12 ++++++------ tests/regression/ip/redirect.t | 16 ++++++++-------- tests/regression/ip6/masquerade.t | 12 ++++++------ tests/regression/ip6/redirect.t | 14 +++++++------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/regression/ip/masquerade.t b/tests/regression/ip/masquerade.t index 981e57ba..95c96fdd 100644 --- 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 cb230e2b..e51bb3b4 100644 --- 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 05a3d48c..c9221d29 100644 --- 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 dce4794a..5f125d76 100644 --- 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 -- cgit v1.2.3