From bbc2a15795bfbe11febe8c00d2a592ba5cf8daf5 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Mon, 28 Dec 2020 16:13:03 +0100
Subject: xml: completion-help: add helper for all local assigned IP addresses

This replaces the Python script by a bash variant which is much faster as the
Python interpreter does not need to be launched on invocation.
---
 interface-definitions/dhcp-server.xml.in               |  2 +-
 interface-definitions/https.xml.in                     |  3 +++
 .../include/listen-address-ipv4.xml.i                  | 18 ++++++++++++++++++
 interface-definitions/include/listen-address.xml.i     |  3 +++
 interface-definitions/interfaces-tunnel.xml.in         |  2 +-
 interface-definitions/snmp.xml.in                      |  3 +++
 6 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 interface-definitions/include/listen-address-ipv4.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 26b803fcb..2c1609d94 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -42,7 +42,7 @@
               <valueless/>
             </properties>
           </leafNode>
-          #include <include/listen-address.xml.i>
+          #include <include/listen-address-ipv4.xml.i>
           <tagNode name="shared-network-name">
             <properties>
               <help>Name of DHCP shared network</help>
diff --git a/interface-definitions/https.xml.in b/interface-definitions/https.xml.in
index 69fe90dab..b613e30c1 100644
--- a/interface-definitions/https.xml.in
+++ b/interface-definitions/https.xml.in
@@ -22,6 +22,9 @@
               <leafNode name="listen-address">
                 <properties>
                   <help>Address to listen for HTTPS requests</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+                  </completionHelp>
                   <valueHelp>
                     <format>ipv4</format>
                    <description>HTTPS IPv4 address</description>
diff --git a/interface-definitions/include/listen-address-ipv4.xml.i b/interface-definitions/include/listen-address-ipv4.xml.i
new file mode 100644
index 000000000..530dbf619
--- /dev/null
+++ b/interface-definitions/include/listen-address-ipv4.xml.i
@@ -0,0 +1,18 @@
+<!-- included start from listen-address-ipv4.xml.i -->
+<leafNode name="listen-address">
+  <properties>
+    <help>Local IPv4 addresses for service to listen on</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
+    </completionHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>IP address to listen for incoming connections</description>
+    </valueHelp>
+    <multi/>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/listen-address.xml.i b/interface-definitions/include/listen-address.xml.i
index e474344e4..5bfb7eb38 100644
--- a/interface-definitions/include/listen-address.xml.i
+++ b/interface-definitions/include/listen-address.xml.i
@@ -2,6 +2,9 @@
 <leafNode name="listen-address">
   <properties>
     <help>Local IP addresses for service to listen on</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+    </completionHelp>
     <valueHelp>
       <format>ipv4</format>
       <description>IP address to listen for incoming connections</description>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index 574a7d0a4..8effa68b2 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -36,7 +36,7 @@
                 <description>Local IPv6 address for this tunnel [NOTICE: unavailable for mGRE tunnels]</description>
               </valueHelp>
               <completionHelp>
-                <script>${vyos_completion_dir}/list_local.py</script>
+                <script>${vyos_completion_dir}/list_local_ips.sh</script>
               </completionHelp>
               <constraint>
                 <validator name="ip-address"/>
diff --git a/interface-definitions/snmp.xml.in b/interface-definitions/snmp.xml.in
index fb3e82256..0a0a29f4d 100644
--- a/interface-definitions/snmp.xml.in
+++ b/interface-definitions/snmp.xml.in
@@ -88,6 +88,9 @@
           <tagNode name="listen-address">
             <properties>
               <help>IP address to listen for incoming SNMP requests</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_local_ips.sh --both</script>
+              </completionHelp>
               <valueHelp>
                 <format>ipv4</format>
                 <description>IPv4 address to listen for incoming SNMP requests</description>
-- 
cgit v1.2.3