From 729936737ae3588d5b79c9f00760a2228586338b Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 12 May 2020 08:25:07 -0400 Subject: [PATCH 24/45] test(dbus): better way to check IPv6_rpfilter expected value (cherry picked from commit 42e349f57a41305354871ca0c0d08fcf800a2fe3) (cherry picked from commit a79695be7243802b49c5bdb131c231b1ef8a9350) --- src/tests/dbus/firewalld.conf.at | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/src/tests/dbus/firewalld.conf.at b/src/tests/dbus/firewalld.conf.at index 4eefa3286f9f..1c957957b3da 100644 --- a/src/tests/dbus/firewalld.conf.at +++ b/src/tests/dbus/firewalld.conf.at @@ -1,8 +1,13 @@ FWD_START_TEST([firewalld.conf]) AT_KEYWORDS(dbus) -dnl Verify defaults over dbus. Should be inline with default firewalld.conf. IF_HOST_SUPPORTS_NFT_FIB([ + EXPECTED_IPV6_RPFILTER_VALUE=yes +], [ + EXPECTED_IPV6_RPFILTER_VALUE=no +]) + +dnl Verify defaults over dbus. Should be inline with default firewalld.conf. DBUS_GETALL([config], [config], 0, [dnl string "AllowZoneDrifting" : variant string "yes" string "AutomaticHelpers" : variant string "no" @@ -10,28 +15,13 @@ string "CleanupOnExit" : variant string "no" string "DefaultZone" : variant string "public" string "FirewallBackend" : variant string "nftables" string "FlushAllOnReload" : variant string "yes" -string "IPv6_rpfilter" : variant string "yes" -string "IndividualCalls" : variant string "no" -string "Lockdown" : variant string "no" -string "LogDenied" : variant string "off" -string "MinimalMark" : variant int32 100 -string "RFC3964_IPv4" : variant string "yes" -])], [ -DBUS_GETALL([config], [config], 0, [dnl -string "AllowZoneDrifting" : variant string "yes" -string "AutomaticHelpers" : variant string "no" -string "CleanupOnExit" : variant string "no" -string "DefaultZone" : variant string "public" -string "FirewallBackend" : variant string "nftables" -string "FlushAllOnReload" : variant string "yes" -string "IPv6_rpfilter" : variant string "no" +string "IPv6_rpfilter" : variant string m4_escape(["${EXPECTED_IPV6_RPFILTER_VALUE}"]) string "IndividualCalls" : variant string "no" string "Lockdown" : variant string "no" string "LogDenied" : variant string "off" string "MinimalMark" : variant int32 100 string "RFC3964_IPv4" : variant string "yes" ]) -]) m4_define([_helper], [ DBUS_SET([config], [config], [string:"$1" $2], 0, ignore) -- 2.27.0