|
 |
21c891 |
From a80248c01407613fbff8e5c6054eaef3410a025f Mon Sep 17 00:00:00 2001
|
|
|
21c891 |
From: Eric Garver <e@erig.me>
|
|
|
21c891 |
Date: Thu, 13 Dec 2018 12:19:21 -0500
|
|
|
21c891 |
Subject: [PATCH 14/34] tests/regression/rhbz1601610: modify test to satisfy
|
|
|
21c891 |
buggy kernel versions
|
|
|
21c891 |
|
|
|
21c891 |
Older versions of nftables (kernel) had issues with overlapping sets.
|
|
|
21c891 |
Let's use non-overlapping sets to avoid the kernel bug while still
|
|
|
21c891 |
exercising the cases we want.
|
|
|
21c891 |
|
|
|
21c891 |
This in a kernel bug that was fixed back in v4.6. nftables backend
|
|
|
21c891 |
requires v4.18, but the CI uses a really old kernel.
|
|
|
21c891 |
|
|
|
21c891 |
Kernel fix:
|
|
|
21c891 |
e701001e7cbe ("netfilter: nft_rbtree: allow adjacent intervals with
|
|
|
21c891 |
dynamic updates")
|
|
|
21c891 |
|
|
|
21c891 |
(cherry picked from commit 7925d6ff9dde7e52efed6a28427364b30dbdc363)
|
|
|
21c891 |
(cherry picked from commit bab24ad848c522f7988d05e8ad9f26feb9612658)
|
|
|
21c891 |
---
|
|
|
21c891 |
src/tests/regression/rhbz1601610.at | 10 +++++-----
|
|
|
21c891 |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
21c891 |
|
|
|
21c891 |
diff --git a/src/tests/regression/rhbz1601610.at b/src/tests/regression/rhbz1601610.at
|
|
|
21c891 |
index 5ba0cee44be0..17129a541041 100644
|
|
|
21c891 |
--- a/src/tests/regression/rhbz1601610.at
|
|
|
21c891 |
+++ b/src/tests/regression/rhbz1601610.at
|
|
|
21c891 |
@@ -58,7 +58,7 @@ FWD_CHECK([--permanent --ipset=foobar --get-entries], 0, [
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
dnl rhbz 1644834
|
|
|
21c891 |
-FWD_CHECK([-q --ipset=foobar --add-entry=10.1.0.0/16])
|
|
|
21c891 |
+FWD_CHECK([-q --ipset=foobar --add-entry=10.3.0.0/22])
|
|
|
21c891 |
FWD_CHECK([-q --runtime-to-permanent])
|
|
|
21c891 |
FWD_RELOAD
|
|
|
21c891 |
m4_if(nftables, FIREWALL_BACKEND, [
|
|
|
21c891 |
@@ -67,7 +67,7 @@ table inet firewalld {
|
|
|
21c891 |
set foobar {
|
|
|
21c891 |
type ipv4_addr
|
|
|
21c891 |
flags interval
|
|
|
21c891 |
-elements = { 10.1.0.0/16, 10.2.0.0/22 }
|
|
|
21c891 |
+elements = { 10.2.0.0/22, 10.3.0.0/22 }
|
|
|
21c891 |
}
|
|
|
21c891 |
}
|
|
|
21c891 |
])], [
|
|
|
21c891 |
@@ -75,8 +75,8 @@ IPSET_LIST_SET([foobar], 0, [dnl
|
|
|
21c891 |
Name: foobar
|
|
|
21c891 |
Type: hash:net
|
|
|
21c891 |
Members:
|
|
|
21c891 |
-10.1.0.0/16
|
|
|
21c891 |
10.2.0.0/22
|
|
|
21c891 |
+10.3.0.0/22
|
|
|
21c891 |
])])
|
|
|
21c891 |
|
|
|
21c891 |
dnl rhbz 1644834, again with IndividualCalls=yes
|
|
|
21c891 |
@@ -88,7 +88,7 @@ table inet firewalld {
|
|
|
21c891 |
set foobar {
|
|
|
21c891 |
type ipv4_addr
|
|
|
21c891 |
flags interval
|
|
|
21c891 |
-elements = { 10.1.0.0/16, 10.2.0.0/22 }
|
|
|
21c891 |
+elements = { 10.2.0.0/22, 10.3.0.0/22 }
|
|
|
21c891 |
}
|
|
|
21c891 |
}
|
|
|
21c891 |
])], [
|
|
|
21c891 |
@@ -96,8 +96,8 @@ IPSET_LIST_SET([foobar], 0, [dnl
|
|
|
21c891 |
Name: foobar
|
|
|
21c891 |
Type: hash:net
|
|
|
21c891 |
Members:
|
|
|
21c891 |
-10.1.0.0/16
|
|
|
21c891 |
10.2.0.0/22
|
|
|
21c891 |
+10.3.0.0/22
|
|
|
21c891 |
])])
|
|
|
21c891 |
|
|
|
21c891 |
FWD_END_TEST([-e '/ERROR: COMMAND_FAILED:.*already added.*/d'dnl
|
|
|
21c891 |
--
|
|
|
21c891 |
2.18.0
|
|
|
21c891 |
|