From 8f61e4293945ea895385a29f8bd387cde9f98806 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Fri, 20 Dec 2024 16:52:16 +0000
Subject: T6936: PPPoE-server add option combined to interface

Add option 'combined', it allows to listen to PPP requests on
both VLANs and the base parent interface (wihtout tag)

Before it was impossible to do it from our CLI

set service pppoe-server interface eth1 combined
set service pppoe-server interface eth1 vlan '10-122'
---
 data/templates/accel-ppp/pppoe.config.j2          | 3 +++
 interface-definitions/service_pppoe-server.xml.in | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2
index cf952c687..2c4871a6b 100644
--- a/data/templates/accel-ppp/pppoe.config.j2
+++ b/data/templates/accel-ppp/pppoe.config.j2
@@ -61,6 +61,9 @@ interface={{ iface }}
 {%             for vlan in iface_config.vlan %}
 interface=re:^{{ iface }}\.{{ vlan | range_to_regex }}$
 {%             endfor %}
+{%             if iface_config.combined is vyos_defined %}
+interface={{ iface }}
+{%             endif %}
 {%             if iface_config.vlan_mon is vyos_defined %}
 vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }}
 {%             endif %}
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 0c99fd261..32215e9d2 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -63,6 +63,12 @@
               </completionHelp>
             </properties>
             <children>
+              <leafNode name="combined">
+                <properties>
+                  <help>Listen on both VLANs and the base interface</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
               #include <include/accel-ppp/vlan.xml.i>
               #include <include/accel-ppp/vlan-mon.xml.i>
             </children>
-- 
cgit v1.2.3