[TCK][PATCH v2] nwfilter: convert ctstate to state

[Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>]

iptables version 1.4.16 and later automatically convert -m state --state ...
to -m conntrack --ctstate ... In the test cases we will then only see 'ctstate'
and convert that back to the older 'state'.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>

---
 scripts/nwfilter/nwfilter2vmtest.sh |    5 +++++
 1 file changed, 5 insertions(+)

Index: libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh
===================================================================
--- libvirt-tck.orig/scripts/nwfilter/nwfilter2vmtest.sh
+++ libvirt-tck/scripts/nwfilter/nwfilter2vmtest.sh
@@ -181,6 +181,11 @@ checkExpectedOutput() {
           sed -i "s/ctdir _REPLY/ctdir REPLY/" ${tmpfile}
         fi
 
+        #iptables >= v1.4.16 converts -m state --state ... to
+        #-m conntrack --ctstate ... We now change ctstate back to
+        #state
+        sed -i "s/ctstate/state/" ${tmpfile}
+
         diff -w ${tmpfile} ${tmpfile2} >/dev/null
 
         if [ $? -ne 0 ]; then

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list