diff options
author | Christian Poessinger <christian@poessinger.com> | 2021-02-10 21:04:17 +0100 |
---|---|---|
committer | Christian Poessinger <christian@poessinger.com> | 2021-02-10 21:04:17 +0100 |
commit | c79a61a67468ba84ad19e6b09097fdbaec1aa649 (patch) | |
tree | 479bcb4a5417b6e7301152d185ae9d76d2741d26 /src/conf_mode/protocols_rpki.py | |
parent | ee8f20596ba1b0482b5e9ccc7826baae294dbde5 (diff) | |
download | vyos-1x-c79a61a67468ba84ad19e6b09097fdbaec1aa649.tar.gz vyos-1x-c79a61a67468ba84ad19e6b09097fdbaec1aa649.zip |
frr: T2638: remove dedicated per protocol debugging
With commit 015651a8 ("T2638: Enable more debugging in the FRR library") a
global debug mechanism was added by creating a file named /tmp/vyos.frr.debug.
With this change we can drop the duplicated debug code from every protocol.
Diffstat (limited to 'src/conf_mode/protocols_rpki.py')
-rwxr-xr-x | src/conf_mode/protocols_rpki.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py index 0b9525caf..75b870b05 100755 --- a/src/conf_mode/protocols_rpki.py +++ b/src/conf_mode/protocols_rpki.py @@ -20,7 +20,6 @@ from sys import exit from vyos.config import Config from vyos.configdict import dict_merge -from vyos.template import render from vyos.template import render_to_string from vyos.util import call from vyos.util import dict_search @@ -30,17 +29,8 @@ from vyos import frr from vyos import airbag airbag.enable() -config_file = r'/tmp/rpki.frr' frr_daemon = 'bgpd' -DEBUG = os.path.exists('/tmp/rpki.debug') -if DEBUG: - import logging - lg = logging.getLogger("vyos.frr") - lg.setLevel(logging.DEBUG) - ch = logging.StreamHandler() - lg.addHandler(ch) - def get_config(config=None): if config: conf = config @@ -90,10 +80,7 @@ def verify(rpki): return None def generate(rpki): - # render(config) not needed, its only for debug - render(config_file, 'frr/rpki.frr.tmpl', rpki) rpki['new_frr_config'] = render_to_string('frr/rpki.frr.tmpl', rpki) - return None def apply(rpki): @@ -102,21 +89,6 @@ def apply(rpki): frr_cfg.load_configuration(frr_daemon) frr_cfg.modify_section('rpki', '') frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', rpki['new_frr_config']) - - # Debugging - if DEBUG: - from pprint import pprint - print('') - print('--------- DEBUGGING ----------') - pprint(dir(frr_cfg)) - print('Existing config:\n') - for line in frr_cfg.original_config: - print(line) - print(f'Replacement config:\n') - print(f'{rpki["new_frr_config"]}') - print(f'Modified config:\n') - print(f'{frr_cfg}') - frr_cfg.commit_configuration(frr_daemon) # If FRR config is blank, re-run the blank commit x times due to frr-reload |