ifconfig: T1939: provide abstraction for interface "ip" option

Provide an XML/Python abstraction to

* ip disable-arp-filter
* ip enable-arp-accept
* ip enable-arp-announce
* ip enable-arp-ignore

The old implementation can co-exist until the last interfaces have been
migrated.

11 files changed, 60 insertions, 0 deletions

diff --git a/interface-definitions/include/interface-disable-arp-filter.xml.i b/interface-definitions/include/interface-disable-arp-filter.xml.i
new file mode 100644
index 000000000..ec3f51b2d
--- /dev/null
+++ b/interface-definitions/include/interface-disable-arp-filter.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable-arp-filter">
+  <properties>
+    <help>Disable ARP filter on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-enable-arp-accept.xml.i b/interface-definitions/include/interface-enable-arp-accept.xml.i
new file mode 100644
index 000000000..69f26b322
--- /dev/null
+++ b/interface-definitions/include/interface-enable-arp-accept.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="enable-arp-accept">
+  <properties>
+    <help>Enable ARP accept on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-enable-arp-announce.xml.i b/interface-definitions/include/interface-enable-arp-announce.xml.i
new file mode 100644
index 000000000..8d51874c1
--- /dev/null
+++ b/interface-definitions/include/interface-enable-arp-announce.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="enable-arp-announce">
+  <properties>
+    <help>Enable ARP announce on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/interface-enable-arp-ignore.xml.i b/interface-definitions/include/interface-enable-arp-ignore.xml.i
new file mode 100644
index 000000000..9adc0f17e
--- /dev/null
+++ b/interface-definitions/include/interface-enable-arp-ignore.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="enable-arp-ignore">
+  <properties>
+    <help>Enable ARP ignore on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index cb0943162..2120aa32d 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -32,6 +32,14 @@
         <constraintErrorMessage>Ethertype must be 0x88A8 or 0x8100</constraintErrorMessage>
       </properties>
     </leafNode>
+    <node name="ip">
+      <children>
+        #include <include/interface-disable-arp-filter.xml.i>
+        #include <include/interface-enable-arp-accept.xml.i>
+        #include <include/interface-enable-arp-announce.xml.i>
+        #include <include/interface-enable-arp-ignore.xml.i>
+      </children>
+    </node>
     #include <include/interface-mac.xml.i>
     #include <include/interface-mtu-68-9000.xml.i>
     <tagNode name="vif-c">
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 7c8a29a93..85e901852 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -43,6 +43,10 @@
     <node name="ip">
       <children>
         #include <include/interface-arp-cache-timeout.xml.i>
+        #include <include/interface-disable-arp-filter.xml.i>
+        #include <include/interface-enable-arp-accept.xml.i>
+        #include <include/interface-enable-arp-announce.xml.i>
+        #include <include/interface-enable-arp-ignore.xml.i>
         #include <include/interface-enable-proxy-arp.xml.i>
       </children>
     </node>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index e6557a967..55f0f148f 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -80,6 +80,10 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
+              #include <include/interface-disable-arp-filter.xml.i>
+              #include <include/interface-enable-arp-accept.xml.i>
+              #include <include/interface-enable-arp-announce.xml.i>
+              #include <include/interface-enable-arp-ignore.xml.i>
               #include <include/interface-enable-proxy-arp.xml.i>
               #include <include/interface-proxy-arp-pvlan.xml.i>
             </children>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 6e4531a7e..8351723cf 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -79,6 +79,10 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
+              #include <include/interface-enable-arp-accept.xml.i>
+              #include <include/interface-enable-arp-announce.xml.i>
+              #include <include/interface-enable-arp-ignore.xml.i>
+              #include <include/interface-disable-arp-filter.xml.i>
             </children>
           </node>
           #include <include/interface-mac.xml.i>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 7fa20ac18..b85b55e95 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -70,6 +70,10 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
+              #include <include/interface-disable-arp-filter.xml.i>
+              #include <include/interface-enable-arp-accept.xml.i>
+              #include <include/interface-enable-arp-announce.xml.i>
+              #include <include/interface-enable-arp-ignore.xml.i>
               #include <include/interface-enable-proxy-arp.xml.i>
               #include <include/interface-proxy-arp-pvlan.xml.i>
             </children>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index ec15a806a..ceb75cb34 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -38,6 +38,10 @@
           <node name="ip">
             <children>
               #include <include/interface-arp-cache-timeout.xml.i>
+              #include <include/interface-disable-arp-filter.xml.i>
+              #include <include/interface-enable-arp-accept.xml.i>
+              #include <include/interface-enable-arp-announce.xml.i>
+              #include <include/interface-enable-arp-ignore.xml.i>
               #include <include/interface-enable-proxy-arp.xml.i>
             </children>
           </node>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 53c448930..e76a193a0 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -460,6 +460,14 @@
               <valueless/>
             </properties>
           </leafNode>
+          <node name="ip">
+            <children>
+              #include <include/interface-disable-arp-filter.xml.i>
+              #include <include/interface-enable-arp-accept.xml.i>
+              #include <include/interface-enable-arp-announce.xml.i>
+              #include <include/interface-enable-arp-ignore.xml.i>
+            </children>
+          </node>
           <leafNode name="hw-id">
             <properties>
               <help>Media Access Control (MAC) address</help>