nwfilterxml2firewalldata: Use internal wrapping to wrap output files

As with previous commits use virCommandSetDryRun to invoke
virCommandToString so that it returns pre-wrapped string.

Since virCommand is better aware of where the arguments terminate we can
see an improvement where comments are no longer line-wrapped.

The changes to the 'commonRules' strings were done with the following
regex:

 s/ -/ \\\\\\n-/

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

build-aux/syntax-check.mk

@@ -1713,7 +1713,7 @@ sc_header-ifdef:
 	$(PYTHON) $(top_srcdir)/scripts/header-ifdef.py
 
 sc_test-wrap-argv:
-	$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata' \
+	$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata' \
 	|$(GREP) -E '\.(ldargs|args)' | $(RUNUTF8) xargs \
 	$(PYTHON) $(top_srcdir)/scripts/test-wrap-argv.py --check
 

tests/nwfilterxml2firewalldata/comment-linux.args

@@ -195,8 +195,7 @@ ip6tables \
 -m state \
 --state ESTABLISHED \
 -m comment \
---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \
--f ${tmp}' \
+--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' \
 -j RETURN
 ip6tables \
 -w \
@@ -205,8 +204,7 @@ ip6tables \
 -m state \
 --state NEW,ESTABLISHED \
 -m comment \
---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \
--f ${tmp}' \
+--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' \
 -j ACCEPT
 ip6tables \
 -w \
@@ -215,6 +213,5 @@ ip6tables \
 -m state \
 --state ESTABLISHED \
 -m comment \
---comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm \
--f ${tmp}' \
+--comment 'tmp=`mktemp`; echo ${RANDOM} > ${tmp} ; cat < ${tmp}; rm -f ${tmp}' \
 -j RETURN

tests/nwfilterxml2firewalldata/target-linux.args

@@ -52,8 +52,7 @@ iptables \
 -m state \
 --state NEW,ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir out' \
+--comment 'accept rule -- dir out' \
 -j RETURN
 iptables \
 -w \
@@ -65,8 +64,7 @@ iptables \
 -m state \
 --state ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir out' \
+--comment 'accept rule -- dir out' \
 -j ACCEPT
 iptables \
 -w \
@@ -80,8 +78,7 @@ iptables \
 -m state \
 --state NEW,ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir out' \
+--comment 'accept rule -- dir out' \
 -j RETURN
 iptables \
 -w \
@@ -93,8 +90,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'drop rule   \
--- dir out' \
+--comment 'drop rule   -- dir out' \
 -j DROP
 iptables \
 -w \
@@ -104,8 +100,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'drop rule   \
--- dir out' \
+--comment 'drop rule   -- dir out' \
 -j DROP
 iptables \
 -w \
@@ -117,8 +112,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'drop rule   \
--- dir out' \
+--comment 'drop rule   -- dir out' \
 -j DROP
 iptables \
 -w \
@@ -130,8 +124,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'reject rule \
--- dir out' \
+--comment 'reject rule -- dir out' \
 -j REJECT
 iptables \
 -w \
@@ -141,8 +134,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'reject rule \
--- dir out' \
+--comment 'reject rule -- dir out' \
 -j REJECT
 iptables \
 -w \
@@ -154,8 +146,7 @@ iptables \
 -m dscp \
 --dscp 2 \
 -m comment \
---comment 'reject rule \
--- dir out' \
+--comment 'reject rule -- dir out' \
 -j REJECT
 iptables \
 -w \
@@ -167,8 +158,7 @@ iptables \
 -m state \
 --state ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir in' \
+--comment 'accept rule -- dir in' \
 -j RETURN
 iptables \
 -w \
@@ -182,8 +172,7 @@ iptables \
 -m state \
 --state NEW,ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir in' \
+--comment 'accept rule -- dir in' \
 -j ACCEPT
 iptables \
 -w \
@@ -195,8 +184,7 @@ iptables \
 -m state \
 --state ESTABLISHED \
 -m comment \
---comment 'accept rule \
--- dir in' \
+--comment 'accept rule -- dir in' \
 -j RETURN
 iptables \
 -w \
@@ -206,8 +194,7 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'drop rule   \
--- dir in' \
+--comment 'drop rule   -- dir in' \
 -j DROP
 iptables \
 -w \
@@ -219,8 +206,7 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'drop rule   \
--- dir in' \
+--comment 'drop rule   -- dir in' \
 -j DROP
 iptables \
 -w \
@@ -230,8 +216,7 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'drop rule   \
--- dir in' \
+--comment 'drop rule   -- dir in' \
 -j DROP
 iptables \
 -w \
@@ -241,8 +226,7 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'reject rule \
--- dir in' \
+--comment 'reject rule -- dir in' \
 -j REJECT
 iptables \
 -w \
@@ -254,8 +238,7 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'reject rule \
--- dir in' \
+--comment 'reject rule -- dir in' \
 -j REJECT
 iptables \
 -w \
@@ -265,78 +248,68 @@ iptables \
 -m dscp \
 --dscp 33 \
 -m comment \
---comment 'reject rule \
--- dir in' \
+--comment 'reject rule -- dir in' \
 -j REJECT
 iptables \
 -w \
 -A FJ-vnet0 \
 -p all \
 -m comment \
---comment 'accept rule \
--- dir inout' \
+--comment 'accept rule -- dir inout' \
 -j RETURN
 iptables \
 -w \
 -A FP-vnet0 \
 -p all \
 -m comment \
---comment 'accept rule \
--- dir inout' \
+--comment 'accept rule -- dir inout' \
 -j ACCEPT
 iptables \
 -w \
 -A HJ-vnet0 \
 -p all \
 -m comment \
---comment 'accept rule \
--- dir inout' \
+--comment 'accept rule -- dir inout' \
 -j RETURN
 iptables \
 -w \
 -A FJ-vnet0 \
 -p all \
 -m comment \
---comment 'drop   rule \
--- dir inout' \
+--comment 'drop   rule -- dir inout' \
 -j DROP
 iptables \
 -w \
 -A FP-vnet0 \
 -p all \
 -m comment \
---comment 'drop   rule \
--- dir inout' \
+--comment 'drop   rule -- dir inout' \
 -j DROP
 iptables \
 -w \
 -A HJ-vnet0 \
 -p all \
 -m comment \
---comment 'drop   rule \
--- dir inout' \
+--comment 'drop   rule -- dir inout' \
 -j DROP
 iptables \
 -w \
 -A FJ-vnet0 \
 -p all \
 -m comment \
---comment 'reject rule \
--- dir inout' \
+--comment 'reject rule -- dir inout' \
 -j REJECT
 iptables \
 -w \
 -A FP-vnet0 \
 -p all \
 -m comment \
---comment 'reject rule \
--- dir inout' \
+--comment 'reject rule -- dir inout' \
 -j REJECT
 iptables \
 -w \
 -A HJ-vnet0 \
 -p all \
 -m comment \
---comment 'reject rule \
--- dir inout' \
+--comment 'reject rule -- dir inout' \
 -j REJECT

tests/nwfilterxml2firewalltest.c

@@ -58,90 +58,90 @@ struct _virNWFilterInst {
 
 static const char *commonRules[] = {
     /* Dropping ebtables rules */
-    "ebtables --concurrent -t nat -D PREROUTING -i vnet0 -j libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -D POSTROUTING -o vnet0 -j libvirt-P-vnet0\n"
-    "ebtables --concurrent -t nat -L libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -L libvirt-P-vnet0\n"
-    "ebtables --concurrent -t nat -F libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -X libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -F libvirt-P-vnet0\n"
-    "ebtables --concurrent -t nat -X libvirt-P-vnet0\n",
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-D PREROUTING \\\n-i vnet0 \\\n-j libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-D POSTROUTING \\\n-o vnet0 \\\n-j libvirt-P-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-L libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-L libvirt-P-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-F libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-X libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-F libvirt-P-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-X libvirt-P-vnet0\n",
 
     /* Creating ebtables chains */
-    "ebtables --concurrent -t nat -N libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -N libvirt-P-vnet0\n",
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-N libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-N libvirt-P-vnet0\n",
 
     /* Dropping iptables rules */
-    "iptables -w -D libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet0 -g FP-vnet0\n"
-    "iptables -w -D libvirt-out -m physdev --physdev-out vnet0 -g FP-vnet0\n"
-    "iptables -w -D libvirt-in -m physdev --physdev-in vnet0 -g FJ-vnet0\n"
-    "iptables -w -D libvirt-host-in -m physdev --physdev-in vnet0 -g HJ-vnet0\n"
-    "iptables -w -F FP-vnet0\n"
-    "iptables -w -X FP-vnet0\n"
-    "iptables -w -F FJ-vnet0\n"
-    "iptables -w -X FJ-vnet0\n"
-    "iptables -w -F HJ-vnet0\n"
-    "iptables -w -X HJ-vnet0\n",
+    "iptables \\\n-w \\\n-D libvirt-out \\\n-m physdev \\\n--physdev-is-bridged \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "iptables \\\n-w \\\n-D libvirt-out \\\n-m physdev \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "iptables \\\n-w \\\n-D libvirt-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g FJ-vnet0\n"
+    "iptables \\\n-w \\\n-D libvirt-host-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g HJ-vnet0\n"
+    "iptables \\\n-w \\\n-F FP-vnet0\n"
+    "iptables \\\n-w \\\n-X FP-vnet0\n"
+    "iptables \\\n-w \\\n-F FJ-vnet0\n"
+    "iptables \\\n-w \\\n-X FJ-vnet0\n"
+    "iptables \\\n-w \\\n-F HJ-vnet0\n"
+    "iptables \\\n-w \\\n-X HJ-vnet0\n",
 
     /* Creating iptables chains */
-    "iptables -w -N libvirt-in\n"
-    "iptables -w -N libvirt-out\n"
-    "iptables -w -N libvirt-in-post\n"
-    "iptables -w -N libvirt-host-in\n"
-    "iptables -w -D FORWARD -j libvirt-in\n"
-    "iptables -w -D FORWARD -j libvirt-out\n"
-    "iptables -w -D FORWARD -j libvirt-in-post\n"
-    "iptables -w -D INPUT -j libvirt-host-in\n"
-    "iptables -w -I FORWARD 1 -j libvirt-in\n"
-    "iptables -w -I FORWARD 2 -j libvirt-out\n"
-    "iptables -w -I FORWARD 3 -j libvirt-in-post\n"
-    "iptables -w -I INPUT 1 -j libvirt-host-in\n"
-    "iptables -w -N FP-vnet0\n"
-    "iptables -w -N FJ-vnet0\n"
-    "iptables -w -N HJ-vnet0\n"
-    "iptables -w -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet0 -g FP-vnet0\n"
-    "iptables -w -A libvirt-in -m physdev --physdev-in vnet0 -g FJ-vnet0\n"
-    "iptables -w -A libvirt-host-in -m physdev --physdev-in vnet0 -g HJ-vnet0\n"
-    "iptables -w -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT\n"
-    "iptables -w -A libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT\n",
+    "iptables \\\n-w \\\n-N libvirt-in\n"
+    "iptables \\\n-w \\\n-N libvirt-out\n"
+    "iptables \\\n-w \\\n-N libvirt-in-post\n"
+    "iptables \\\n-w \\\n-N libvirt-host-in\n"
+    "iptables \\\n-w \\\n-D FORWARD \\\n-j libvirt-in\n"
+    "iptables \\\n-w \\\n-D FORWARD \\\n-j libvirt-out\n"
+    "iptables \\\n-w \\\n-D FORWARD \\\n-j libvirt-in-post\n"
+    "iptables \\\n-w \\\n-D INPUT \\\n-j libvirt-host-in\n"
+    "iptables \\\n-w \\\n-I FORWARD 1 \\\n-j libvirt-in\n"
+    "iptables \\\n-w \\\n-I FORWARD 2 \\\n-j libvirt-out\n"
+    "iptables \\\n-w \\\n-I FORWARD 3 \\\n-j libvirt-in-post\n"
+    "iptables \\\n-w \\\n-I INPUT 1 \\\n-j libvirt-host-in\n"
+    "iptables \\\n-w \\\n-N FP-vnet0\n"
+    "iptables \\\n-w \\\n-N FJ-vnet0\n"
+    "iptables \\\n-w \\\n-N HJ-vnet0\n"
+    "iptables \\\n-w \\\n-A libvirt-out \\\n-m physdev \\\n--physdev-is-bridged \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "iptables \\\n-w \\\n-A libvirt-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g FJ-vnet0\n"
+    "iptables \\\n-w \\\n-A libvirt-host-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g HJ-vnet0\n"
+    "iptables \\\n-w \\\n-D libvirt-in-post \\\n-m physdev \\\n--physdev-in vnet0 \\\n-j ACCEPT\n"
+    "iptables \\\n-w \\\n-A libvirt-in-post \\\n-m physdev \\\n--physdev-in vnet0 \\\n-j ACCEPT\n",
 
     /* Dropping ip6tables rules */
-    "ip6tables -w -D libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet0 -g FP-vnet0\n"
-    "ip6tables -w -D libvirt-out -m physdev --physdev-out vnet0 -g FP-vnet0\n"
-    "ip6tables -w -D libvirt-in -m physdev --physdev-in vnet0 -g FJ-vnet0\n"
-    "ip6tables -w -D libvirt-host-in -m physdev --physdev-in vnet0 -g HJ-vnet0\n"
-    "ip6tables -w -F FP-vnet0\n"
-    "ip6tables -w -X FP-vnet0\n"
-    "ip6tables -w -F FJ-vnet0\n"
-    "ip6tables -w -X FJ-vnet0\n"
-    "ip6tables -w -F HJ-vnet0\n"
-    "ip6tables -w -X HJ-vnet0\n",
+    "ip6tables \\\n-w \\\n-D libvirt-out \\\n-m physdev \\\n--physdev-is-bridged \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-D libvirt-out \\\n-m physdev \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-D libvirt-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g FJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-D libvirt-host-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g HJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-F FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-X FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-F FJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-X FJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-F HJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-X HJ-vnet0\n",
 
     /* Creating ip6tables chains */
-    "ip6tables -w -N libvirt-in\n"
-    "ip6tables -w -N libvirt-out\n"
-    "ip6tables -w -N libvirt-in-post\n"
-    "ip6tables -w -N libvirt-host-in\n"
-    "ip6tables -w -D FORWARD -j libvirt-in\n"
-    "ip6tables -w -D FORWARD -j libvirt-out\n"
-    "ip6tables -w -D FORWARD -j libvirt-in-post\n"
-    "ip6tables -w -D INPUT -j libvirt-host-in\n"
-    "ip6tables -w -I FORWARD 1 -j libvirt-in\n"
-    "ip6tables -w -I FORWARD 2 -j libvirt-out\n"
-    "ip6tables -w -I FORWARD 3 -j libvirt-in-post\n"
-    "ip6tables -w -I INPUT 1 -j libvirt-host-in\n"
-    "ip6tables -w -N FP-vnet0\n"
-    "ip6tables -w -N FJ-vnet0\n"
-    "ip6tables -w -N HJ-vnet0\n"
-    "ip6tables -w -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet0 -g FP-vnet0\n"
-    "ip6tables -w -A libvirt-in -m physdev --physdev-in vnet0 -g FJ-vnet0\n"
-    "ip6tables -w -A libvirt-host-in -m physdev --physdev-in vnet0 -g HJ-vnet0\n"
-    "ip6tables -w -D libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT\n"
-    "ip6tables -w -A libvirt-in-post -m physdev --physdev-in vnet0 -j ACCEPT\n",
+    "ip6tables \\\n-w \\\n-N libvirt-in\n"
+    "ip6tables \\\n-w \\\n-N libvirt-out\n"
+    "ip6tables \\\n-w \\\n-N libvirt-in-post\n"
+    "ip6tables \\\n-w \\\n-N libvirt-host-in\n"
+    "ip6tables \\\n-w \\\n-D FORWARD \\\n-j libvirt-in\n"
+    "ip6tables \\\n-w \\\n-D FORWARD \\\n-j libvirt-out\n"
+    "ip6tables \\\n-w \\\n-D FORWARD \\\n-j libvirt-in-post\n"
+    "ip6tables \\\n-w \\\n-D INPUT \\\n-j libvirt-host-in\n"
+    "ip6tables \\\n-w \\\n-I FORWARD 1 \\\n-j libvirt-in\n"
+    "ip6tables \\\n-w \\\n-I FORWARD 2 \\\n-j libvirt-out\n"
+    "ip6tables \\\n-w \\\n-I FORWARD 3 \\\n-j libvirt-in-post\n"
+    "ip6tables \\\n-w \\\n-I INPUT 1 \\\n-j libvirt-host-in\n"
+    "ip6tables \\\n-w \\\n-N FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-N FJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-N HJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-A libvirt-out \\\n-m physdev \\\n--physdev-is-bridged \\\n--physdev-out vnet0 \\\n-g FP-vnet0\n"
+    "ip6tables \\\n-w \\\n-A libvirt-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g FJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-A libvirt-host-in \\\n-m physdev \\\n--physdev-in vnet0 \\\n-g HJ-vnet0\n"
+    "ip6tables \\\n-w \\\n-D libvirt-in-post \\\n-m physdev \\\n--physdev-in vnet0 \\\n-j ACCEPT\n"
+    "ip6tables \\\n-w \\\n-A libvirt-in-post \\\n-m physdev \\\n--physdev-in vnet0 \\\n-j ACCEPT\n",
 
     /* Inserting ebtables rules */
-    "ebtables --concurrent -t nat -A PREROUTING -i vnet0 -j libvirt-J-vnet0\n"
-    "ebtables --concurrent -t nat -A POSTROUTING -o vnet0 -j libvirt-P-vnet0\n",
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-A PREROUTING \\\n-i vnet0 \\\n-j libvirt-J-vnet0\n"
+    "ebtables \\\n--concurrent \\\n-t nat \\\n-A POSTROUTING \\\n-o vnet0 \\\n-j libvirt-P-vnet0\n",
 };
 
 
@@ -375,7 +375,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     memset(&inst, 0, sizeof(inst));
 
-    virCommandSetDryRun(dryRunToken, &buf, false, true, NULL, NULL);
+    virCommandSetDryRun(dryRunToken, &buf, true, true, NULL, NULL);
 
     if (!vars)
         goto cleanup;
@@ -395,7 +395,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
 
     testRemoveCommonRules(actualargv);
 
-    if (virTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFileFull(actualargv, cmdline, false) < 0)
         goto cleanup;
 
     ret = 0;