From: Phil Sutter <phil@nwl.cc>
Date: Tue, 25 Sep 2018 12:24:15 +0000 (+0200)
Subject: tests: shell: Improve gen_chains() in 0021prio_0
X-Git-Tag: v0.9.1~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61dc3b130c1b685ddae713ef9bede864f8bc7d33;p=thirdparty%2Fnftables.git

tests: shell: Improve gen_chains() in 0021prio_0

Enhance the function to accept an optional fourth parameter specifying
the device name, then use it for netdev family. Also remove dubled empty
lines and instead put together what belongs together.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/tests/shell/testcases/chains/0021prio_0 b/tests/shell/testcases/chains/0021prio_0
index 82f52e33..b54b6fae 100755
--- a/tests/shell/testcases/chains/0021prio_0
+++ b/tests/shell/testcases/chains/0021prio_0
@@ -27,11 +27,13 @@ gen_chains () {
 	local family=$1
 	local hook=$2
 	local prioname=$3
+	local device=${4:+device $4}
 
 	for i in -11 -10 0 10 11
 	do
 		local offset=`format_offset $i`
-		$NFT add chain $family x `chainname $hook $prioname $offset` "{ type filter hook $hook priority $prioname $offset; }"
+		local chainname=`chainname $hook $prioname $offset`
+		$NFT add chain $family x $chainname "{ type filter hook $hook $device priority $prioname $offset; }"
 	done
 }
 
@@ -50,7 +52,6 @@ do
 	gen_chains $family postrouting srcnat
 done
 
-
 family=arp
 $NFT add table $family x
 for hook in input output
@@ -58,16 +59,9 @@ do
 	gen_chains $family $hook filter
 done
 
-
 family=netdev
 $NFT add table $family x
-hook=ingress
-prioname=filter
-for i in -11 -10 0 10 11
-do
-	offset=`format_offset $i`
-	$NFT add chain $family x `chainname $hook $prioname $offset` "{ type filter hook $hook device lo priority $prioname $offset; }"
-done
+gen_chains $family ingress filter lo
 
 family=bridge
 $NFT add table $family x
@@ -75,7 +69,6 @@ for hook in prerouting input forward output postrouting
 do
 	gen_chains $family $hook filter
 done
-
 gen_chains $family prerouting dstnat
 gen_chains $family output out
 gen_chains $family postrouting srcnat