From 548d9057e3ed66852bb2be62fe770c265712b4f3 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 13 Mar 2021 21:08:38 +0100
Subject: vrf: T3344: move dynamic routing protocols under "vrf name <name>
 protocols"

Instead of having the dynamic routing protocols OSPF and BGP residing under
the "protocols vrf <name> [ospf|bgp]" nodes, rather move them directly under
the "vrf name <name> protocols [ospf|bgp]" node. Now all VRF related parts
are placed under the same root node.

This eases the verify steps tremendously, as we do not need to check wheter a
VRF eists or not, it will always exist as we operate under a child node.
---
 interface-definitions/protocols-vrf.xml.in | 58 ------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 interface-definitions/protocols-vrf.xml.in

(limited to 'interface-definitions/protocols-vrf.xml.in')

diff --git a/interface-definitions/protocols-vrf.xml.in b/interface-definitions/protocols-vrf.xml.in
deleted file mode 100644
index e40edb16c..000000000
--- a/interface-definitions/protocols-vrf.xml.in
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<interfaceDefinition>
-  <node name="protocols">
-    <children>
-       <tagNode name="vrf" owner="${vyos_conf_scripts_dir}/protocols_vrf.py">
-        <properties>
-          <help>Name of VRF to add route for</help>
-          <completionHelp>
-            <path>vrf name</path>
-          </completionHelp>
-          <valueHelp>
-            <format>txt</format>
-            <description>VRF instance name</description>
-          </valueHelp>
-          <constraint>
-            <validator name="vrf-name"/>
-          </constraint>
-          <constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\n</constraintErrorMessage>
-        </properties>
-        <children>
-          <node name="static">
-            <properties>
-              <help>Static route parameters</help>
-            </properties>
-            <children>
-              #include <include/static-route.xml.i>
-              #include <include/static-route6.xml.i>
-            </children>
-          </node>
-          <tagNode name="bgp" owner="${vyos_conf_scripts_dir}/protocols_bgp.py $VAR(../@)">
-            <properties>
-              <help>Border Gateway Protocol (BGP)</help>
-              <valueHelp>
-                <format>u32:1-4294967294</format>
-                <description>Autonomous System Number</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-4294967294"/>
-              </constraint>
-            </properties>
-            <children>
-              #include <include/bgp/bgp-common-config.xml.i>
-            </children>
-          </tagNode>
-          <node name="ospf" owner="${vyos_conf_scripts_dir}/protocols_ospf.py $VAR(../@)">
-            <properties>
-              <help>Open Shortest Path First (OSPF)</help>
-            </properties>
-            <children>
-              #include <include/ospf/ospf-common-config.xml.i>
-            </children>
-          </node>
-          #include <include/vni.xml.i>
-        </children>
-      </tagNode>
-    </children>
-  </node>
-</interfaceDefinition>
-- 
cgit v1.2.3