summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-03-26 17:39:06 +0100
committerGitHub <noreply@github.com>2024-03-26 17:39:06 +0100
commit9ee515c236f9fb8cb907790b37a8f5fa54efc47a (patch)
tree7b740f8de3802759c6a8324b23e3b8d6b1cdc37d
parent25891616fd74013241dc755166c7e3ad732849cc (diff)
parentf62e67e78bae6425057a5fb57676d8b911bc9cc7 (diff)
downloadvyos-1x-9ee515c236f9fb8cb907790b37a8f5fa54efc47a.tar.gz
vyos-1x-9ee515c236f9fb8cb907790b37a8f5fa54efc47a.zip
Merge pull request #3191 from vyos/mergify/bp/sagitta/pr-3190
bgp: T6106: fix test and verify() (backport #3190)
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_bgp.py4
-rwxr-xr-xsrc/conf_mode/protocols_bgp.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 1dc865977..5f238b25a 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -1236,13 +1236,11 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
self.assertIn(f' neighbor {pg_ipv6} activate', afiv6_config)
self.assertIn(f' neighbor {pg_ipv6} maximum-prefix {ipv6_max_prefix}', afiv6_config)
- def test_bgp_26_commit_error(self):
+ def test_bgp_27_route_reflector_client(self):
self.cli_set(base_path + ['peer-group', 'peer1', 'address-family', 'l2vpn-evpn', 'route-reflector-client'])
with self.assertRaises(ConfigSessionError) as e:
self.cli_commit()
- self.assertTrue("% Invalid command. Not an internal neighbor" in str(e.exception))
-
def test_bgp_99_bmp(self):
target_name = 'instance-bmp'
target_address = '127.0.0.1'
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index d90dfe45b..f1c59cbde 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -457,6 +457,8 @@ def verify(bgp):
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']:
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 []: