From 1e4a249f0c56bdd5bf07b1b97844c6aa1d595214 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 16 Sep 2022 23:12:41 +0200
Subject: 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.
---
 interface-definitions/service-pppoe-server.xml.in | 28 +----------------------
 1 file changed, 1 insertion(+), 27 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 c88f9e950..b31109296 100644
--- a/interface-definitions/service-pppoe-server.xml.in
+++ b/interface-definitions/service-pppoe-server.xml.in
@@ -68,33 +68,7 @@
               </completionHelp>
             </properties>
             <children>
-              <leafNode name="vlan-id">
-                <properties>
-                  <help>VLAN monitor for the automatic creation of single vlan</help>
-                  <valueHelp>
-                    <format>u32:1-4094</format>
-                    <description>VLAN monitor for the automatic creation of single vlan</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4094"/>
-                  </constraint>
-                  <constraintErrorMessage>VLAN ID needs to be between 1 and 4094</constraintErrorMessage>
-                  <multi/>
-                </properties>
-              </leafNode>
-              <leafNode name="vlan-range">
-                <properties>
-                  <help>VLAN monitor for the automatic creation of vlans range</help>
-                  <valueHelp>
-                    <format>start-end</format>
-                    <description>VLAN monitor range for the automatic creation of vlans (e.g. 1-4094)</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4094"/>
-                  </constraint>
-                  <multi/>
-                </properties>
-              </leafNode>
+              #include <include/accel-ppp/vlan.xml.i>
             </children>
           </tagNode>
           #include <include/accel-ppp/gateway-address.xml.i>
-- 
cgit v1.2.3