Merge pull request #4247 from sever-sever/T6936

T6936: PPPoE-server add option combined to interface
vyos · Dec 23, 2024 · 1258853 · 1258853
2 parents 3168305 + 8f61e42
commit 1258853
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git 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
@@ -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>