From ec727d66a187ee50c303e103c6d09c7842cd1809 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Tue, 27 Oct 2020 17:52:30 -0600
Subject: mpls-conf: T915: Separate IPv4 and IPv6 hello timers, add IPv6 timers

The commit has to do with separating the hello/hold timers from being only IPv4 to being both IPv4 and IPv6.

I renamed the existing hello and hold timers with an "-ipv4" and added ones that were "-ipv6". I did verify that the commands properly commit under FRR as well. I also added some room on the protocols_mpls.py file for the different variables as it seems we're might end up having longer names. Removed some spaces that I found too that weren't needed on ldpd.frr.tmpl as well.
---
 interface-definitions/protocols-mpls.xml.in | 32 +++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in
index 3ea610d8b..94ece8d45 100644
--- a/interface-definitions/protocols-mpls.xml.in
+++ b/interface-definitions/protocols-mpls.xml.in
@@ -54,9 +54,9 @@
                   </valueHelp>
                 </properties>
                 <children>
-                  <leafNode name="hello-holdtime">
+                  <leafNode name="hello-ipv4-holdtime">
                     <properties>
-                      <help>Hello holdtime</help>
+                      <help>Hello ipv4 holdtime</help>
                       <valueHelp>
                         <format>1-65535</format>
                         <description>Time in seconds</description>
@@ -66,9 +66,33 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="hello-interval">
+                  <leafNode name="hello-ipv4-interval">
                     <properties>
-                      <help>Hello interval</help>
+                      <help>Hello ipv4 interval</help>
+                      <valueHelp>
+                        <format>1-65535</format>
+                        <description>Time in seconds</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-65535"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="hello-ipv6-holdtime">
+                    <properties>
+                      <help>Hello ipv6 holdtime</help>
+                      <valueHelp>
+                        <format>1-65535</format>
+                        <description>Time in seconds</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-65535"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="hello-ipv6-interval">
+                    <properties>
+                      <help>Hello ipv6 interval</help>
                       <valueHelp>
                         <format>1-65535</format>
                         <description>Time in seconds</description>
-- 
cgit v1.2.3