diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-06-12 15:20:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-12 15:20:21 +0100 |
| commit | dcba87b2394b789c335b44856a8ae7bfea05353c (patch) | |
| tree | 3789462504fe665ff59490527d10f5d0fd625b21 /src | |
| parent | 71f4f8c55ae660ae39113981a44bd1cd7ef77394 (diff) | |
| parent | 05d71332442b244f488792000bf93c96f12c9b46 (diff) | |
| download | vyos-1x-dcba87b2394b789c335b44856a8ae7bfea05353c.tar.gz vyos-1x-dcba87b2394b789c335b44856a8ae7bfea05353c.zip | |
Merge pull request #4497 from yzguy/T7432
T7432: RPKI VRF Support
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/protocols_rpki.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/conf_mode/protocols_rpki.py b/src/conf_mode/protocols_rpki.py index ef0250e3d..054aa1c0e 100755 --- a/src/conf_mode/protocols_rpki.py +++ b/src/conf_mode/protocols_rpki.py @@ -18,6 +18,7 @@ import os from glob import glob from sys import exit +from sys import argv from vyos.config import Config from vyos.configverify import has_frr_protocol_in_dict @@ -39,13 +40,18 @@ def get_config(config=None): conf = config else: conf = Config() - return get_frrender_dict(conf) + return get_frrender_dict(conf, argv) def verify(config_dict): if not has_frr_protocol_in_dict(config_dict, 'rpki'): return None - rpki = config_dict['rpki'] + vrf = None + if 'vrf_context' in config_dict: + vrf = config_dict['vrf_context'] + + # eqivalent of the C foo ? 'a' : 'b' statement + rpki = vrf and config_dict['vrf']['name'][vrf]['protocols']['rpki'] or config_dict['rpki'] if 'cache' in rpki: preferences = [] @@ -79,7 +85,12 @@ def generate(config_dict): if not has_frr_protocol_in_dict(config_dict, 'rpki'): return None - rpki = config_dict['rpki'] + vrf = None + if 'vrf_context' in config_dict: + vrf = config_dict['vrf_context'] + + # eqivalent of the C foo ? 'a' : 'b' statement + rpki = vrf and config_dict['vrf']['name'][vrf]['protocols']['rpki'] or config_dict['rpki'] if 'cache' in rpki: for cache, cache_config in rpki['cache'].items(): |