diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-03-30 21:51:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-30 21:51:54 +0100 |
| commit | 495bf823b7c7d51ea1506445e80debbde4d69a78 (patch) | |
| tree | 2417e103adac0f50700f03d0c49703283a816b30 /src | |
| parent | 058eed53fd737333ce9efa30b5943a2bdaed85df (diff) | |
| parent | 210358615269d406873b5e00b77347392145e140 (diff) | |
| download | vyos-1x-495bf823b7c7d51ea1506445e80debbde4d69a78.tar.gz vyos-1x-495bf823b7c7d51ea1506445e80debbde4d69a78.zip | |
Merge pull request #3216 from vyos/mergify/bp/sagitta/pr-3213
bgp: T6106: Valid commit error for route-reflector-client option defined in peer-group (backport #3213)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/conf_mode/protocols_bgp.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py index f1c59cbde..512fa26e9 100755 --- a/src/conf_mode/protocols_bgp.py +++ b/src/conf_mode/protocols_bgp.py @@ -450,15 +450,15 @@ def verify(bgp): verify_route_map(afi_config['route_map'][tmp], bgp) if 'route_reflector_client' in afi_config: - if 'remote_as' in peer_config and peer_config['remote_as'] != 'internal' and peer_config['remote_as'] != bgp['system_as']: + peer_group_as = peer_config.get('remote_as') + + if peer_group_as is None or (peer_group_as != 'internal' and peer_group_as != bgp['system_as']): raise ConfigError('route-reflector-client only supported for iBGP peers') else: if 'peer_group' in peer_config: peer_group_as = dict_search(f'peer_group.{peer_group}.remote_as', bgp) - if peer_group_as != None and peer_group_as != 'internal' and peer_group_as != bgp['system_as']: + if peer_group_as is None or (peer_group_as != 'internal' and peer_group_as != bgp['system_as']): raise ConfigError('route-reflector-client only supported for iBGP peers') - else: - raise ConfigError('route-reflector-client only supported for iBGP peers') # Throw an error if a peer group is not configured for allow range for prefix in dict_search('listen.range', bgp) or []: |