diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-11-30 17:59:40 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-30 17:59:40 +0700 |
| commit | 9dab6e725568e8bcc46c265a0da90c09a651d83c (patch) | |
| tree | e02124a022ceba7070628585c265893bef30ecd5 /src | |
| parent | cb1729ca4f3735955d0c3f35f00526404546c9be (diff) | |
| parent | 732938ad3410b3dce4a49ef6cf16723c4ac04000 (diff) | |
| download | vyos-1x-9dab6e725568e8bcc46c265a0da90c09a651d83c.tar.gz vyos-1x-9dab6e725568e8bcc46c265a0da90c09a651d83c.zip | |
Merge pull request #612 from sever-sever/T1316
frr-isis: T1316: Add new routing feature ISIS
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/protocols_isis.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py index df03fd990..bd372a7b3 100755 --- a/src/conf_mode/protocols_isis.py +++ b/src/conf_mode/protocols_isis.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright (C) 2017-2020 VyOS maintainers and contributors +# Copyright (C) 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 @@ -118,15 +118,16 @@ def apply(isis): # Save original configuration prior to starting any commit actions frr_cfg = {} frr_cfg['original_config'] = frr.get_configuration(daemon='isisd') - frr_cfg['modified_config'] = frr.replace_section(frr_cfg['original_config'], isis['new_frr_config'], from_re='router isis .*') + frr_cfg['modified_config'] = frr.replace_section(frr_cfg['original_config'], isis['new_frr_config'], from_re='interface .*') # Debugging + ''' print('') print('--------- DEBUGGING ----------') print(f'Existing config:\n{frr_cfg["original_config"]}\n\n') print(f'Replacement config:\n{isis["new_frr_config"]}\n\n') print(f'Modified config:\n{frr_cfg["modified_config"]}\n\n') - + ''' # FRR mark configuration will test for syntax errors and throws an # exception if any syntax errors is detected frr.mark_configuration(frr_cfg['modified_config']) |