diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-06-05 17:45:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-05 17:45:32 +0200 |
| commit | 07efcfc28cc2ba1420a470f9bb9cf3be68d8ff47 (patch) | |
| tree | 5f27af31973512dd345b3761763b8cbdef5ce1a2 | |
| parent | bade1ffeac3c8a8d86ed698bf495325f521b1ee3 (diff) | |
| parent | 8883a485ed1f18532bdbd79eed268facaa7eb72c (diff) | |
| download | vyos-1x-07efcfc28cc2ba1420a470f9bb9cf3be68d8ff47.tar.gz vyos-1x-07efcfc28cc2ba1420a470f9bb9cf3be68d8ff47.zip | |
Merge pull request #3586 from vyos/mergify/bp/sagitta/pr-3571
isis: T6429: fix isis metric-style configuration missing (backport #3571)
| -rw-r--r-- | data/templates/frr/isisd.frr.j2 | 3 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_protocols_isis.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2 index 5570caaa7..eb14aade6 100644 --- a/data/templates/frr/isisd.frr.j2 +++ b/data/templates/frr/isisd.frr.j2 @@ -76,6 +76,9 @@ advertise-passive-only {% if set_overload_bit is vyos_defined %} set-overload-bit {% endif %} +{% if metric_style is vyos_defined %} + metric-style {{ metric_style }} +{% endif %} {% if domain_password.md5 is vyos_defined %} domain-password md5 {{ domain_password.plaintext_password }} {% elif domain_password.plaintext_password is vyos_defined %} diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py index 0217c941a..47f002c6a 100755 --- a/smoketest/scripts/cli/test_protocols_isis.py +++ b/smoketest/scripts/cli/test_protocols_isis.py @@ -60,6 +60,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): prefix_list = 'EXPORT-ISIS' route_map = 'EXPORT-ISIS' rule = '10' + metric_style = 'transition' self.cli_set(['policy', 'prefix-list', prefix_list, 'rule', rule, 'action', 'permit']) self.cli_set(['policy', 'prefix-list', prefix_list, 'rule', rule, 'prefix', '203.0.113.0/24']) @@ -80,6 +81,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): self.cli_commit() self.cli_set(base_path + ['redistribute', 'ipv4', 'connected', 'level-2', 'route-map', route_map]) + self.cli_set(base_path + ['metric-style', metric_style]) self.cli_set(base_path + ['log-adjacency-changes']) # Commit all changes @@ -88,6 +90,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): # Verify all changes tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd') self.assertIn(f' net {net}', tmp) + self.assertIn(f' metric-style {metric_style}', tmp) self.assertIn(f' log-adjacency-changes', tmp) self.assertIn(f' redistribute ipv4 connected level-2 route-map {route_map}', tmp) @@ -401,7 +404,6 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): # Set a basic IS-IS config self.cli_set(base_path + ['net', net]) - self.cli_set(base_path + ['interface', interface]) for topology in topologies: self.cli_set(base_path + ['topology', topology]) |