summaryrefslogtreecommitdiff
path: root/src/conf_mode/protocols_bgp.py
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-03-30 13:07:07 +0100
committerGitHub <noreply@github.com>2024-03-30 13:07:07 +0100
commita95063831f83dcfe458691b86407b70107b700ad (patch)
tree5c603c1756cdc01e75c6a688eb4bd486d31217bb /src/conf_mode/protocols_bgp.py
parent2b55d0f947e849b2ececf5119e6183c9d5fca65e (diff)
parent84f05b1dd41bea5de16d707aa77a467f8d499323 (diff)
downloadvyos-1x-a95063831f83dcfe458691b86407b70107b700ad.tar.gz
vyos-1x-a95063831f83dcfe458691b86407b70107b700ad.zip
Merge pull request #3213 from HollyGurza/T6106
bgp: T6106: Valid commit error for route-reflector-client option defined in peer-group
Diffstat (limited to 'src/conf_mode/protocols_bgp.py')
-rwxr-xr-xsrc/conf_mode/protocols_bgp.py8
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 []: