From ab11b1cd069d9266fa63fc609a2040d0366eb57a Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 5 Aug 2019 16:06:07 -0400 Subject: [PATCH 76/79] fix: test: regression/rhbz1734765: guard IPv6 usage Fixes: 25032eb3a607 ("test: verify source-based zone dispatch ordered by zone name") (cherry picked from commit f4411b95e127fea7a7ed87cd2b01e59c2ce333c5) (cherry picked from commit 8e13e313bda5408165f70725ed648419d4a23839) --- src/tests/regression/rhbz1734765.at | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/tests/regression/rhbz1734765.at b/src/tests/regression/rhbz1734765.at index 070c43faf756..5145d716e576 100644 --- a/src/tests/regression/rhbz1734765.at +++ b/src/tests/regression/rhbz1734765.at @@ -12,20 +12,32 @@ FWD_CHECK([-q --permanent --new-zone=foobar_01]) FWD_CHECK([-q --permanent --new-zone=foobar_04]) FWD_CHECK([-q --permanent --new-zone=foobar_010]) -FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="10.1.1.1" --add-source="1234:5678::1:1:1"]) -FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="10.1.1.0/24" --add-source="1234:5678::1:1:0/112"]) -FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="10.1.0.0/16" --add-source="1234:5678::1:0:0/96"]) -FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="10.2.2.0/24" --add-source="1234:5678::2:2:0/112"]) -FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="10.2.0.0/16" --add-source="1234:5678::2:0:0/96"]) -FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="10.0.0.0/8" --add-source="1234:5678::0:0:0/80"]) +FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="10.1.1.1"]) +FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="10.1.1.0/24"]) +FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="10.1.0.0/16"]) +FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="10.2.2.0/24"]) +FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="10.2.0.0/16"]) +FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="10.0.0.0/8"]) +IF_IPV6_SUPPORTED([ +FWD_CHECK([-q --permanent --zone=foobar_00 --add-source="1234:5678::1:1:1"]) +FWD_CHECK([-q --permanent --zone=foobar_01 --add-source="1234:5678::1:1:0/112"]) +FWD_CHECK([-q --permanent --zone=foobar_02 --add-source="1234:5678::1:0:0/96"]) +FWD_CHECK([-q --permanent --zone=foobar_03 --add-source="1234:5678::2:2:0/112"]) +FWD_CHECK([-q --permanent --zone=foobar_04 --add-source="1234:5678::2:0:0/96"]) +FWD_CHECK([-q --permanent --zone=foobar_05 --add-source="1234:5678::0:0:0/80"]) +]) FWD_CHECK([-q --permanent --zone=internal --add-interface=foobar0]) FWD_CHECK([-q --permanent --zone=trusted --add-interface=foobar1]) FWD_RELOAD -FWD_CHECK([-q --zone=foobar_010 --add-source="10.10.10.10" --add-source="1234:5678::10:10:10"]) -FWD_CHECK([-q --zone=public --add-source="20.20.20.20" --add-source="1234:5678::20:20:20"]) +FWD_CHECK([-q --zone=foobar_010 --add-source="10.10.10.10"]) +FWD_CHECK([-q --zone=public --add-source="20.20.20.20"]) +IF_IPV6_SUPPORTED([ +FWD_CHECK([-q --zone=foobar_010 --add-source="1234:5678::10:10:10"]) +FWD_CHECK([-q --zone=public --add-source="1234:5678::20:20:20"]) +]) FWD_CHECK([-q --zone=foobar_010 --add-interface=foobar2]) m4_if(nftables, FIREWALL_BACKEND, [dnl -- 2.20.1