From 25252cdbfcef43980c2586a16f676e94f29a64bf Mon Sep 17 00:00:00 2001
From: khramshinr <khramshinr@gmail.com>
Date: Tue, 19 Mar 2024 17:50:11 +0800
Subject: bgp: T6106: Valid commit error for route-reflector-client option
 defined in peer-group

handle vtysh bgp error

(cherry picked from commit 6fa72591972618f02ac1c66c084a99e006ce18f3)
---
 python/vyos/frr.py                          | 16 +++++++++++-----
 smoketest/scripts/cli/test_protocols_bgp.py |  7 +++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/python/vyos/frr.py b/python/vyos/frr.py
index a01d967e4..c3703cbb4 100644
--- a/python/vyos/frr.py
+++ b/python/vyos/frr.py
@@ -68,6 +68,7 @@ Apply the new configuration:
 import tempfile
 import re
 
+from vyos import ConfigError
 from vyos.utils.permission import chown
 from vyos.utils.process import cmd
 from vyos.utils.process import popen
@@ -95,6 +96,7 @@ path_config = '/run/frr'
 
 default_add_before = r'(ip prefix-list .*|route-map .*|line vty|end)'
 
+
 class FrrError(Exception):
     pass
 
@@ -210,13 +212,12 @@ def reload_configuration(config, daemon=None):
     LOG.debug(f'reload_configuration: Executing command against frr-reload: "{cmd}"')
     output, code = popen(cmd, stderr=STDOUT)
     f.close()
+
     for i, e in enumerate(output.split('\n')):
         LOG.debug(f'frr-reload output: {i:3} {e}')
+
     if code == 1:
-        raise CommitError('FRR configuration failed while running commit. Please ' \
-                          'enable debugging to examine logs.\n\n\n' \
-                          'To enable debugging run: "touch /tmp/vyos.frr.debug" ' \
-                          'and "sudo systemctl stop vyos-configd"')
+        raise ConfigError(output)
     elif code:
         raise OSError(code, output)
 
@@ -469,17 +470,22 @@ class FRRConfig:
         # https://github.com/FRRouting/frr/issues/10133
         count = 0
         count_max = 5
+        emsg = ''
         while count < count_max:
             count += 1
             try:
                 reload_configuration('\n'.join(self.config), daemon=daemon)
                 break
+            except ConfigError as e:
+                emsg = str(e)
             except:
                 # we just need to re-try the commit of the configuration
                 # for the listed FRR issues above
                 pass
         if count >= count_max:
-            raise ConfigurationNotValid(f'Config commit retry counter ({count_max}) exceeded for {daemon} dameon!')
+            if emsg:
+                raise ConfigError(emsg)
+            raise ConfigurationNotValid(f'Config commit retry counter ({count_max}) exceeded for {daemon} daemon!')
 
         # Save configuration to /run/frr/config/frr.conf
         save_configuration()
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 1d68ae08b..1dc865977 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -1236,6 +1236,13 @@ 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):
+        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'
-- 
cgit v1.2.3