Merge branch 'current' of github.com:vyos/vyos-1x into equuleus

* 'current' of github.com:vyos/vyos-1x:
  T1749: support multiple ranges in the numeric validator.
  dhcp-server: T1745: bugfix corner case on static-assignments
  system-proxy: T1741 - Add system wide proxy setting
  wireguard - remove endpoint check to enable roaming connections
  system-proxy: T1741 - Add system wide proxy setting CLI implementation
  Python/ifconfig: T1712: always start DHCP when configured
  Python/ifconfig: T1557: get_status() must use admin state not operstate
  bgp: T1490: fix migrator file permissions
  snmp: T1737: add missing completion helpers
  Revert "Python/ifconfig: T1712: wait when changing interface state"
  snmpd: T1705 - High CPU usage by bgpd when snmp is active
  Revert "snmpd: T1705 - High CPU usage by bgpd when snmp is active"
  openvpn: T1548: clean out import statements
  ssh.py: check if file exists before deleting it
  [BGP] T1490: Added migration for obsoleted 'bgp scan-time' parameter

2 files changed, 80 insertions, 7 deletions

diff --git a/interface-definitions/snmp.xml b/interface-definitions/snmp.xml
index 8b2fa8a93..1634bfb64 100644
--- a/interface-definitions/snmp.xml
+++ b/interface-definitions/snmp.xml
@@ -21,6 +21,9 @@
               <leafNode name="authorization">
                 <properties>
                   <help>Authorization type (default: 'ro')</help>
+                  <completionHelp>
+                    <list>ro rw</list>
+                  </completionHelp>
                   <valueHelp>
                     <format>ro</format>
                     <description>read only</description>
@@ -193,6 +196,9 @@
                   <leafNode name="mode">
                     <properties>
                       <help>Define group access permission (default: 'ro')</help>
+                      <completionHelp>
+                        <list>ro rw</list>
+                      </completionHelp>
                       <valueHelp>
                         <format>ro</format>
                         <description>read only</description>
@@ -210,6 +216,9 @@
                   <leafNode name="seclevel">
                     <properties>
                       <help>Security levels</help>
+                      <completionHelp>
+                        <list>noauth auth priv2</list>
+                      </completionHelp>
                       <valueHelp>
                         <format>noauth</format>
                         <description>Messages not authenticated and not encrypted (noAuthNoPriv)</description>
@@ -280,6 +289,9 @@
                       <leafNode name="type">
                         <properties>
                           <help>Defines the protocol used for authentication (default: 'md5')</help>
+                          <completionHelp>
+                            <list>md5 sha</list>
+                          </completionHelp>
                           <valueHelp>
                             <format>md5</format>
                             <description>Message Digest 5</description>
@@ -343,6 +355,9 @@
                       <leafNode name="type">
                         <properties>
                           <help>Defines the protocol for privacy (default: 'des')</help>
+                          <completionHelp>
+                            <list>des aes</list>
+                          </completionHelp>
                           <valueHelp>
                             <format>des</format>
                             <description>Data Encryption Standard</description>
@@ -361,6 +376,9 @@
                   <leafNode name="protocol">
                     <properties>
                       <help>Defines protocol for notification between TCP and UDP</help>
+                      <completionHelp>
+                        <list>tcp udp</list>
+                      </completionHelp>
                       <valueHelp>
                         <format>tcp</format>
                         <description>Use Transmission Control Protocol for notifications</description>
@@ -377,6 +395,9 @@
                   <leafNode name="type">
                     <properties>
                       <help>Specifies the type of notification between inform and trap (default: 'inform')</help>
+                      <completionHelp>
+                        <list>inform trap</list>
+                      </completionHelp>
                       <valueHelp>
                         <format>inform</format>
                         <description>Use INFORM</description>
@@ -464,6 +485,9 @@
                       <leafNode name="type">
                         <properties>
                           <help>Defines the protocol used for authentication (default: 'md5')</help>
+                          <completionHelp>
+                            <list>md5 sha</list>
+                          </completionHelp>
                           <valueHelp>
                             <format>md5</format>
                             <description>Message Digest 5</description>
@@ -499,6 +523,9 @@
                   <leafNode name="mode">
                     <properties>
                       <help>Define users access permission (default: 'ro')</help>
+                      <completionHelp>
+                        <list>ro rw</list>
+                      </completionHelp>
                       <valueHelp>
                         <format>ro</format>
                         <description>read only</description>
@@ -539,6 +566,9 @@
                       <leafNode name="type">
                         <properties>
                           <help>Defines the protocol for privacy (default: 'des')</help>
+                          <completionHelp>
+                            <list>des aes</list>
+                          </completionHelp>
                           <valueHelp>
                             <format>des</format>
                             <description>Data Encryption Standard</description>
@@ -610,13 +640,13 @@
                 </properties>
                 <children>
                   <leafNode name="script">
-                  <properties>
-                    <help>Script location and name</help>
-                    <completionHelp>
-                      <script>ls /config/user-data</script>
-                    </completionHelp>
-                  </properties>
-                </leafNode>
+                    <properties>
+                      <help>Script location and name</help>
+                      <completionHelp>
+                        <script>ls /config/user-data</script>
+                      </completionHelp>
+                    </properties>
+                  </leafNode>
                 </children>
               </tagNode>
             </children>
diff --git a/interface-definitions/system-proxy.xml b/interface-definitions/system-proxy.xml
new file mode 100644
index 000000000..f43702fc8
--- /dev/null
+++ b/interface-definitions/system-proxy.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="system">
+    <children>
+      <node name="proxy" owner="${vyos_conf_scripts_dir}/system-proxy.py">
+        <properties>
+          <help>Sets a proxy for system wide use</help>
+        </properties>
+        <children>
+          <leafNode name="url">
+            <properties>
+              <help>Proxy URL</help>
+              <constraint>
+                <regex>^http://[a-z0-9\.]+$</regex>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="port">
+            <properties>
+              <help>Proxy port</help>
+              <constraint>
+                <validator name="numeric" argument="--range 1-65535"/>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="username">
+            <properties>
+              <help>Proxy username</help>
+              <constraint>
+                <regex>^[a-z0-9-_\.]{1,100}$</regex>
+              </constraint>
+            </properties>
+          </leafNode>
+          <leafNode name="password">
+            <properties>
+              <help>Proxy password</help>
+            </properties>
+          </leafNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>