|
 |
8072fb |
From 5e35e5d183773984bc69ff035e7f0c69cc99b282 Mon Sep 17 00:00:00 2001
|
|
|
8072fb |
From: Eric Garver <eric@garver.life>
|
|
|
8072fb |
Date: Mon, 11 May 2020 17:22:39 -0400
|
|
|
8072fb |
Subject: [PATCH 26/45] test(functions): use IndividualCalls if host doesn't
|
|
|
8072fb |
support nft rule index
|
|
|
8072fb |
|
|
|
8072fb |
(cherry picked from commit 5418d89006665e90f7f742bbdc9a551d9d9a1ca7)
|
|
|
8072fb |
(cherry picked from commit 4224d86814ac6aa80fbc58c2b6f8e53a89adcaba)
|
|
|
8072fb |
---
|
|
|
8072fb |
src/tests/dbus/firewalld.conf.at | 8 +++++++-
|
|
|
8072fb |
src/tests/functions.at | 4 ++++
|
|
|
8072fb |
2 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
8072fb |
|
|
|
8072fb |
diff --git a/src/tests/dbus/firewalld.conf.at b/src/tests/dbus/firewalld.conf.at
|
|
|
8072fb |
index 1c957957b3da..14d87767a267 100644
|
|
|
8072fb |
--- a/src/tests/dbus/firewalld.conf.at
|
|
|
8072fb |
+++ b/src/tests/dbus/firewalld.conf.at
|
|
|
8072fb |
@@ -7,6 +7,12 @@ IF_HOST_SUPPORTS_NFT_FIB([
|
|
|
8072fb |
EXPECTED_IPV6_RPFILTER_VALUE=no
|
|
|
8072fb |
])
|
|
|
8072fb |
|
|
|
8072fb |
+IF_HOST_SUPPORTS_NFT_RULE_INDEX([
|
|
|
8072fb |
+ EXPECTED_INDIVIDUAL_CALLS_VALUE=no
|
|
|
8072fb |
+], [
|
|
|
8072fb |
+ EXPECTED_INDIVIDUAL_CALLS_VALUE=yes
|
|
|
8072fb |
+])
|
|
|
8072fb |
+
|
|
|
8072fb |
dnl Verify defaults over dbus. Should be inline with default firewalld.conf.
|
|
|
8072fb |
DBUS_GETALL([config], [config], 0, [dnl
|
|
|
8072fb |
string "AllowZoneDrifting" : variant string "yes"
|
|
|
8072fb |
@@ -16,7 +22,7 @@ string "DefaultZone" : variant string "public"
|
|
|
8072fb |
string "FirewallBackend" : variant string "nftables"
|
|
|
8072fb |
string "FlushAllOnReload" : variant string "yes"
|
|
|
8072fb |
string "IPv6_rpfilter" : variant string m4_escape(["${EXPECTED_IPV6_RPFILTER_VALUE}"])
|
|
|
8072fb |
-string "IndividualCalls" : variant string "no"
|
|
|
8072fb |
+string "IndividualCalls" : variant string m4_escape(["${EXPECTED_INDIVIDUAL_CALLS_VALUE}"])
|
|
|
8072fb |
string "Lockdown" : variant string "no"
|
|
|
8072fb |
string "LogDenied" : variant string "off"
|
|
|
8072fb |
string "MinimalMark" : variant int32 100
|
|
|
8072fb |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
8072fb |
index f83720595d2f..1cde4997f920 100644
|
|
|
8072fb |
--- a/src/tests/functions.at
|
|
|
8072fb |
+++ b/src/tests/functions.at
|
|
|
8072fb |
@@ -221,6 +221,10 @@ m4_define([FWD_START_TEST], [
|
|
|
8072fb |
fi
|
|
|
8072fb |
echo "kill $DBUS_PID" >> ./cleanup_late
|
|
|
8072fb |
|
|
|
8072fb |
+ IF_HOST_SUPPORTS_NFT_RULE_INDEX([], [
|
|
|
8072fb |
+ AT_CHECK([sed -i 's/^IndividualCalls.*/IndividualCalls=yes/' ./firewalld.conf])
|
|
|
8072fb |
+ ])
|
|
|
8072fb |
+
|
|
|
8072fb |
FWD_START_FIREWALLD
|
|
|
8072fb |
])
|
|
|
8072fb |
])
|
|
|
8072fb |
--
|
|
|
8072fb |
2.27.0
|
|
|
8072fb |
|