|
 |
63f414 |
From 6d19a0bdb26f0eeb08dfdd9957c184e90db8766e Mon Sep 17 00:00:00 2001
|
|
|
63f414 |
From: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
63f414 |
Date: Mon, 12 Apr 2021 14:05:36 -0400
|
|
|
63f414 |
Subject: [PATCH 26/30] test(ipset): add test to verify hash:net,net
|
|
|
63f414 |
|
|
|
63f414 |
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
63f414 |
(cherry picked from commit f3bd1297f656217031957eee7cfb4b3ee5ef42f2)
|
|
|
63f414 |
(cherry picked from commit 690ad9abf26f8ec3486704553d891d7d2ce11a80)
|
|
|
63f414 |
---
|
|
|
63f414 |
src/tests/regression/regression.at | 1 +
|
|
|
63f414 |
src/tests/regression/rhbz1936896.at | 32 +++++++++++++++++++++++++++++
|
|
|
63f414 |
2 files changed, 33 insertions(+)
|
|
|
63f414 |
create mode 100644 src/tests/regression/rhbz1936896.at
|
|
|
63f414 |
|
|
|
63f414 |
diff --git a/src/tests/regression/regression.at b/src/tests/regression/regression.at
|
|
|
63f414 |
index 8156ee608189..2a5ad9ef995a 100644
|
|
|
63f414 |
--- a/src/tests/regression/regression.at
|
|
|
63f414 |
+++ b/src/tests/regression/regression.at
|
|
|
63f414 |
@@ -40,3 +40,4 @@ m4_include([regression/rhbz1596304.at])
|
|
|
63f414 |
m4_include([regression/gh703.at])
|
|
|
63f414 |
m4_include([regression/ipset_netmask_allowed.at])
|
|
|
63f414 |
m4_include([regression/rhbz1940928.at])
|
|
|
63f414 |
+m4_include([regression/rhbz1936896.at])
|
|
|
63f414 |
diff --git a/src/tests/regression/rhbz1936896.at b/src/tests/regression/rhbz1936896.at
|
|
|
63f414 |
new file mode 100644
|
|
|
63f414 |
index 000000000000..911db0bc448d
|
|
|
63f414 |
--- /dev/null
|
|
|
63f414 |
+++ b/src/tests/regression/rhbz1936896.at
|
|
|
63f414 |
@@ -0,0 +1,32 @@
|
|
|
63f414 |
+FWD_START_TEST([ipset type hash:net,net])
|
|
|
63f414 |
+AT_KEYWORDS(rhbz1936896)
|
|
|
63f414 |
+CHECK_IPSET
|
|
|
63f414 |
+
|
|
|
63f414 |
+FWD_CHECK([-q --permanent --new-ipset testset --type hash:net,net])
|
|
|
63f414 |
+FWD_CHECK([--permanent --ipset=testset --add-entry=192.168.0.0/24,10.0.1.0/24], 0, ignore)
|
|
|
63f414 |
+FWD_RELOAD
|
|
|
63f414 |
+FWD_CHECK([--permanent --info-ipset=testset | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
63f414 |
+ testset
|
|
|
63f414 |
+ type: hash:net,net
|
|
|
63f414 |
+ options:
|
|
|
63f414 |
+ entries: 192.168.0.0/24,10.0.1.0/24
|
|
|
63f414 |
+])])
|
|
|
63f414 |
+
|
|
|
63f414 |
+IPSET_LIST_SET([testset], 0, [dnl
|
|
|
63f414 |
+ Name: testset
|
|
|
63f414 |
+ Type: hash:net,net
|
|
|
63f414 |
+ Members:
|
|
|
63f414 |
+ 192.168.0.0/24,10.0.1.0/24
|
|
|
63f414 |
+])
|
|
|
63f414 |
+
|
|
|
63f414 |
+NFT_LIST_SET([testset], 0, [dnl
|
|
|
63f414 |
+ table inet firewalld {
|
|
|
63f414 |
+ set testset {
|
|
|
63f414 |
+ type ipv4_addr . ipv4_addr
|
|
|
63f414 |
+ flags interval
|
|
|
63f414 |
+ elements = { 192.168.0.0/24 . 10.0.1.0/24 }
|
|
|
63f414 |
+ }
|
|
|
63f414 |
+ }
|
|
|
63f414 |
+])
|
|
|
63f414 |
+
|
|
|
63f414 |
+FWD_END_TEST
|
|
|
63f414 |
--
|
|
|
63f414 |
2.27.0
|
|
|
63f414 |
|