From e83671d0f6e1b95867ec11430a66ac02b4b9fbdb Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Sat, 24 Dec 2022 10:06:20 +0000
Subject: T4893: Move ppp-opt ipv6-intf-id to include section accel-ppp

Move PPPoE-server ppp-options XML ipv6-intf-id to 'include'
section accel-ppp
It allows to use the same code for different accel-ppp services
---
 interface-definitions/service-pppoe-server.xml.in | 47 +----------------------
 1 file changed, 1 insertion(+), 46 deletions(-)

(limited to 'interface-definitions/service-pppoe-server.xml.in')

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">
-- 
cgit v1.2.3