From 42b06ec46f3caf95be3550b32531abc58d07fec9 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 18 Sep 2023 21:58:46 +0200
Subject: isis: T5597: add new features from FRR 9

* Add support for IS-IS advertise-high-metrics
  set protocols isis advertise-high-metrics

* Add support for IS-IS advertise-passive-only
  set protocols isis advertise-passive-only

(cherry picked from commit f7d35c15256ea74ab32c9b978a5c6fdbd659a7a0)
---
 data/templates/frr/isisd.frr.j2                              |  8 +++++++-
 .../include/isis/protocol-common-config.xml.i                | 12 ++++++++++++
 smoketest/scripts/cli/test_protocols_isis.py                 |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2
index 3c37e28b9..dbb8c7305 100644
--- a/data/templates/frr/isisd.frr.j2
+++ b/data/templates/frr/isisd.frr.j2
@@ -58,6 +58,12 @@ exit
 !
 router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
  net {{ net }}
+{% if advertise_high_metrics is vyos_defined %}
+advertise-high-metrics
+{% endif %}
+{% if advertise_passive_only is vyos_defined %}
+advertise-passive-only
+{% endif %}
 {% if dynamic_hostname is vyos_defined %}
  hostname dynamic
 {% endif %}
@@ -191,4 +197,4 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
  is-type {{ level }}
 {% endif %}
 exit
-!
\ No newline at end of file
+!
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 4ca7061db..648f2b319 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -1,4 +1,16 @@
 <!-- include start from isis/protocol-common-config.xml.i -->
+<leafNode name="advertise-high-metrics">
+  <properties>
+    <help>Advertise high metric value on all interfaces</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<leafNode name="advertise-passive-only">
+  <properties>
+    <help>Advertise prefixes of passive interfaces only</help>
+    <valueless/>
+  </properties>
+</leafNode>
 <node name="area-password">
   <properties>
     <help>Configure the authentication password for an area</help>
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 5ab7fae14..747fb5e80 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -100,6 +100,8 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.cli_set(vrf_base + ['table', table])
         self.cli_set(vrf_base + ['protocols', 'isis', 'net', net])
         self.cli_set(vrf_base + ['protocols', 'isis', 'interface', vrf_iface])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'advertise-high-metrics'])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'advertise-passive-only'])
         self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
 
         # Also set a default VRF IS-IS config
@@ -115,6 +117,8 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         tmp = self.getFRRconfig(f'router isis {domain} vrf {vrf}', daemon='isisd')
         self.assertIn(f'router isis {domain} vrf {vrf}', tmp)
         self.assertIn(f' net {net}', tmp)
+        self.assertIn(f' advertise-high-metrics', tmp)
+        self.assertIn(f' advertise-passive-only', tmp)
 
         self.cli_delete(['vrf', 'name', vrf])
         self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
-- 
cgit v1.2.3