diff options
| author | Adam Smith <adamsmith@yzguy.io> | 2024-12-31 13:43:55 -0500 |
|---|---|---|
| committer | Adam Smith <adamsmith@yzguy.io> | 2025-05-27 22:16:00 -0400 |
| commit | 1fa28abc7035984af01fa4332f0ed6ed8f4fc044 (patch) | |
| tree | 87e8e910fcf1af50e16013898fd5c7c986471248 /src | |
| parent | a81ab0c6808080f521bfb673c61f90a744c625ff (diff) | |
| download | vyos-1x-1fa28abc7035984af01fa4332f0ed6ed8f4fc044.tar.gz vyos-1x-1fa28abc7035984af01fa4332f0ed6ed8f4fc044.zip | |
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(): |