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

3 files changed, 93 insertions, 52 deletions

diff --git a/interface-definitions/dns-dynamic.xml b/interface-definitions/dns-dynamic.xml
index 8e7e77475..725ebadac 100644
--- a/interface-definitions/dns-dynamic.xml
+++ b/interface-definitions/dns-dynamic.xml
@@ -78,48 +78,52 @@
                       </valueHelp>
                       <valueHelp>
                         <format>afraid</format>
-                        <description/>
+                        <description>afraid.org Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>changeip</format>
-                        <description/>
+                        <description>changeip.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>cloudflare</format>
-                        <description/>
+                        <description>cloudflare.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>dnspark</format>
-                        <description/>
+                        <description>dnspark.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>dslreports</format>
-                        <description/>
+                        <description>dslreports.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>dyndns</format>
-                        <description/>
+                        <description>dyndns.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>easydns</format>
-                        <description/>
+                        <description>easydns.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>namecheap</format>
-                        <description/>
+                        <description>namecheap.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>noip</format>
-                        <description/>
+                        <description>noip.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>sitelutions</format>
-                        <description/>
+                        <description>sitelutions.com Services</description>
                       </valueHelp>
                       <valueHelp>
                         <format>zoneedit</format>
-                        <description/>
+                        <description>zoneedit.com Services</description>
                       </valueHelp>
+                      <constraint>
+                        <regex>(custom|afraid|changeip|cloudflare|dnspark|dslreports|dyndns|easydns|namecheap|noip|sitelutions|zoneedit)</regex>
+                      </constraint>
+                      <constraintErrorMessage>Please choose from the list of allowed services</constraintErrorMessage>
                     </properties>
                     <children>
                       <leafNode name="host-name">
@@ -141,50 +145,53 @@
                       <leafNode name="protocol">
                         <properties>
                           <help>ddclient protocol used for DDNS service [REQUIRED FOR CUSTOM]</help>
-                          <valueHelp>
-                            <format>protocol</format>
-                            <description>ddclient protocol</description>
-                          </valueHelp>
+                          <completionHelp>
+                              <list>changeip cloudflare dnspark dslreports1 dyndns2 easydns namecheap noip sitelutions zoneedit1</list>
+                          </completionHelp>
                           <valueHelp>
                             <format>changeip</format>
-                            <description/>
+                            <description>changeip protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>cloudflare</format>
-                            <description/>
+                            <description>cloudflare protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>dnspark</format>
-                            <description/>
+                            <description>dnspark protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>dslreports1</format>
-                            <description/>
+                            <description>dslreports1 protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>dyndns2</format>
-                            <description/>
+                            <description>dyndns2 protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>easydns</format>
-                            <description/>
+                            <description>easydns protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>namecheap</format>
-                            <description/>
+                            <description>namecheap protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>noip</format>
-                            <description/>
+                            <description>noip protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>sitelutions</format>
-                            <description/>
+                            <description>sitelutions protocol</description>
                           </valueHelp>
                           <valueHelp>
                             <format>zoneedit1</format>
-                            <description/>
+                            <description>zoneedit1 protocol</description>
                           </valueHelp>
+                          <constraint>
+                            <regex>(changeip|cloudflare|dnspark|dslreports1|dyndns2|easydns|namecheap|noip|sitelutions|zoneedit1)</regex>
+                          </constraint>
+                          <constraintErrorMessage>Please choose from the list of allowed protocols</constraintErrorMessage>
                         </properties>
                       </leafNode>
                       <leafNode name="server">
diff --git a/interface-definitions/pppoe-server.xml b/interface-definitions/pppoe-server.xml
index ad4522679..18b0e649c 100644
--- a/interface-definitions/pppoe-server.xml
+++ b/interface-definitions/pppoe-server.xml
@@ -60,6 +60,29 @@
                           <help>Static client IP address</help>
                         </properties>
                       </leafNode>
+                      <node name="rate-limit">
+                        <properties>
+                          <help>Upload/Download speed limits</help>
+                        </properties>
+                        <children>
+                          <leafNode name="upload">
+                            <properties>
+                              <help>Upload bandwidth limit in kbits/sec</help>
+                              <constraint>
+                                <validator name="numeric" argument="--range 1-65535"/>
+                              </constraint>
+                            </properties>
+                          </leafNode>
+                          <leafNode name="download">
+                            <properties>
+                              <help>Download bandwidth limit in kbits/sec</help>
+                              <constraint>
+                                <validator name="numeric" argument="--range 1-65535"/>
+                              </constraint>
+                            </properties>
+                          </leafNode>
+                        </children>
+                      </node>
                     </children>
                   </tagNode>
                 </children>
@@ -161,6 +184,29 @@
                       </leafNode>
                     </children>
                   </node>
+                  <node name="rate-limit">
+                    <properties>
+                      <help>Upload/Download speed limits</help>
+                    </properties>
+                    <children>
+                      <leafNode name="attribute">
+                        <properties>
+                          <help>Specifies which radius attribute contains rate information. (default is Filter-Id)</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="vendor">
+                        <properties>
+                          <help>Specifies the vendor dictionary. (dictionary needs to be in /usr/share/accel-ppp/radius)</help>
+                        </properties>
+                      </leafNode>
+                      <leafNode name="enable">
+                        <properties>
+                          <help>Enables Bandwidth shaping via RADIUS</help>
+                          <valueless />
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </node>
                 </children>
               </node>
             </children>
@@ -198,7 +244,6 @@
               </leafNode>
             </children>
           </node>
-
           <node name="client-ipv6-pool">
             <properties>
               <help>Pool of client IPv6 addresses</help>
@@ -343,25 +388,6 @@
               </leafNode>
             </children>
           </node>
-          <node name="radius">
-            <properties>
-              <help>RADIUS settings</help>
-            </properties>
-            <children>
-              <leafNode name="default-interim-interval">
-                <properties>
-                  <help>Default interim accounting interval</help>
-                  <valueHelp>
-                    <format>text</format>
-                    <description>Use local username/password configuration</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 60-10000000"/>
-                  </constraint>
-                </properties>
-              </leafNode>
-            </children>
-          </node>
           <leafNode name="service-name">
             <properties>
               <help>Service name</help>
diff --git a/interface-definitions/snmp.xml b/interface-definitions/snmp.xml
index 821d1367d..fcc733c6c 100644
--- a/interface-definitions/snmp.xml
+++ b/interface-definitions/snmp.xml
@@ -585,16 +585,24 @@
               <tagNode name="extension-name">
                 <properties>
                   <help>Extension name</help>
+                  <constraint>
+                    <regex>^[a-z0-9\.\-\_]+</regex>
+                  </constraint>
+                  <constraintErrorMessage>Script extension contains invalid characters</constraintErrorMessage>
                 </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>
+                      <constraint>
+                        <regex>^[a-z0-9\.\-\_\/]+</regex>
+                      </constraint>
+                      <constraintErrorMessage>Script extension contains invalid characters</constraintErrorMessage>
+                    </properties>
+                  </leafNode>
                 </children>
               </tagNode>
             </children>