Merge pull request #4346 from c-po/bgp-T7161

T7161: fix BGP IPv4/IPv6 unicast AFI "redistribute table" command

1 files changed, 134 insertions, 20 deletions

diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 761eb8bfe..0eda52ff6 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -655,10 +655,51 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         }
 
         # We want to redistribute ...
-        redistributes = ['connected', 'isis', 'kernel', 'ospf', 'rip', 'static']
-        for redistribute in redistributes:
-            self.cli_set(base_path + ['address-family', 'ipv4-unicast',
-                                          'redistribute', redistribute])
+        redistributes = {
+            'babel' : {
+                'metric' : '100',
+                'route_map' : 'redistr-ipv4-babel',
+            },
+            'connected' : {
+                'metric' : '200',
+                'route_map' : 'redistr-ipv4-connected',
+            },
+            'isis' : {
+                'metric' : '300',
+                'route_map' : 'redistr-ipv4-isis',
+            },
+            'kernel' : {
+                'metric' : '400',
+                'route_map' : 'redistr-ipv4-kernel',
+            },
+            'ospf' : {
+                'metric' : '500',
+                'route_map' : 'redistr-ipv4-ospf',
+            },
+            'rip' : {
+                'metric' : '600',
+                'route_map' : 'redistr-ipv4-rip',
+            },
+            'static' : {
+                'metric' : '700',
+                'route_map' : 'redistr-ipv4-static',
+            },
+            'table' : {
+                'number' : ['10', '20', '30', '40'],
+            },
+        }
+        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)
+            else:
+                self.cli_set(proto_path)
+                if 'metric' in proto_config:
+                    self.cli_set(proto_path + ['metric', proto_config['metric']])
+                if 'route_map' in proto_config:
+                    self.cli_set(['policy', 'route-map', proto_config['route_map'], 'rule', '10', 'action', 'permit'])
+                    self.cli_set(proto_path + ['route-map', proto_config['route_map']])
 
         for network, network_config in networks.items():
             self.cli_set(base_path + ['address-family', 'ipv4-unicast',
@@ -679,10 +720,22 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         # Verify FRR bgpd configuration
         frrconfig = self.getFRRconfig(f'router bgp {ASN}', endsection='^exit')
         self.assertIn(f'router bgp {ASN}', frrconfig)
-        self.assertIn(f' address-family ipv4 unicast', frrconfig)
-
-        for redistribute in redistributes:
-            self.assertIn(f' redistribute {redistribute}', frrconfig)
+        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)
+            else:
+                tmp = f' redistribute {proto}'
+                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)
 
         for network, network_config in networks.items():
             self.assertIn(f' network {network}', frrconfig)
@@ -695,6 +748,10 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
                 command = f'{command} route-map {network_config["route_map"]}'
             self.assertIn(command, frrconfig)
 
+        for proto, proto_config in redistributes.items():
+            if 'route_map' in proto_config:
+                self.cli_delete(['policy', 'route-map', proto_config['route_map']])
+
     def test_bgp_05_afi_ipv6(self):
         networks = {
             '2001:db8:100::/48' : {
@@ -707,10 +764,51 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         }
 
         # We want to redistribute ...
-        redistributes = ['connected', 'kernel', 'ospfv3', 'ripng', 'static']
-        for redistribute in redistributes:
-            self.cli_set(base_path + ['address-family', 'ipv6-unicast',
-                                          'redistribute', redistribute])
+        redistributes = {
+            'babel' : {
+                'metric' : '100',
+                'route_map' : 'redistr-ipv6-babel',
+            },
+            'connected' : {
+                'metric' : '200',
+                'route_map' : 'redistr-ipv6-connected',
+            },
+            'isis' : {
+                'metric' : '300',
+                'route_map' : 'redistr-ipv6-isis',
+            },
+            'kernel' : {
+                'metric' : '400',
+                'route_map' : 'redistr-ipv6-kernel',
+            },
+            'ospfv3' : {
+                'metric' : '500',
+                'route_map' : 'redistr-ipv6-ospfv3',
+            },
+            'ripng' : {
+                'metric' : '600',
+                'route_map' : 'redistr-ipv6-ripng',
+            },
+            'static' : {
+                'metric' : '700',
+                'route_map' : 'redistr-ipv6-static',
+            },
+            'table' : {
+                'number' : ['100', '120', '130', '140'],
+            },
+        }
+        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)
+            else:
+                self.cli_set(proto_path)
+                if 'metric' in proto_config:
+                    self.cli_set(proto_path + ['metric', proto_config['metric']])
+                if 'route_map' in proto_config:
+                    self.cli_set(['policy', 'route-map', proto_config['route_map'], 'rule', '20', 'action', 'permit'])
+                    self.cli_set(proto_path + ['route-map', proto_config['route_map']])
 
         for network, network_config in networks.items():
             self.cli_set(base_path + ['address-family', 'ipv6-unicast',
@@ -725,22 +823,38 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         # Verify FRR bgpd configuration
         frrconfig = self.getFRRconfig(f'router bgp {ASN}', endsection='^exit')
         self.assertIn(f'router bgp {ASN}', frrconfig)
-        self.assertIn(f' address-family ipv6 unicast', frrconfig)
+        self.assertIn(' address-family ipv6 unicast', frrconfig)
         # T2100: By default ebgp-requires-policy is disabled to keep VyOS
         # 1.3 and 1.2 backwards compatibility
-        self.assertIn(f' no bgp ebgp-requires-policy', frrconfig)
-
-        for redistribute in redistributes:
-            # FRR calls this OSPF6
-            if redistribute == 'ospfv3':
-                redistribute = 'ospf6'
-            self.assertIn(f' redistribute {redistribute}', frrconfig)
+        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)
+            else:
+                # FRR calls this OSPF6
+                if proto == 'ospfv3':
+                    proto = 'ospf6'
+                tmp = f' redistribute {proto}'
+                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)
 
         for network, network_config in networks.items():
             self.assertIn(f' network {network}', frrconfig)
             if 'as_set' in network_config:
                 self.assertIn(f' aggregate-address {network} summary-only', frrconfig)
 
+        for proto, proto_config in redistributes.items():
+            if 'route_map' in proto_config:
+                self.cli_delete(['policy', 'route-map', proto_config['route_map']])
+
     def test_bgp_06_listen_range(self):
         # Implemented via T1875
         limit = '64'