From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 6 Dec 2017 16:23:54 +0000 (+0000)
Subject: nwfilter: remove bogus 'protocolid' attribute on arp/rarp fields
X-Git-Tag: v4.0.0-rc1~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15f42b52fd7ca4c30861b85334d7911a65fe17b9;p=thirdparty%2Flibvirt.git

nwfilter: remove bogus 'protocolid' attribute on arp/rarp fields

Various example XML documents for arp/rarp filtering have a protocolid
XML attribute defined. This is never parsed or output by the libvirt XML
handling code, so shouldn't be present in example XML files either

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/tests/nwfilterxml2firewalldata/arp.xml b/tests/nwfilterxml2firewalldata/arp.xml
index d0abf946ad..657c4958a6 100644
--- a/tests/nwfilterxml2firewalldata/arp.xml
+++ b/tests/nwfilterxml2firewalldata/arp.xml
@@ -2,7 +2,6 @@
   <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
   <rule action='accept' direction='out'>
      <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff'
-          protocolid='arp'
           dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff'
           hwtype='12'
           protocoltype='34'
diff --git a/tests/nwfilterxml2firewalldata/rarp.xml b/tests/nwfilterxml2firewalldata/rarp.xml
index 77c1127efc..15f1ac92d1 100644
--- a/tests/nwfilterxml2firewalldata/rarp.xml
+++ b/tests/nwfilterxml2firewalldata/rarp.xml
@@ -2,7 +2,6 @@
   <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
   <rule action='accept' direction='out'>
      <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff'
-           protocolid='rarp'
            dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff'
            hwtype='12'
            protocoltype='34'
diff --git a/tests/nwfilterxml2xmlin/arp-test.xml b/tests/nwfilterxml2xmlin/arp-test.xml
index e9d3768361..02bf4a8857 100644
--- a/tests/nwfilterxml2xmlin/arp-test.xml
+++ b/tests/nwfilterxml2xmlin/arp-test.xml
@@ -2,7 +2,6 @@
   <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
   <rule action='accept' direction='out'>
      <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff'
-          protocolid='arp'
           dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff'
           hwtype='12'
           protocoltype='34'
diff --git a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml b/tests/nwfilterxml2xmlin/chain_prefixtest1.xml
index c2f3f77791..bd7f76f7d1 100644
--- a/tests/nwfilterxml2xmlin/chain_prefixtest1.xml
+++ b/tests/nwfilterxml2xmlin/chain_prefixtest1.xml
@@ -2,7 +2,6 @@
   <uuid>e5700920-a333-4c05-8016-b669e46b7599</uuid>
   <rule action='accept' direction='out'>
      <arp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff'
-          protocolid='arp'
           dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff'
           hwtype='12'
           protocoltype='34'
diff --git a/tests/nwfilterxml2xmlin/rarp-test.xml b/tests/nwfilterxml2xmlin/rarp-test.xml
index e08722204f..0e3ee91db5 100644
--- a/tests/nwfilterxml2xmlin/rarp-test.xml
+++ b/tests/nwfilterxml2xmlin/rarp-test.xml
@@ -2,7 +2,6 @@
   <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
   <rule action='accept' direction='out'>
      <rarp srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:ff'
-           protocolid='rarp'
            dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff'
            hwtype='12'
            protocoltype='34'