From 8ce0cd9f09940f8c365ea1cc76b1b14197fdfd2a Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 18 Aug 2021 12:53:16 +0200
Subject: bgp: evpn: T1513: re-structure route-target XML blocks

Make the both, export and import XML block re-usable by the IPv4 AFI.
---
 .../include/bgp/afi-l2vpn-common.xml.i             | 11 +++++-
 .../include/bgp/route-target-both.xml.i            | 14 +++++++
 .../include/bgp/route-target-export.xml.i          | 14 +++++++
 .../include/bgp/route-target-import.xml.i          | 14 +++++++
 .../include/bgp/route-target.xml.i                 | 45 ----------------------
 5 files changed, 52 insertions(+), 46 deletions(-)
 create mode 100644 interface-definitions/include/bgp/route-target-both.xml.i
 create mode 100644 interface-definitions/include/bgp/route-target-export.xml.i
 create mode 100644 interface-definitions/include/bgp/route-target-import.xml.i
 delete mode 100644 interface-definitions/include/bgp/route-target.xml.i

diff --git a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
index aaa69e6c8..a9a833851 100644
--- a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
@@ -12,5 +12,14 @@
   </properties>
 </leafNode>
 #include <include/bgp/route-distinguisher.xml.i>
-#include <include/bgp/route-target.xml.i>
+<node name="route-target">
+  <properties>
+    <help>Route Target</help>
+  </properties>
+  <children>
+    #include <include/bgp/route-target-both.xml.i>
+    #include <include/bgp/route-target-export.xml.i>
+    #include <include/bgp/route-target-import.xml.i>
+  </children>
+</node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target-both.xml.i b/interface-definitions/include/bgp/route-target-both.xml.i
new file mode 100644
index 000000000..2381f420f
--- /dev/null
+++ b/interface-definitions/include/bgp/route-target-both.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/route-target-both.xml.i -->
+<leafNode name="both">
+  <properties>
+    <help>Route Target both import and export</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target-export.xml.i b/interface-definitions/include/bgp/route-target-export.xml.i
new file mode 100644
index 000000000..0542000a5
--- /dev/null
+++ b/interface-definitions/include/bgp/route-target-export.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/route-target-export.xml.i -->
+<leafNode name="export">
+  <properties>
+    <help>Route Target export</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target-import.xml.i b/interface-definitions/include/bgp/route-target-import.xml.i
new file mode 100644
index 000000000..6a954885c
--- /dev/null
+++ b/interface-definitions/include/bgp/route-target-import.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/route-target-import.xml.i -->
+<leafNode name="import">
+  <properties>
+    <help>Route Target import</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target.xml.i b/interface-definitions/include/bgp/route-target.xml.i
deleted file mode 100644
index 674b6db15..000000000
--- a/interface-definitions/include/bgp/route-target.xml.i
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- include start from bgp/route-target.xml.i -->
-<node name="route-target">
-  <properties>
-    <help>Route Target</help>
-  </properties>
-  <children>
-    <leafNode name="both">
-      <properties>
-        <help>Route Target both import and export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="export">
-      <properties>
-        <help>Route Target export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>Route Target import</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
-- 
cgit v1.2.3