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 d0abf946ad8a37d6cf34495079889943b1733baa..657c4958a64a387a1c2ef4a4b89cbf827aca1828 100644 (file)
--- 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 77c1127efcafdaa1c12e7cfacd84143314df9ca2..15f1ac92d1818e175eab83b3721331a038a0692a 100644 (file)
--- 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 e9d376836100ea1239fbeb0aa9617c090bf50522..02bf4a8857aaace13c54896ec4c65cc4ed399382 100644 (file)
--- 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 c2f3f77791ba2f300c6c80d0a270643aff1da35c..bd7f76f7d1a7a48e35d290397de5bac39280f227 100644 (file)
--- 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 e08722204f439011f02552cf1d3522afedb9904b..0e3ee91db50061fabdda7a230e1759e2f7c6c8c2 100644 (file)
--- 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'