diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-08-20 05:51:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-20 05:51:14 +0200 |
commit | c7707363bd9b44f9dd9bf460247f350a05b3f5fb (patch) | |
tree | 6943a158c98a11d86ec6a026b4b0dd725bbe57d3 /src | |
parent | 509f347d0858e37de9fdeaa1a7aeeb6888fb4b7b (diff) | |
parent | 93c3a4a4f05014914dd2e9353ddd676e20bced1a (diff) | |
download | vyos-1x-c7707363bd9b44f9dd9bf460247f350a05b3f5fb.tar.gz vyos-1x-c7707363bd9b44f9dd9bf460247f350a05b3f5fb.zip |
Merge pull request #531 from sever-sever/T915-timers
mpls-ldp: T915: Add discovery hello timers
Diffstat (limited to 'src')
-rwxr-xr-x | src/conf_mode/protocols_mpls.py | 24 |
1 files changed, 21 insertions, 3 deletions
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') |