pppoe-server: T4703: combine vlan-id and vlan-range into single CLI node

The initial Accel-PPP PPPoE implementation used:

set service pppoe-server interface <name> vlan-id <id>
set service pppoe-server interface <name> vlan-range <start-stop>

This is actually a duplicated CLI node.

1 files changed, 5 insertions, 12 deletions

diff --git a/data/templates/accel-ppp/pppoe.config.j2 b/data/templates/accel-ppp/pppoe.config.j2
index 0a92e2d54..f4129d3e2 100644
--- a/data/templates/accel-ppp/pppoe.config.j2
+++ b/data/templates/accel-ppp/pppoe.config.j2
@@ -105,20 +105,13 @@ ac-name={{ access_concentrator }}
 
 {% if interface is vyos_defined %}
 {%     for iface, iface_config in interface.items() %}
-{%         if iface_config.vlan_id is not vyos_defined and iface_config.vlan_range is not vyos_defined %}
+{%         if iface_config.vlan is not vyos_defined %}
 interface={{ iface }}
-{%         endif %}
-{%         if iface_config.vlan_range is vyos_defined %}
-{%             for regex in iface_config.regex %}
-interface=re:^{{ iface | replace('.', '\\.') }}\.({{ regex }})$
-{%             endfor %}
-vlan-mon={{ iface }},{{ iface_config.vlan_range | join(',') }}
-{%         endif %}
-{%         if iface_config.vlan_id is vyos_defined %}
-{%             for vlan in iface_config.vlan_id %}
-vlan-mon={{ iface }},{{ vlan }}
-interface=re:^{{ iface | replace('.', '\\.') }}\.{{ vlan }}$
+{%         else %}
+{%             for vlan in iface_config.vlan %}
+interface=re:^{{ iface }}\.{{ vlan | range_to_regex }}$
 {%             endfor %}
+vlan-mon={{ iface }},{{ iface_config.vlan | join(',') }}
 {%         endif %}
 {%     endfor %}
 {% endif %}