Merge pull request #531 from sever-sever/T915-timers

mpls-ldp: T915: Add discovery hello timers

3 files changed, 58 insertions, 4 deletions

diff --git a/data/templates/frr/ldpd.frr.tmpl b/data/templates/frr/ldpd.frr.tmpl
index bbff88ae5..dbaa917e8 100644
--- a/data/templates/frr/ldpd.frr.tmpl
+++ b/data/templates/frr/ldpd.frr.tmpl
@@ -21,6 +21,18 @@ no discovery transport-address {{ old_ldp.d_transp_ipv4 }}
 {% if ldp.d_transp_ipv4 -%}
 discovery transport-address {{ ldp.d_transp_ipv4 }}
 {% endif -%}
+{% if old_ldp.hello_holdtime -%}
+no  discovery hello holdtime {{ old_ldp.hello_holdtime }}
+{% endif -%}
+{% if ldp.hello_holdtime -%}
+discovery hello holdtime {{ ldp.hello_holdtime }}
+{% endif -%}
+{% if old_ldp.hello_interval -%}
+no discovery hello interval {{ old_ldp.hello_interval }}
+{% endif -%}
+{% if ldp.hello_interval -%}
+discovery hello interval {{ ldp.hello_interval }}
+{% endif -%}
 {% for interface in old_ldp.interfaces -%}
 no interface {{interface}}
 {% endfor -%}
diff --git a/interface-definitions/protocols-mpls.xml.in b/interface-definitions/protocols-mpls.xml.in
index 376323855..3e9edbf72 100644
--- a/interface-definitions/protocols-mpls.xml.in
+++ b/interface-definitions/protocols-mpls.xml.in
@@ -54,6 +54,30 @@
                   </valueHelp>
                 </properties>
                 <children>
+                  <leafNode name="hello-holdtime">
+                    <properties>
+                      <help>Hello 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-interval">
+                    <properties>
+                      <help>Hello 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="transport-ipv4-address">
                     <properties>
                       <help>Transport ipv4 address</help>
@@ -95,4 +119,4 @@
       </node>
     </children>
   </node>
-</interfaceDefinition>
\ No newline at end of file
+</interfaceDefinition>
diff --git a/src/conf_mode/protocols_mpls.py b/src/conf_mode/protocols_mpls.py
index 72208ffa1..bcb16fa04 100755
--- a/src/conf_mode/protocols_mpls.py
+++ b/src/conf_mode/protocols_mpls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2019 VyOS maintainers and contributors
+# Copyright (C) 2019-2020 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -38,13 +38,17 @@ def get_config():
                 'interfaces'          : [],
                 'neighbors'           : {},
                 'd_transp_ipv4'       : None,
-                'd_transp_ipv6'       : None
+                'd_transp_ipv6'       : None,
+                'hello_holdtime'      : None,
+                'hello_interval'      : None
         },
         'ldp'        : {
                 'interfaces'          : [],
                 'neighbors'           : {},
                 'd_transp_ipv4'       : None,
-                'd_transp_ipv6'       : None
+                'd_transp_ipv6'       : None,
+                'hello_holdtime'      : None,
+                'hello_interval'      : None
         }
     }
     if not (conf.exists('protocols mpls') or conf.exists_effective('protocols mpls')):
@@ -61,6 +65,20 @@ def get_config():
     if conf.exists('router-id'):
         mpls_conf['router_id'] = conf.return_value('router-id')
 
+    # Get hello holdtime
+    if conf.exists_effective('discovery hello-holdtime'):
+        mpls_conf['old_ldp']['hello_holdtime'] = conf.return_effective_value('discovery hello-holdtime')
+
+    if conf.exists('discovery hello-holdtime'):
+        mpls_conf['ldp']['hello_holdtime'] = conf.return_value('discovery hello-holdtime')
+
+    # Get hello interval
+    if conf.exists_effective('discovery hello-interval'):
+        mpls_conf['old_ldp']['hello_interval'] = conf.return_effective_value('discovery hello-interval')
+
+    if conf.exists('discovery hello-interval'):
+        mpls_conf['ldp']['hello_interval'] = conf.return_value('discovery hello-interval')
+
     # Get discovery transport-ipv4-address
     if conf.exists_effective('discovery transport-ipv4-address'):
         mpls_conf['old_ldp']['d_transp_ipv4'] = conf.return_effective_value('discovery transport-ipv4-address')