Merge pull request #4347 from c-po/bgp-redistr-table-T7163

bgp: T7163: add CLI route-map and metric support for "redistribute table"

3 files changed, 69 insertions, 15 deletions

diff --git a/smoketest/config-tests/bgp-rpki b/smoketest/config-tests/bgp-rpki
index 587de67c6..657d4abcc 100644
--- a/smoketest/config-tests/bgp-rpki
+++ b/smoketest/config-tests/bgp-rpki
@@ -13,6 +13,7 @@ set policy route-map ebgp-transit-rpki rule 30 set local-preference '100'
 set policy route-map ebgp-transit-rpki rule 40 action 'permit'
 set policy route-map ebgp-transit-rpki rule 40 set extcommunity rt '192.0.2.100:100'
 set policy route-map ebgp-transit-rpki rule 40 set extcommunity soo '64500:100'
+set protocols bgp address-family ipv4-unicast redistribute table 100
 set protocols bgp neighbor 1.2.3.4 address-family ipv4-unicast nexthop-self
 set protocols bgp neighbor 1.2.3.4 address-family ipv4-unicast route-map import 'ebgp-transit-rpki'
 set protocols bgp neighbor 1.2.3.4 remote-as '10'
diff --git a/smoketest/configs/bgp-rpki b/smoketest/configs/bgp-rpki
index 5588f15c9..2d136d545 100644
--- a/smoketest/configs/bgp-rpki
+++ b/smoketest/configs/bgp-rpki
@@ -46,6 +46,13 @@ policy {
 }
 protocols {
     bgp 64500 {
+        address-family {
+            ipv4-unicast {
+                redistribute {
+                    table 100
+                }
+            }
+        }
         neighbor 1.2.3.4 {
             address-family {
                 ipv4-unicast {
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 0eda52ff6..0c6d36213 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021-2024 VyOS maintainers and contributors
+# Copyright (C) 2021-2025 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -685,14 +685,30 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
                 'route_map' : 'redistr-ipv4-static',
             },
             'table' : {
-                'number' : ['10', '20', '30', '40'],
+                '10' : {
+                    'metric' : '810',
+                    'route_map' : 'redistr-ipv4-table-10',
+                },
+                '20' : {
+                    'metric' : '820',
+                    'route_map' : 'redistr-ipv4-table-20',
+                },
+                '30' : {
+                    'metric' : '830',
+                    'route_map' : 'redistr-ipv4-table-30',
+                },
             },
         }
         for proto, proto_config in redistributes.items():
             proto_path = base_path + ['address-family', 'ipv4-unicast', 'redistribute', proto]
-            if proto == 'table' and 'number' in proto_config:
-                for number in proto_config['number']:
-                    self.cli_set(proto_path, value=number)
+            if proto == 'table':
+                for table, table_config in proto_config.items():
+                    self.cli_set(proto_path + [table])
+                    if 'metric' in table_config:
+                        self.cli_set(proto_path + [table, 'metric'], value=table_config['metric'])
+                    if 'route_map' in table_config:
+                        self.cli_set(['policy', 'route-map', table_config['route_map'], 'rule', '10', 'action'], value='permit')
+                        self.cli_set(proto_path + [table, 'route-map'], value=table_config['route_map'])
             else:
                 self.cli_set(proto_path)
                 if 'metric' in proto_config:
@@ -723,9 +739,16 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(' address-family ipv4 unicast', frrconfig)
 
         for proto, proto_config in redistributes.items():
-            if proto == 'table' and 'number' in proto_config:
-                for number in proto_config['number']:
-                    self.assertIn(f' redistribute table-direct {number}', frrconfig)
+            if proto == 'table':
+                for table, table_config in proto_config.items():
+                    tmp = f' redistribute table-direct {table}'
+                    if 'metric' in proto_config:
+                        metric = proto_config['metric']
+                        tmp += f' metric {metric}'
+                    if 'route_map' in proto_config:
+                        route_map = proto_config['route_map']
+                        tmp += f' route-map {route_map}'
+                    self.assertIn(tmp, frrconfig)
             else:
                 tmp = f' redistribute {proto}'
                 if 'metric' in proto_config:
@@ -794,14 +817,30 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
                 'route_map' : 'redistr-ipv6-static',
             },
             'table' : {
-                'number' : ['100', '120', '130', '140'],
+                '110' : {
+                    'metric' : '811',
+                    'route_map' : 'redistr-ipv6-table-110',
+                },
+                '120' : {
+                    'metric' : '821',
+                    'route_map' : 'redistr-ipv6-table-120',
+                },
+                '130' : {
+                    'metric' : '831',
+                    'route_map' : 'redistr-ipv6-table-130',
+                },
             },
         }
         for proto, proto_config in redistributes.items():
             proto_path = base_path + ['address-family', 'ipv6-unicast', 'redistribute', proto]
-            if proto == 'table' and 'number' in proto_config:
-                for number in proto_config['number']:
-                    self.cli_set(proto_path, value=number)
+            if proto == 'table':
+                for table, table_config in proto_config.items():
+                    self.cli_set(proto_path + [table])
+                    if 'metric' in table_config:
+                        self.cli_set(proto_path + [table, 'metric'], value=table_config['metric'])
+                    if 'route_map' in table_config:
+                        self.cli_set(['policy', 'route-map', table_config['route_map'], 'rule', '10', 'action'], value='permit')
+                        self.cli_set(proto_path + [table, 'route-map'], value=table_config['route_map'])
             else:
                 self.cli_set(proto_path)
                 if 'metric' in proto_config:
@@ -829,9 +868,16 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(' no bgp ebgp-requires-policy', frrconfig)
 
         for proto, proto_config in redistributes.items():
-            if proto == 'table' and 'number' in proto_config:
-                for number in proto_config['number']:
-                    self.assertIn(f' redistribute table-direct {number}', frrconfig)
+            if proto == 'table':
+                for table, table_config in proto_config.items():
+                    tmp = f' redistribute table-direct {table}'
+                    if 'metric' in proto_config:
+                        metric = proto_config['metric']
+                        tmp += f' metric {metric}'
+                    if 'route_map' in proto_config:
+                        route_map = proto_config['route_map']
+                        tmp += f' route-map {route_map}'
+                    self.assertIn(tmp, frrconfig)
             else:
                 # FRR calls this OSPF6
                 if proto == 'ospfv3':