Merge pull request #4921 from hedrok/T7664-update-smoketest-script

T7664: support FRR 10.5

5 files changed, 30 insertions, 12 deletions

diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index d7c2a924f..06377eee3 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -398,7 +398,9 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f' bgp bestpath compare-routerid', frrconfig)
         self.assertIn(f' bgp bestpath peer-type multipath-relax', frrconfig)
         self.assertIn(f' bgp minimum-holdtime {min_hold_time}', frrconfig)
-        self.assertIn(f' bgp reject-as-sets', frrconfig)
+        self.assertNotIn(
+            f'bgp reject-as-sets', frrconfig
+        )  # default was changed in FRR 10.5 to 'reject-as-sets'
         self.assertIn(f' bgp route-reflector allow-outbound-policy', frrconfig)
         self.assertIn(f' no bgp ipv6-auto-ra', frrconfig)
         self.assertIn(f' bgp shutdown', frrconfig)
@@ -425,6 +427,12 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'  maximum-paths {max_path_v6}', afiv6_config)
         self.assertIn(f'  maximum-paths ibgp {max_path_v6ibgp}', afiv6_config)
 
+        # Verify reject-as-sets
+        self.cli_delete(base_path + ['parameters', 'reject-as-sets'])
+        self.cli_commit()
+        frrconfig = self.getFRRconfig(f'router bgp {ASN}', stop_section='^exit')
+        self.assertIn(f'no bgp reject-as-sets', frrconfig)
+
     def test_bgp_02_neighbors(self):
         # Test out individual neighbor configuration items, not all of them are
         # also available to a peer-group!
diff --git a/smoketest/scripts/cli/test_protocols_segment-routing.py b/smoketest/scripts/cli/test_protocols_segment-routing.py
index 8d826f07c..a5c0d5983 100755
--- a/smoketest/scripts/cli/test_protocols_segment-routing.py
+++ b/smoketest/scripts/cli/test_protocols_segment-routing.py
@@ -57,7 +57,7 @@ class TestProtocolsSegmentRouting(VyOSUnitTestSHIM.TestCase):
                 'prefix': '2001:d::/48',
                 'block-len': '32',
                 'node-len': '16',
-                'func-bits': '16',
+                'func-bits': '12',
                 'usid': {},
                 'format': 'usid-f3216',
             },
@@ -131,13 +131,25 @@ class TestProtocolsSegmentRouting(VyOSUnitTestSHIM.TestCase):
         self.assertIn('  locators', frrconfig)
         for locator, locator_config in locators.items():
             prefix = locator_config['prefix']
-            block_len = locator_config.get('block-len', '40')
-            node_len = locator_config.get('node-len', '24')
-            func_bits = locator_config.get('func-bits', '16')
+            block_len = (
+                f' block-len {locator_config["block-len"]}'
+                if 'block-len' in locator_config
+                else ''
+            )
+            node_len = (
+                f' node-len {locator_config["node-len"]}'
+                if 'node-len' in locator_config
+                else ''
+            )
+            func_bits = (
+                f' func-bits {locator_config["func-bits"]}'
+                if 'func-bits' in locator_config
+                else ''
+            )
 
             self.assertIn(f'   locator {locator}', frrconfig)
             self.assertIn(
-                f'    prefix {prefix} block-len {block_len} node-len {node_len} func-bits {func_bits}',
+                f'    prefix {prefix}{block_len}{node_len}{func_bits}',
                 frrconfig,
             )
 
diff --git a/smoketest/scripts/cli/test_system_ip.py b/smoketest/scripts/cli/test_system_ip.py
index 3784d4630..25dbeef1d 100755
--- a/smoketest/scripts/cli/test_system_ip.py
+++ b/smoketest/scripts/cli/test_system_ip.py
@@ -83,8 +83,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase):
             _verify_gc_thres(size)
 
     def test_system_ip_protocol_route_map(self):
-        protocols = ['any', 'babel', 'bgp', 'connected', 'eigrp', 'isis',
-                     'kernel', 'ospf', 'rip', 'static', 'table']
+        protocols = ['any', 'babel', 'bgp', 'eigrp', 'isis', 'ospf', 'rip', 'static']
 
         rule_num = '10'
 
diff --git a/smoketest/scripts/cli/test_system_ipv6.py b/smoketest/scripts/cli/test_system_ipv6.py
index 0f94765bd..f7d74eb58 100755
--- a/smoketest/scripts/cli/test_system_ipv6.py
+++ b/smoketest/scripts/cli/test_system_ipv6.py
@@ -97,8 +97,7 @@ class TestSystemIPv6(VyOSUnitTestSHIM.TestCase):
             _verify_gc_thres(size)
 
     def test_system_ipv6_protocol_route_map(self):
-        protocols = ['any', 'babel', 'bgp', 'connected', 'isis',
-                     'kernel', 'ospfv3', 'ripng', 'static', 'table']
+        protocols = ['any', 'babel', 'bgp', 'isis', 'ospfv3', 'ripng', 'static']
 
         for protocol in protocols:
             route_map = 'route-map-' + protocol.replace('ospfv3', 'ospf6')
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 9349f43c6..2b364dea3 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -40,8 +40,8 @@ from vyos.xml_ref import default_value
 
 base_path = ['vrf']
 vrfs = ['red', 'green', 'blue', 'foo-bar', 'baz_foo']
-v4_protocols = ['any', 'babel', 'bgp', 'connected', 'eigrp', 'isis', 'kernel', 'ospf', 'rip', 'static', 'table']
-v6_protocols = ['any', 'babel', 'bgp', 'connected', 'isis', 'kernel', 'ospfv3', 'ripng', 'static', 'table']
+v4_protocols = ['any', 'babel', 'bgp', 'eigrp', 'isis', 'ospf', 'rip', 'static']
+v6_protocols = ['any', 'babel', 'bgp', 'isis', 'ospfv3', 'ripng', 'static']
 
 class VRFTest(VyOSUnitTestSHIM.TestCase):
     _interfaces = []