From fe4da6288649b32779d30d5672e39cae40e72100 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Thu, 9 Mar 2023 19:39:20 +0100
Subject: xml: T4952: improve interface completion helper CLI experience

---
 interface-definitions/include/babel/interface.xml.i                   | 2 +-
 interface-definitions/include/bgp/neighbor-update-source.xml.i        | 2 +-
 interface-definitions/include/bgp/protocol-common-config.xml.i        | 4 ++--
 interface-definitions/include/dhcp-interface-multi.xml.i              | 2 +-
 interface-definitions/include/dhcp-interface.xml.i                    | 2 +-
 interface-definitions/include/eigrp/protocol-common-config.xml.i      | 2 +-
 interface-definitions/include/firewall/match-interface.xml.i          | 2 +-
 interface-definitions/include/generic-interface-broadcast.xml.i       | 2 +-
 interface-definitions/include/generic-interface-multi-broadcast.xml.i | 2 +-
 interface-definitions/include/generic-interface-multi.xml.i           | 2 +-
 interface-definitions/include/generic-interface.xml.i                 | 2 +-
 interface-definitions/include/inbound-interface.xml.i                 | 2 +-
 interface-definitions/include/interface/dhcpv6-options.xml.i          | 2 +-
 interface-definitions/include/interface/inbound-interface.xml.i       | 2 +-
 interface-definitions/include/interface/mirror.xml.i                  | 4 ++--
 interface-definitions/include/interface/redirect.xml.i                | 2 +-
 interface-definitions/include/isis/protocol-common-config.xml.i       | 2 +-
 interface-definitions/include/nat-interface.xml.i                     | 2 +-
 interface-definitions/include/ospf/protocol-common-config.xml.i       | 2 +-
 interface-definitions/include/ospfv3/protocol-common-config.xml.i     | 2 +-
 interface-definitions/include/rip/interface.xml.i                     | 2 +-
 interface-definitions/include/routing-passive-interface.xml.i         | 2 +-
 interface-definitions/include/source-interface-ethernet.xml.i         | 2 +-
 interface-definitions/include/source-interface.xml.i                  | 2 +-
 interface-definitions/include/static/static-route-interface.xml.i     | 2 +-
 interface-definitions/include/static/static-route.xml.i               | 2 +-
 interface-definitions/include/static/static-route6.xml.i              | 2 +-
 27 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/babel/interface.xml.i b/interface-definitions/include/babel/interface.xml.i
index 549e4909d..586eca7a5 100644
--- a/interface-definitions/include/babel/interface.xml.i
+++ b/interface-definitions/include/babel/interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface name</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/bgp/neighbor-update-source.xml.i b/interface-definitions/include/bgp/neighbor-update-source.xml.i
index 60c127e8f..0acec4126 100644
--- a/interface-definitions/include/bgp/neighbor-update-source.xml.i
+++ b/interface-definitions/include/bgp/neighbor-update-source.xml.i
@@ -5,7 +5,7 @@
     <help>Source IP of routing updates</help>
     <completionHelp>
       <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>ipv4</format>
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 0d88c7b25..7a3617044 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -359,7 +359,7 @@
               <properties>
                 <help>Interface</help>
                 <completionHelp>
-                  <script>${vyos_completion_dir}/list_interfaces.py</script>
+                  <script>${vyos_completion_dir}/list_interfaces</script>
                 </completionHelp>
                 <multi/>
               </properties>
@@ -739,7 +739,7 @@
               <properties>
                 <help>Interface</help>
                 <completionHelp>
-                  <script>${vyos_completion_dir}/list_interfaces.py</script>
+                  <script>${vyos_completion_dir}/list_interfaces</script>
                 </completionHelp>
                 <multi/>
               </properties>
diff --git a/interface-definitions/include/dhcp-interface-multi.xml.i b/interface-definitions/include/dhcp-interface-multi.xml.i
index c74751a19..e10341037 100644
--- a/interface-definitions/include/dhcp-interface-multi.xml.i
+++ b/interface-definitions/include/dhcp-interface-multi.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>DHCP interface supplying next-hop IP address</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/dhcp-interface.xml.i b/interface-definitions/include/dhcp-interface.xml.i
index f5107ba2b..24edbbd15 100644
--- a/interface-definitions/include/dhcp-interface.xml.i
+++ b/interface-definitions/include/dhcp-interface.xml.i
@@ -2,7 +2,7 @@
       <properties>
         <help>DHCP interface supplying next-hop IP address</help>
         <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
+          <script>${vyos_completion_dir}/list_interfaces</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
diff --git a/interface-definitions/include/eigrp/protocol-common-config.xml.i b/interface-definitions/include/eigrp/protocol-common-config.xml.i
index 30ddc5d11..88365187a 100644
--- a/interface-definitions/include/eigrp/protocol-common-config.xml.i
+++ b/interface-definitions/include/eigrp/protocol-common-config.xml.i
@@ -59,7 +59,7 @@
   <properties>
     <help>Suppress routing updates on an interface</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/firewall/match-interface.xml.i b/interface-definitions/include/firewall/match-interface.xml.i
index 675a87574..3e52422cf 100644
--- a/interface-definitions/include/firewall/match-interface.xml.i
+++ b/interface-definitions/include/firewall/match-interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Match interface</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/generic-interface-broadcast.xml.i b/interface-definitions/include/generic-interface-broadcast.xml.i
index af35a888b..82bfc139b 100644
--- a/interface-definitions/include/generic-interface-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-broadcast.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface Name to use</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+      <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/generic-interface-multi-broadcast.xml.i b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
index 1ae38fb43..8160f816d 100644
--- a/interface-definitions/include/generic-interface-multi-broadcast.xml.i
+++ b/interface-definitions/include/generic-interface-multi-broadcast.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface Name to use</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+      <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/generic-interface-multi.xml.i b/interface-definitions/include/generic-interface-multi.xml.i
index 16916ff54..1b8dc102b 100644
--- a/interface-definitions/include/generic-interface-multi.xml.i
+++ b/interface-definitions/include/generic-interface-multi.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface to use</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/generic-interface.xml.i b/interface-definitions/include/generic-interface.xml.i
index 36ddee417..9417f9ef0 100644
--- a/interface-definitions/include/generic-interface.xml.i
+++ b/interface-definitions/include/generic-interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface to use</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/inbound-interface.xml.i b/interface-definitions/include/inbound-interface.xml.i
index 3289bbf8f..422f9de75 100644
--- a/interface-definitions/include/inbound-interface.xml.i
+++ b/interface-definitions/include/inbound-interface.xml.i
@@ -4,7 +4,7 @@
     <help>Inbound interface of NAT traffic</help>
     <completionHelp>
       <list>any</list>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/dhcpv6-options.xml.i b/interface-definitions/include/interface/dhcpv6-options.xml.i
index c705af7c2..609af1a2b 100644
--- a/interface-definitions/include/interface/dhcpv6-options.xml.i
+++ b/interface-definitions/include/interface/dhcpv6-options.xml.i
@@ -51,7 +51,7 @@
           <properties>
             <help>Delegate IPv6 prefix from provider to this interface</help>
             <completionHelp>
-              <script>${vyos_completion_dir}/list_interfaces.py --broadcast</script>
+              <script>${vyos_completion_dir}/list_interfaces --broadcast</script>
             </completionHelp>
           </properties>
           <children>
diff --git a/interface-definitions/include/interface/inbound-interface.xml.i b/interface-definitions/include/interface/inbound-interface.xml.i
index 5a8d47280..96ade331d 100644
--- a/interface-definitions/include/interface/inbound-interface.xml.i
+++ b/interface-definitions/include/interface/inbound-interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
   <help>Inbound Interface</help>
   <completionHelp>
-    <script>${vyos_completion_dir}/list_interfaces.py</script>
+    <script>${vyos_completion_dir}/list_interfaces</script>
   </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/interface/mirror.xml.i b/interface-definitions/include/interface/mirror.xml.i
index 74a172b50..903c62777 100644
--- a/interface-definitions/include/interface/mirror.xml.i
+++ b/interface-definitions/include/interface/mirror.xml.i
@@ -8,7 +8,7 @@
       <properties>
         <help>Mirror ingress traffic to destination interface</help>
         <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
+          <script>${vyos_completion_dir}/list_interfaces</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
@@ -20,7 +20,7 @@
       <properties>
         <help>Mirror egress traffic to destination interface</help>
         <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
+          <script>${vyos_completion_dir}/list_interfaces</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
diff --git a/interface-definitions/include/interface/redirect.xml.i b/interface-definitions/include/interface/redirect.xml.i
index b01e486ce..0421f4074 100644
--- a/interface-definitions/include/interface/redirect.xml.i
+++ b/interface-definitions/include/interface/redirect.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Redirect incoming packet to destination</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index c44939528..0e6f19480 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -572,7 +572,7 @@
   <properties>
     <help>Interface params</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
   </properties>
   <children>
diff --git a/interface-definitions/include/nat-interface.xml.i b/interface-definitions/include/nat-interface.xml.i
index 68969472f..ef1ffc1ba 100644
--- a/interface-definitions/include/nat-interface.xml.i
+++ b/interface-definitions/include/nat-interface.xml.i
@@ -4,7 +4,7 @@
     <help>Outbound interface of NAT traffic</help>
     <completionHelp>
       <list>any</list>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 16b346131..25b54b181 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -351,7 +351,7 @@
   <properties>
     <help>Interface configuration</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index fd00af95e..014bf9e49 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -111,7 +111,7 @@
   <properties>
     <help>Enable routing on an IPv6 interface</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/rip/interface.xml.i b/interface-definitions/include/rip/interface.xml.i
index e0792cdc1..0a89f4d92 100644
--- a/interface-definitions/include/rip/interface.xml.i
+++ b/interface-definitions/include/rip/interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Interface name</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/routing-passive-interface.xml.i b/interface-definitions/include/routing-passive-interface.xml.i
index fe229aebe..715468e59 100644
--- a/interface-definitions/include/routing-passive-interface.xml.i
+++ b/interface-definitions/include/routing-passive-interface.xml.i
@@ -4,7 +4,7 @@
     <help>Suppress routing updates on an interface</help>
     <completionHelp>
       <list>default</list>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/source-interface-ethernet.xml.i b/interface-definitions/include/source-interface-ethernet.xml.i
index ee04f2cd5..e06e47d6c 100644
--- a/interface-definitions/include/source-interface-ethernet.xml.i
+++ b/interface-definitions/include/source-interface-ethernet.xml.i
@@ -7,7 +7,7 @@
       <description>Physical interface used for traffic forwarding</description>
     </valueHelp>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py -t ethernet</script>
+      <script>${vyos_completion_dir}/list_interfaces --type ethernet</script>
     </completionHelp>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/source-interface.xml.i b/interface-definitions/include/source-interface.xml.i
index 4c1fddb57..c25a6a6d0 100644
--- a/interface-definitions/include/source-interface.xml.i
+++ b/interface-definitions/include/source-interface.xml.i
@@ -7,7 +7,7 @@
       <description>Interface name</description>
     </valueHelp>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <constraint>
       #include <include/constraint/interface-name.xml.in>
diff --git a/interface-definitions/include/static/static-route-interface.xml.i b/interface-definitions/include/static/static-route-interface.xml.i
index cc7a92612..db2f0baa6 100644
--- a/interface-definitions/include/static/static-route-interface.xml.i
+++ b/interface-definitions/include/static/static-route-interface.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Gateway interface name</help>
     <completionHelp>
-      <script>${vyos_completion_dir}/list_interfaces.py</script>
+      <script>${vyos_completion_dir}/list_interfaces</script>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
diff --git a/interface-definitions/include/static/static-route.xml.i b/interface-definitions/include/static/static-route.xml.i
index aeb2044c9..34e36f5a7 100644
--- a/interface-definitions/include/static/static-route.xml.i
+++ b/interface-definitions/include/static/static-route.xml.i
@@ -19,7 +19,7 @@
       <properties>
         <help>Next-hop IPv4 router interface</help>
         <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
+          <script>${vyos_completion_dir}/list_interfaces</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
diff --git a/interface-definitions/include/static/static-route6.xml.i b/interface-definitions/include/static/static-route6.xml.i
index d5e7a25bc..aac02062f 100644
--- a/interface-definitions/include/static/static-route6.xml.i
+++ b/interface-definitions/include/static/static-route6.xml.i
@@ -18,7 +18,7 @@
       <properties>
         <help>IPv6 gateway interface name</help>
         <completionHelp>
-          <script>${vyos_completion_dir}/list_interfaces.py</script>
+          <script>${vyos_completion_dir}/list_interfaces</script>
         </completionHelp>
         <valueHelp>
           <format>txt</format>
-- 
cgit v1.2.3