Merge pull request #1725 from sever-sever/T4893

T4893: Add ppp-options ipv6-interface-id for L2TP

5 files changed, 75 insertions, 47 deletions

diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2
index 3d1e835a9..5914fd375 100644
--- a/data/templates/accel-ppp/l2tp.config.j2
+++ b/data/templates/accel-ppp/l2tp.config.j2
@@ -126,7 +126,13 @@ ipv6={{ ppp_ipv6 }}
 {% else %}
 {{ 'ipv6=allow' if client_ipv6_pool_configured else '' }}
 {% endif %}
-
+{% if ppp_ipv6_intf_id is vyos_defined %}
+ipv6-intf-id={{ ppp_ipv6_intf_id }}
+{% endif %}
+{% if ppp_ipv6_peer_intf_id is vyos_defined %}
+ipv6-peer-intf-id={{ ppp_ipv6_peer_intf_id }}
+{% endif %}
+ipv6-accept-peer-intf-id={{ "1" if ppp_ipv6_accept_peer_intf_id else "0" }}
 
 {% if client_ipv6_pool %}
 [ipv6-pool]
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
new file mode 100644
index 000000000..265f7f97c
--- /dev/null
+++ b/interface-definitions/include/accel-ppp/ppp-options-ipv6-interface-id.xml.i
@@ -0,0 +1,54 @@
+<!-- include start from accel-ppp/ppp-options-ipv6-interface-id.xml.i -->
+<leafNode name="ipv6-intf-id">
+  <properties>
+    <help>Fixed or random interface identifier for IPv6</help>
+    <completionHelp>
+      <list>random</list>
+    </completionHelp>
+    <valueHelp>
+      <format>random</format>
+      <description>Random interface identifier for IPv6</description>
+    </valueHelp>
+    <valueHelp>
+      <format>x:x:x:x</format>
+      <description>specify interface identifier for IPv6</description>
+    </valueHelp>
+    <constraint>
+      <regex>(random|((\d+){1,4}:){3}(\d+){1,4})</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="ipv6-peer-intf-id">
+  <properties>
+    <help>Peer interface identifier for IPv6</help>
+    <completionHelp>
+      <list>random calling-sid ipv4</list>
+    </completionHelp>
+    <valueHelp>
+      <format>x:x:x:x</format>
+      <description>Interface identifier for IPv6</description>
+    </valueHelp>
+    <valueHelp>
+      <format>random</format>
+      <description>Use a random interface identifier for IPv6</description>
+    </valueHelp>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Calculate interface identifier from IPv4 address, for example 192:168:0:1</description>
+    </valueHelp>
+    <valueHelp>
+      <format>calling-sid</format>
+      <description>Calculate interface identifier from calling-station-id</description>
+    </valueHelp>
+    <constraint>
+      <regex>(random|calling-sid|ipv4|((\d+){1,4}:){3}(\d+){1,4})</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<leafNode name="ipv6-accept-peer-intf-id">
+  <properties>
+    <help>Accept peer interface identifier</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/service-pppoe-server.xml.in b/interface-definitions/service-pppoe-server.xml.in
index b31109296..47ad96582 100644
--- a/interface-definitions/service-pppoe-server.xml.in
+++ b/interface-definitions/service-pppoe-server.xml.in
@@ -170,52 +170,7 @@
                 </properties>
               </leafNode>
               #include <include/accel-ppp/ppp-options-ipv6.xml.i>
-              <leafNode name="ipv6-intf-id">
-                <properties>
-                  <help>Fixed or random interface identifier for IPv6</help>
-                  <completionHelp>
-                    <list>random</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>random</format>
-                    <description>Random interface identifier for IPv6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>x:x:x:x</format>
-                    <description>specify interface identifier for IPv6</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-              <leafNode name="ipv6-peer-intf-id">
-                <properties>
-                  <help>Peer interface identifier for IPv6</help>
-                  <completionHelp>
-                    <list>random calling-sid ipv4</list>
-                  </completionHelp>
-                  <valueHelp>
-                    <format>x:x:x:x</format>
-                    <description>Interface identifier for IPv6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>random</format>
-                    <description>Use a random interface identifier for IPv6</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Calculate interface identifier from IPv4 address, for example 192:168:0:1</description>
-                  </valueHelp>
-                  <valueHelp>
-                    <format>calling-sid</format>
-                    <description>Calculate interface identifier from calling-station-id</description>
-                  </valueHelp>
-                </properties>
-              </leafNode>
-              <leafNode name="ipv6-accept-peer-intf-id">
-                <properties>
-                  <help>Accept peer interface identifier</help>
-                  <valueless />
-                </properties>
-              </leafNode>
+              #include <include/accel-ppp/ppp-options-ipv6-interface-id.xml.i>
             </children>
           </node>
           <tagNode name="pado-delay">
diff --git a/interface-definitions/vpn-l2tp.xml.in b/interface-definitions/vpn-l2tp.xml.in
index 06ca4ece5..86aeb324e 100644
--- a/interface-definitions/vpn-l2tp.xml.in
+++ b/interface-definitions/vpn-l2tp.xml.in
@@ -251,6 +251,7 @@
                 <children>
                   #include <include/accel-ppp/lcp-echo-interval-failure.xml.i>
                   #include <include/accel-ppp/ppp-options-ipv6.xml.i>
+                  #include <include/accel-ppp/ppp-options-ipv6-interface-id.xml.i>
                 </children>
               </node>
             </children>
diff --git a/src/conf_mode/vpn_l2tp.py b/src/conf_mode/vpn_l2tp.py
index 27e78db99..65623c2b1 100755
--- a/src/conf_mode/vpn_l2tp.py
+++ b/src/conf_mode/vpn_l2tp.py
@@ -58,6 +58,9 @@ default_config_data = {
     'ppp_echo_failure' : '3',
     'ppp_echo_interval' : '30',
     'ppp_echo_timeout': '0',
+    'ppp_ipv6_accept_peer_intf_id': False,
+    'ppp_ipv6_intf_id': None,
+    'ppp_ipv6_peer_intf_id': None,
     'radius_server': [],
     'radius_acct_inter_jitter': '',
     'radius_acct_tmo': '3',
@@ -314,6 +317,15 @@ def get_config(config=None):
     if conf.exists(['ppp-options', 'ipv6']):
         l2tp['ppp_ipv6'] = conf.return_value(['ppp-options', 'ipv6'])
 
+    if conf.exists(['ppp-options', 'ipv6-accept-peer-intf-id']):
+        l2tp['ppp_ipv6_accept_peer_intf_id'] = True
+
+    if conf.exists(['ppp-options', 'ipv6-intf-id']):
+        l2tp['ppp_ipv6_intf_id'] = conf.return_value(['ppp-options', 'ipv6-intf-id'])
+
+    if conf.exists(['ppp-options', 'ipv6-peer-intf-id']):
+        l2tp['ppp_ipv6_peer_intf_id'] = conf.return_value(['ppp-options', 'ipv6-peer-intf-id'])
+
     return l2tp