diff options
| -rw-r--r-- | python/vyos/configdict.py | 13 | ||||
| -rwxr-xr-x | src/services/vyos-configd | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index cbcbf9f72..17a5fd7bb 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -19,7 +19,6 @@ A library for retrieving value dicts from VyOS configs in a declarative fashion. import os import json -from vyos.defaults import frr_debug_enable from vyos.utils.dict import dict_search from vyos.utils.process import cmd @@ -1146,16 +1145,4 @@ def get_frrender_dict(conf, argv=None) -> dict: dict.update({'vrf' : vrf}) - if os.path.exists(frr_debug_enable): - print('======== < BEGIN > ==========') - import pprint - pprint.pprint(dict) - print('========= < END > ===========') - - # Use singleton instance of the FRR render class - if hasattr(conf, 'frrender_cls'): - frrender = getattr(conf, 'frrender_cls') - dict.update({'frrender_cls' : frrender}) - frrender.generate(dict) - return dict diff --git a/src/services/vyos-configd b/src/services/vyos-configd index ecad85801..500d5425f 100755 --- a/src/services/vyos-configd +++ b/src/services/vyos-configd @@ -33,6 +33,7 @@ import zmq from vyos.defaults import directories from vyos.utils.boot import boot_configuration_complete +from vyos.configdict import get_frrender_dict from vyos.configsource import ConfigSourceString from vyos.configsource import ConfigSourceError from vyos.configdiff import get_commit_scripts @@ -333,6 +334,8 @@ if __name__ == '__main__': if hasattr(config, 'frrender_cls') and res == R_SUCCESS: frrender_cls = getattr(config, 'frrender_cls') + tmp = get_frrender_dict(config) + frrender_cls.generate(tmp) frrender_cls.apply() else: logger.critical(f'Unexpected message: {message}') |