summaryrefslogtreecommitdiff
path: root/interface-definitions/include/interface
diff options
context:
space:
mode:
Diffstat (limited to 'interface-definitions/include/interface')
-rw-r--r--interface-definitions/include/interface/authentication.xml.i28
-rw-r--r--interface-definitions/include/interface/dhcpv6-options.xml.i2
-rw-r--r--interface-definitions/include/interface/inbound-interface.xml.i2
-rw-r--r--interface-definitions/include/interface/mirror.xml.i4
-rw-r--r--interface-definitions/include/interface/redirect.xml.i2
5 files changed, 7 insertions, 31 deletions
diff --git a/interface-definitions/include/interface/authentication.xml.i b/interface-definitions/include/interface/authentication.xml.i
index ac06faef5..0bd792209 100644
--- a/interface-definitions/include/interface/authentication.xml.i
+++ b/interface-definitions/include/interface/authentication.xml.i
@@ -4,32 +4,8 @@
<help>Authentication settings</help>
</properties>
<children>
- <leafNode name="username">
- <properties>
- <help>Username used for authentication</help>
- <valueHelp>
- <format>txt</format>
- <description>Username</description>
- </valueHelp>
- <constraint>
- <regex>[[:ascii:]]{1,128}</regex>
- </constraint>
- <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
- </properties>
- </leafNode>
- <leafNode name="password">
- <properties>
- <help>Password used for authentication</help>
- <valueHelp>
- <format>txt</format>
- <description>Password</description>
- </valueHelp>
- <constraint>
- <regex>[[:ascii:]]{1,128}</regex>
- </constraint>
- <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
- </properties>
- </leafNode>
+ #include <include/generic-username.xml.i>
+ #include <include/generic-password.xml.i>
</children>
</node>
<!-- include end -->
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>