Merge pull request #2928 from vyos/mergify/bp/sagitta/pr-2891

T5971: Rewritten ppp options in accel-ppp services (backport #2891)

2 files changed, 71 insertions, 6 deletions

diff --git a/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i
index 265f7f97c..c4cf0a458 100644
--- a/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i
@@ -1,5 +1,5 @@
 <!-- include start from accel-ppp/ppp-options-ipv6-interface-id.xml.i -->
-<leafNode name="ipv6-intf-id">
+<leafNode name="ipv6-interface-id">
   <properties>
     <help>Fixed or random interface identifier for IPv6</help>
     <completionHelp>
@@ -18,11 +18,11 @@
     </constraint>
   </properties>
 </leafNode>
-<leafNode name="ipv6-peer-intf-id">
+<leafNode name="ipv6-peer-interface-id">
   <properties>
     <help>Peer interface identifier for IPv6</help>
     <completionHelp>
-      <list>random calling-sid ipv4</list>
+      <list>random calling-sid ipv4-addr</list>
     </completionHelp>
     <valueHelp>
       <format>x:x:x:x</format>
@@ -33,7 +33,7 @@
       <description>Use a random interface identifier for IPv6</description>
     </valueHelp>
     <valueHelp>
-      <format>ipv4</format>
+      <format>ipv4-addr</format>
       <description>Calculate interface identifier from IPv4 address, for example 192:168:0:1</description>
     </valueHelp>
     <valueHelp>
@@ -41,11 +41,11 @@
       <description>Calculate interface identifier from calling-station-id</description>
     </valueHelp>
     <constraint>
-      <regex>(random|calling-sid|ipv4|((\d+){1,4}:){3}(\d+){1,4})</regex>
+      <regex>(random|calling-sid|ipv4-addr|((\d+){1,4}:){3}(\d+){1,4})</regex>
     </constraint>
   </properties>
 </leafNode>
-<leafNode name="ipv6-accept-peer-intf-id">
+<leafNode name="ipv6-accept-peer-interface-id">
   <properties>
     <help>Accept peer interface identifier</help>
     <valueless/>
diff --git a/interface-definitions/include/accel-ppp/ppp-options.xml.i b/interface-definitions/include/accel-ppp/ppp-options.xml.i
new file mode 100644
index 000000000..9b4f1d0ca
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/ppp-options.xml.i
@@ -0,0 +1,65 @@
+<!-- include start from accel-ppp/ppp-options.xml.i -->
+<node name="ppp-options">
+  <properties>
+    <help>Advanced protocol options</help>
+  </properties>
+  <children>
+    <leafNode name="min-mtu">
+      <properties>
+        <help>Minimum acceptable MTU (68-65535)</help>
+        <constraint>
+          <validator name="numeric" argument="--range 68-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="mru">
+      <properties>
+        <help>Preferred MRU (68-65535)</help>
+        <constraint>
+          <validator name="numeric" argument="--range 68-65535"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="disable-ccp">
+      <properties>
+        <help>Disable Compression Control Protocol (CCP)</help>
+        <valueless />
+      </properties>
+    </leafNode>
+    #include <include/accel-ppp/ppp-mppe.xml.i>
+    #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
+    #include <include/accel-ppp/lcp-echo-timeout.xml.i>
+    #include <include/accel-ppp/ppp-interface-cache.xml.i>
+    <leafNode name="ipv4">
+      <properties>
+        <help>IPv4 (IPCP) negotiation algorithm</help>
+        <constraint>
+          <regex>(deny|allow|prefer|require)</regex>
+        </constraint>
+        <constraintErrorMessage>invalid value</constraintErrorMessage>
+        <valueHelp>
+          <format>deny</format>
+          <description>Do not negotiate IPv4</description>
+        </valueHelp>
+        <valueHelp>
+          <format>allow</format>
+          <description>Negotiate IPv4 only if client requests</description>
+        </valueHelp>
+        <valueHelp>
+          <format>prefer</format>
+          <description>Ask client for IPv4 negotiation, do not fail if it rejects</description>
+        </valueHelp>
+        <valueHelp>
+          <format>require</format>
+          <description>Require IPv4 negotiation</description>
+        </valueHelp>
+        <completionHelp>
+          <list>deny allow prefer require</list>
+        </completionHelp>
+      </properties>
+    </leafNode>
+    #include <include/accel-ppp/ppp-options-ipv6.xml.i>
+    #include <include/accel-ppp/ppp-options-ipv6-interface-id.xml.i>
+  </children>
+</node>
+<!-- include end -->