From b0aeb2a9c196ea7048545e38e6f3c5759ff4a5ac Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 27 Apr 2022 21:42:22 +0200
Subject: arp: T4397: change CLI syntax to support interface and VRF bound ARP
 entries

* set protocols static arp interface eth0 address 192.0.2.1 mac 01:23:45:67:89:01
---
 interface-definitions/protocols-static-arp.xml.in | 44 +++++++++++++++--------
 1 file changed, 29 insertions(+), 15 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/protocols-static-arp.xml.in b/interface-definitions/protocols-static-arp.xml.in
index e5e8a9ad9..8b1b3b5e1 100644
--- a/interface-definitions/protocols-static-arp.xml.in
+++ b/interface-definitions/protocols-static-arp.xml.in
@@ -4,32 +4,46 @@
     <children>
       <node name="static">
         <children>
-          <tagNode name="arp" owner="${vyos_conf_scripts_dir}/arp.py">
+          <node name="arp" owner="${vyos_conf_scripts_dir}/arp.py">
             <properties>
               <help>Static ARP translation</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>IPv4 destination address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-              </constraint>
             </properties>
             <children>
-              <leafNode name="hwaddr">
+              <tagNode name="interface">
                 <properties>
-                  <help>Translation MAC address</help>
+                  <help>Interface configuration</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py</script>
+                  </completionHelp>
                   <valueHelp>
-                    <format>macaddr</format>
-                    <description>Hardware (MAC) address</description>
+                    <format>txt</format>
+                    <description>Interface name</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="mac-address"/>
+                    <validator name="interface-name"/>
                   </constraint>
                 </properties>
-              </leafNode>
+                <children>
+                  <tagNode name="address">
+                    <properties>
+                      <help>IP address for static ARP entry</help>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>IPv4 destination address</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv4-address"/>
+                      </constraint>
+                    </properties>
+                    <children>
+                      #include <include/generic-description.xml.i>
+                      #include <include/interface/mac.xml.i>
+                    </children>
+                  </tagNode>
+                </children>
+              </tagNode>
             </children>
-          </tagNode>
+          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3