From 2265bb4dc27965da3dce7e3f476366b7d1e911f3 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 1 Apr 2023 13:14:30 +0200
Subject: xml: include building block file name should end with .i and not .in

---
 interface-definitions/include/ospf/protocol-common-config.xml.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'interface-definitions/include/ospf/protocol-common-config.xml.i')

diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 25b54b181..f39b9c5e3 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -358,7 +358,7 @@
       <description>Interface name</description>
     </valueHelp>
     <constraint>
-      #include <include/constraint/interface-name.xml.in>
+      #include <include/constraint/interface-name.xml.i>
     </constraint>
   </properties>
   <children>
-- 
cgit v1.2.3


From 3ffb5ff16543576e73f23125e4590fa57b02f0b7 Mon Sep 17 00:00:00 2001
From: Cheeze_It <none@none.com>
Date: Sun, 19 Mar 2023 19:24:50 -0600
Subject: T5081: ISIS and OSPF syncronization with IGP-LDP sync

---
 data/templates/frr/isisd.frr.j2                    | 11 ++++++
 data/templates/frr/ospfd.frr.j2                    | 11 ++++++
 .../include/isis/protocol-common-config.xml.i      |  4 +-
 .../include/ldp-sync-interface.xml.i               | 22 +++++++++++
 .../include/ldp-sync-protocol.xml.i                | 21 +++++++++++
 .../include/ospf/protocol-common-config.xml.i      |  4 +-
 op-mode-definitions/include/isis-common.xml.i      | 26 ++++++++++++-
 op-mode-definitions/include/ospf-common.xml.i      | 26 ++++++++++++-
 smoketest/scripts/cli/test_protocols_isis.py       | 43 ++++++++++++++++++++++
 smoketest/scripts/cli/test_protocols_ospf.py       | 41 +++++++++++++++++++++
 10 files changed, 205 insertions(+), 4 deletions(-)
 create mode 100644 interface-definitions/include/ldp-sync-interface.xml.i
 create mode 100644 interface-definitions/include/ldp-sync-protocol.xml.i

(limited to 'interface-definitions/include/ospf/protocol-common-config.xml.i')

diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2
index 8df1e9513..3c37e28b9 100644
--- a/data/templates/frr/isisd.frr.j2
+++ b/data/templates/frr/isisd.frr.j2
@@ -25,6 +25,12 @@ interface {{ iface }}
 {%         if iface_config.hello_padding is vyos_defined %}
  isis hello padding
 {%         endif %}
+{%         if iface_config.ldp_sync.disable is vyos_defined %}
+ no isis mpls ldp-sync
+{%         elif iface_config.ldp_sync.holddown is vyos_defined %}
+ isis mpls ldp-sync
+ isis mpls ldp-sync holddown {{ iface_config.ldp_sync.holddown }}
+{%         endif %}
 {%         if iface_config.metric is vyos_defined %}
  isis metric {{ iface_config.metric }}
 {%         endif %}
@@ -84,6 +90,11 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is vyos_defined }}
 {% if max_lsp_lifetime is vyos_defined %}
  max-lsp-lifetime {{ max_lsp_lifetime }}
 {% endif %}
+{% if ldp_sync.holddown is vyos_defined %}
+ mpls ldp-sync holddown {{ ldp_sync.holddown }}
+{% elif ldp_sync is vyos_defined %}
+ mpls ldp-sync
+{% endif %}
 {% if spf_interval is vyos_defined %}
  spf-interval {{ spf_interval }}
 {% endif %}
diff --git a/data/templates/frr/ospfd.frr.j2 b/data/templates/frr/ospfd.frr.j2
index 8c4a81c57..3f97b7325 100644
--- a/data/templates/frr/ospfd.frr.j2
+++ b/data/templates/frr/ospfd.frr.j2
@@ -44,6 +44,12 @@ interface {{ iface }}
 {%         if iface_config.bfd.profile is vyos_defined %}
  ip ospf bfd profile {{ iface_config.bfd.profile }}
 {%         endif %}
+{%         if iface_config.ldp_sync.disable is vyos_defined %}
+ no ip ospf mpls ldp-sync
+{%         elif iface_config.ldp_sync.holddown is vyos_defined %}
+ ip ospf mpls ldp-sync
+ ip ospf mpls ldp-sync holddown {{ iface_config.ldp_sync.holddown }}
+{%         endif %}
 {%         if iface_config.mtu_ignore is vyos_defined %}
  ip ospf mtu-ignore
 {%         endif %}
@@ -133,6 +139,11 @@ router ospf {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {% if maximum_paths is vyos_defined %}
  maximum-paths {{ maximum_paths }}
 {% endif %}
+{% if ldp_sync.holddown is vyos_defined %}
+ mpls ldp-sync holddown {{ ldp_sync.holddown }}
+{% elif ldp_sync is vyos_defined %}
+ mpls ldp-sync
+{% endif %}
 {% if distance.global is vyos_defined %}
  distance {{ distance.global }}
 {% endif %}
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 0e6f19480..983a085ec 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -152,6 +152,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/ldp-sync-protocol.xml.i>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
@@ -172,7 +173,7 @@
 </leafNode>
 <node name="traffic-engineering">
   <properties>
-    <help>Show IS-IS neighbor adjacencies</help>
+    <help>IS-IS traffic engineering extensions</help>
   </properties>
   <children>
     <leafNode name="enable">
@@ -631,6 +632,7 @@
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
+    #include <include/ldp-sync-interface.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
diff --git a/interface-definitions/include/ldp-sync-interface.xml.i b/interface-definitions/include/ldp-sync-interface.xml.i
new file mode 100644
index 000000000..b24831bbe
--- /dev/null
+++ b/interface-definitions/include/ldp-sync-interface.xml.i
@@ -0,0 +1,22 @@
+<!-- include start from ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>LDP-IGP synchronization configuration for interface</help>
+  </properties>
+  <children>
+    #include <include/generic-disable-node.xml.i>
+    <leafNode name="holddown">
+      <properties>
+        <help>Hold down timer for LDP-IGP cost restoration</help>
+        <valueHelp>
+          <format>u32:0-10000</format>
+          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-10000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ldp-sync-protocol.xml.i b/interface-definitions/include/ldp-sync-protocol.xml.i
new file mode 100644
index 000000000..c82c811f6
--- /dev/null
+++ b/interface-definitions/include/ldp-sync-protocol.xml.i
@@ -0,0 +1,21 @@
+<!-- include start from ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Protocol wide LDP-IGP synchronization configuration</help>
+  </properties>
+  <children>
+    <leafNode name="holddown">
+      <properties>
+        <help>Protocol wide hold down timer for LDP-IGP cost restoration</help>
+        <valueHelp>
+          <format>u32:0-10000</format>
+          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+        </valueHelp>
+        <constraint>
+          <validator name="numeric" argument="--range 0-10000"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index f39b9c5e3..425d3b01c 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -331,6 +331,7 @@
     </constraint>
   </properties>
 </leafNode>
+#include <include/ldp-sync-protocol.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
@@ -385,6 +386,7 @@
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
+    #include <include/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
@@ -875,4 +877,4 @@
     </node>
   </children>
 </node>
-<!-- include end -->
+<!-- include end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/isis-common.xml.i b/op-mode-definitions/include/isis-common.xml.i
index 0e20861c7..53e85a7ef 100644
--- a/op-mode-definitions/include/isis-common.xml.i
+++ b/op-mode-definitions/include/isis-common.xml.i
@@ -54,6 +54,30 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
+<node name="mpls">
+  <properties>
+    <help>Show IS-IS MPLS specific information</help>
+  </properties>
+  <children>
+    <node name="ldp-sync">
+      <properties>
+        <help>Show IS-IS LDP-IGP synchronization information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="interface">
+          <properties>
+            <help>Show specific IS-IS LDP-IGP synchronization for an interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces</script>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+      </children>
+    </node>
+  </children>
+</node>
 <node name="mpls-te">
   <properties>
     <help>Show IS-IS MPLS traffic engineering information</help>
@@ -176,4 +200,4 @@
   </children>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </node>
-<!-- included end -->
+<!-- included end -->
\ No newline at end of file
diff --git a/op-mode-definitions/include/ospf-common.xml.i b/op-mode-definitions/include/ospf-common.xml.i
index 098254f4e..7d9e541cf 100644
--- a/op-mode-definitions/include/ospf-common.xml.i
+++ b/op-mode-definitions/include/ospf-common.xml.i
@@ -517,6 +517,30 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </tagNode>
+<node name="mpls">
+  <properties>
+    <help>Show OSPF MPLS specific information</help>
+  </properties>
+  <children>
+    <node name="ldp-sync">
+      <properties>
+        <help>Show OSPF LDP-IGP synchronization information</help>
+      </properties>
+      <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+      <children>
+        <tagNode name="interface">
+          <properties>
+            <help>Show specific OSPF LDP-IGP synchronization for an interface</help>
+            <completionHelp>
+              <script>${vyos_completion_dir}/list_interfaces</script>
+            </completionHelp>
+          </properties>
+          <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
+        </tagNode>
+      </children>
+    </node>
+  </children>
+</node>
 <node name="neighbor">
   <properties>
     <help>Show IPv4 OSPF neighbor information</help>
@@ -547,4 +571,4 @@
   </properties>
   <command>${vyos_op_scripts_dir}/vtysh_wrapper.sh $@</command>
 </leafNode>
-<!-- included end -->
+<!-- included end -->
\ No newline at end of file
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index d11d80a1f..61e29c449 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -308,5 +308,48 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f' segment-routing prefix {prefix_three} absolute {prefix_three_value} explicit-null', tmp)
         self.assertIn(f' segment-routing prefix {prefix_four} absolute {prefix_four_value} no-php-flag', tmp)
 
+    def test_isis_08_ldp_sync(self):
+        holddown = "500"
+        interface = 'lo'
+
+        self.cli_set(base_path + ['net', net])
+        self.cli_set(base_path + ['interface', interface])
+        self.cli_set(base_path + ['ldp-sync', 'holddown', holddown])
+        
+        # Commit main ISIS changes
+        self.cli_commit()
+        
+        # Verify main ISIS changes
+        tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
+        self.assertIn(f' net {net}', tmp)
+        self.assertIn(f' mpls ldp-sync', tmp)
+        self.assertIn(f' mpls ldp-sync holddown {holddown}', tmp)
+        
+        for interface in self._interfaces:
+            self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'holddown', holddown])
+
+            # Commit interface changes for holddown
+            self.cli_commit()
+
+            # Verify interface changes for holddown
+            tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
+            self.assertIn(f'interface {interface}', tmp)
+            self.assertIn(f' ip router isis {domain}', tmp)
+            self.assertIn(f' ipv6 router isis {domain}', tmp)
+            self.assertIn(f' isis mpls ldp-sync holddown {holddown}', tmp)
+            
+        for interface in self._interfaces:
+            self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'disable'])
+            
+            # Commit interface changes for disable
+            self.cli_commit()
+            
+            # Verify interface changes for disable
+            tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
+            self.assertIn(f'interface {interface}', tmp)
+            self.assertIn(f' ip router isis {domain}', tmp)
+            self.assertIn(f' ipv6 router isis {domain}', tmp)
+            self.assertIn(f' no isis mpls ldp-sync', tmp)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 581959b15..d4c85f2b2 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -434,6 +434,47 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f' segment-routing prefix {prefix_one} index {prefix_one_value} explicit-null', frrconfig)
         self.assertIn(f' segment-routing prefix {prefix_two} index {prefix_two_value} no-php-flag', frrconfig)
 
+    def test_ospf_15_ldp_sync(self):
+        holddown = "500"
+        interface = 'lo'
+        interfaces = Section.interfaces('ethernet')
+
+        self.cli_set(base_path + ['interface', interface])
+        self.cli_set(base_path + ['ldp-sync', 'holddown', holddown])
+        
+        # Commit main OSPF changes
+        self.cli_commit()
+        
+        # Verify main OSPF changes
+        frrconfig = self.getFRRconfig('router ospf')
+        self.assertIn(f'router ospf', frrconfig)
+        self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig)
+        self.assertIn(f' mpls ldp-sync holddown {holddown}', frrconfig)
+        
+        for interface in interfaces:
+            self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'holddown', holddown])
+
+            # Commit interface changes for holddown
+            self.cli_commit()
+
+            # Verify interface changes for holddown
+            config = self.getFRRconfig(f'interface {interface}')
+            self.assertIn(f'interface {interface}', config)
+            self.assertIn(f' ip ospf dead-interval 40', config)
+            self.assertIn(f' ip ospf mpls ldp-sync', config)
+            self.assertIn(f' ip ospf mpls ldp-sync holddown {holddown}', config)
+            
+        for interface in interfaces:
+            self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'disable'])
+            
+            # Commit interface changes for disable
+            self.cli_commit()
+            
+            # Verify interface changes for disable
+            config = self.getFRRconfig(f'interface {interface}')
+            self.assertIn(f'interface {interface}', config)
+            self.assertIn(f' ip ospf dead-interval 40', config)
+            self.assertIn(f' no ip ospf mpls ldp-sync', config)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
-- 
cgit v1.2.3


From 8cb0b59fce842c9e69ebf1b9099abce2c6e21447 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 12 Apr 2023 21:36:27 +0200
Subject: xml: T5081: generate common holddown XML building block for IS-IS and
 OSPF

---
 .../include/isis/ldp-sync-holddown.xml.i           | 14 ++++++++++++++
 .../include/isis/ldp-sync-interface.xml.i          | 11 +++++++++++
 .../include/isis/ldp-sync-protocol.xml.i           | 10 ++++++++++
 .../include/isis/protocol-common-config.xml.i      |  4 ++--
 .../include/ldp-sync-interface.xml.i               | 22 ----------------------
 .../include/ldp-sync-protocol.xml.i                | 21 ---------------------
 .../include/ospf/protocol-common-config.xml.i      |  4 ++--
 7 files changed, 39 insertions(+), 47 deletions(-)
 create mode 100644 interface-definitions/include/isis/ldp-sync-holddown.xml.i
 create mode 100644 interface-definitions/include/isis/ldp-sync-interface.xml.i
 create mode 100644 interface-definitions/include/isis/ldp-sync-protocol.xml.i
 delete mode 100644 interface-definitions/include/ldp-sync-interface.xml.i
 delete mode 100644 interface-definitions/include/ldp-sync-protocol.xml.i

(limited to 'interface-definitions/include/ospf/protocol-common-config.xml.i')

diff --git a/interface-definitions/include/isis/ldp-sync-holddown.xml.i b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
new file mode 100644
index 000000000..15ac26f07
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-holddown.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from isis/ldp-sync-holddown.xml.i -->
+<leafNode name="holddown">
+  <properties>
+    <help>Hold down timer for LDP-IGP cost restoration</help>
+    <valueHelp>
+      <format>u32:0-10000</format>
+      <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-10000"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-interface.xml.i b/interface-definitions/include/isis/ldp-sync-interface.xml.i
new file mode 100644
index 000000000..222a35256
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-interface.xml.i
@@ -0,0 +1,11 @@
+<!-- include start from isis/ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>LDP-IGP synchronization configuration for interface</help>
+  </properties>
+  <children>
+    #include <include/generic-disable-node.xml.i>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/ldp-sync-protocol.xml.i b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
new file mode 100644
index 000000000..b2e696a70
--- /dev/null
+++ b/interface-definitions/include/isis/ldp-sync-protocol.xml.i
@@ -0,0 +1,10 @@
+<!-- include start from isis/ldp-igp-sync.xml.i -->
+<node name="ldp-sync">
+  <properties>
+    <help>Protocol wide LDP-IGP synchronization configuration</help>
+  </properties>
+  <children>
+    #include <include/isis/ldp-sync-holddown.xml.i>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 983a085ec..8103b5c5d 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -152,7 +152,7 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/ldp-sync-protocol.xml.i>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <leafNode name="net">
   <properties>
     <help>A Network Entity Title for this process (ISO only)</help>
@@ -632,7 +632,7 @@
       </properties>
     </leafNode>
     #include <include/isis/metric.xml.i>
-    #include <include/ldp-sync-interface.xml.i>
+    #include <include/isis/ldp-sync-interface.xml.i>
     <node name="network">
       <properties>
         <help>Set network type</help>
diff --git a/interface-definitions/include/ldp-sync-interface.xml.i b/interface-definitions/include/ldp-sync-interface.xml.i
deleted file mode 100644
index b24831bbe..000000000
--- a/interface-definitions/include/ldp-sync-interface.xml.i
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- include start from ldp-igp-sync.xml.i -->
-<node name="ldp-sync">
-  <properties>
-    <help>LDP-IGP synchronization configuration for interface</help>
-  </properties>
-  <children>
-    #include <include/generic-disable-node.xml.i>
-    <leafNode name="holddown">
-      <properties>
-        <help>Hold down timer for LDP-IGP cost restoration</help>
-        <valueHelp>
-          <format>u32:0-10000</format>
-          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-10000"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/ldp-sync-protocol.xml.i b/interface-definitions/include/ldp-sync-protocol.xml.i
deleted file mode 100644
index c82c811f6..000000000
--- a/interface-definitions/include/ldp-sync-protocol.xml.i
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- include start from ldp-igp-sync.xml.i -->
-<node name="ldp-sync">
-  <properties>
-    <help>Protocol wide LDP-IGP synchronization configuration</help>
-  </properties>
-  <children>
-    <leafNode name="holddown">
-      <properties>
-        <help>Protocol wide hold down timer for LDP-IGP cost restoration</help>
-        <valueHelp>
-          <format>u32:0-10000</format>
-          <description>Time to wait in seconds for LDP-IGP synchronization to occur before restoring interface cost</description>
-        </valueHelp>
-        <constraint>
-          <validator name="numeric" argument="--range 0-10000"/>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index 425d3b01c..e400119dd 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -331,7 +331,7 @@
     </constraint>
   </properties>
 </leafNode>
-#include <include/ldp-sync-protocol.xml.i>
+#include <include/isis/ldp-sync-protocol.xml.i>
 <node name="distance">
   <properties>
     <help>Administrative distance</help>
@@ -386,7 +386,7 @@
     #include <include/ospf/authentication.xml.i>
     #include <include/ospf/intervals.xml.i>
     #include <include/ospf/interface-common.xml.i>
-    #include <include/ldp-sync-interface.xml.i>
+    #include <include/isis/ldp-sync-interface.xml.i>
     <leafNode name="bandwidth">
       <properties>
         <help>Interface bandwidth (Mbit/s)</help>
-- 
cgit v1.2.3


From f9aa4c6312a773c216e65400db7e66849d5a02c7 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 8 Apr 2023 22:15:41 +0200
Subject: T5150: do not apply zebra route-map from routing-daemon config level

---
 data/templates/frr/vrf.route-map.frr.j2             | 10 ----------
 data/templates/frr/vrf.route-map.v6.frr.j2          | 10 ----------
 .../include/bgp/protocol-common-config.xml.i        |  1 -
 .../include/eigrp/protocol-common-config.xml.i      |  1 -
 .../include/isis/protocol-common-config.xml.i       |  1 -
 .../include/ospf/protocol-common-config.xml.i       |  1 -
 .../include/ospfv3/protocol-common-config.xml.i     |  1 -
 smoketest/scripts/cli/test_protocols_bgp.py         | 21 ---------------------
 src/conf_mode/protocols_bgp.py                      | 11 -----------
 src/conf_mode/protocols_eigrp.py                    | 10 ----------
 src/conf_mode/protocols_isis.py                     | 14 ++------------
 src/conf_mode/protocols_ospf.py                     | 11 +----------
 src/conf_mode/protocols_ospfv3.py                   | 10 ----------
 src/conf_mode/protocols_static.py                   |  1 +
 14 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 data/templates/frr/vrf.route-map.frr.j2
 delete mode 100644 data/templates/frr/vrf.route-map.v6.frr.j2

(limited to 'interface-definitions/include/ospf/protocol-common-config.xml.i')

diff --git a/data/templates/frr/vrf.route-map.frr.j2 b/data/templates/frr/vrf.route-map.frr.j2
deleted file mode 100644
index 5e0c56a7b..000000000
--- a/data/templates/frr/vrf.route-map.frr.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-!
-{% if vrf is vyos_defined and route_map is vyos_defined %}
-vrf {{ vrf }}
- ip protocol {{ protocol }} route-map {{ route_map }}
- exit-vrf
-!
-{% elif route_map is vyos_defined %}
-ip protocol {{ protocol }} route-map {{ route_map }}
-{% endif %}
-!
diff --git a/data/templates/frr/vrf.route-map.v6.frr.j2 b/data/templates/frr/vrf.route-map.v6.frr.j2
deleted file mode 100644
index 7dc59a046..000000000
--- a/data/templates/frr/vrf.route-map.v6.frr.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-!
-{% if vrf is vyos_defined and route_map is vyos_defined %}
-vrf {{ vrf }}
- ipv6 protocol {{ protocol }} route-map {{ route_map }}
- exit-vrf
-!
-{% elif route_map is vyos_defined %}
-ipv6 protocol {{ protocol }} route-map {{ route_map }}
-{% endif %}
-!
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index a9122db57..527eaf991 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -1565,7 +1565,6 @@
     #include <include/port-number.xml.i>
   </children>
 </tagNode>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>BGP protocol timers</help>
diff --git a/interface-definitions/include/eigrp/protocol-common-config.xml.i b/interface-definitions/include/eigrp/protocol-common-config.xml.i
index 88365187a..a21d18424 100644
--- a/interface-definitions/include/eigrp/protocol-common-config.xml.i
+++ b/interface-definitions/include/eigrp/protocol-common-config.xml.i
@@ -107,7 +107,6 @@
     <multi/>
   </properties>
 </leafNode>
-#include <include/route-map.xml.i>
 #include <include/router-id.xml.i>
 <!-- FRR timers not implemented yet -->
 <leafNode name="variance">
diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i
index 8103b5c5d..4ca7061db 100644
--- a/interface-definitions/include/isis/protocol-common-config.xml.i
+++ b/interface-definitions/include/isis/protocol-common-config.xml.i
@@ -687,5 +687,4 @@
     </leafNode>
   </children>
 </tagNode>
-#include <include/route-map.xml.i>
 <!-- include end -->
diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i
index e400119dd..b7f22cb88 100644
--- a/interface-definitions/include/ospf/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospf/protocol-common-config.xml.i
@@ -816,7 +816,6 @@
     </leafNode>
   </children>
 </node>
-#include <include/route-map.xml.i>
 <node name="timers">
   <properties>
     <help>Adjust routing timers</help>
diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
index 1c33ca920..a7de50638 100644
--- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i
+++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i
@@ -256,5 +256,4 @@
     </node>
   </children>
 </node>
-#include <include/route-map.xml.i>
 <!-- include end -->
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index f6eede87a..ce9590fc2 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -713,7 +713,6 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
         for prefix in listen_ranges:
             self.assertIn(f' bgp listen range {prefix} peer-group {peer_group}', frrconfig)
 
-
     def test_bgp_07_l2vpn_evpn(self):
         vnis = ['10010', '10020', '10030']
         neighbors = ['192.0.2.10', '192.0.2.20', '192.0.2.30']
@@ -743,26 +742,6 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
             self.assertIn(f'   advertise-default-gw', vniconfig)
             self.assertIn(f'   advertise-svi-ip', vniconfig)
 
-    def test_bgp_08_zebra_route_map(self):
-        # Implemented because of T3328
-        self.cli_set(base_path + ['route-map', route_map_in])
-        # commit changes
-        self.cli_commit()
-
-        # Verify FRR configuration
-        zebra_route_map = f'ip protocol bgp route-map {route_map_in}'
-        frrconfig = self.getFRRconfig(zebra_route_map)
-        self.assertIn(zebra_route_map, frrconfig)
-
-        # Remove the route-map again
-        self.cli_delete(base_path + ['route-map'])
-        # commit changes
-        self.cli_commit()
-
-        # Verify FRR configuration
-        frrconfig = self.getFRRconfig(zebra_route_map)
-        self.assertNotIn(zebra_route_map, frrconfig)
-
     def test_bgp_09_distance_and_flowspec(self):
         distance_external = '25'
         distance_internal = '30'
diff --git a/src/conf_mode/protocols_bgp.py b/src/conf_mode/protocols_bgp.py
index cf553f0e8..66505e58d 100755
--- a/src/conf_mode/protocols_bgp.py
+++ b/src/conf_mode/protocols_bgp.py
@@ -484,26 +484,15 @@ def generate(bgp):
     if not bgp or 'deleted' in bgp:
         return None
 
-    bgp['protocol'] = 'bgp' # required for frr/vrf.route-map.frr.j2
-    bgp['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', bgp)
     bgp['frr_bgpd_config']  = render_to_string('frr/bgpd.frr.j2', bgp)
-
     return None
 
 def apply(bgp):
     bgp_daemon = 'bgpd'
-    zebra_daemon = 'zebra'
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
 
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section(r'(\s+)?ip protocol bgp route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    if 'frr_zebra_config' in bgp:
-        frr_cfg.add_before(frr.default_add_before, bgp['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
-
     # Generate empty helper string which can be ammended to FRR commands, it
     # will be either empty (default VRF) or contain the "vrf <name" statement
     vrf = ''
diff --git a/src/conf_mode/protocols_eigrp.py b/src/conf_mode/protocols_eigrp.py
index 6e75e34ff..609b39065 100755
--- a/src/conf_mode/protocols_eigrp.py
+++ b/src/conf_mode/protocols_eigrp.py
@@ -78,24 +78,14 @@ def generate(eigrp):
     if not eigrp or 'deleted' in eigrp:
         return None
 
-    eigrp['protocol'] = 'eigrp' # required for frr/vrf.route-map.frr.j2
-    eigrp['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', eigrp)
     eigrp['frr_eigrpd_config']  = render_to_string('frr/eigrpd.frr.j2', eigrp)
 
 def apply(eigrp):
     eigrp_daemon = 'eigrpd'
-    zebra_daemon = 'zebra'
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
 
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section(r'(\s+)?ip protocol eigrp route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    if 'frr_zebra_config' in eigrp:
-        frr_cfg.add_before(frr.default_add_before, eigrp['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
-
     # Generate empty helper string which can be ammended to FRR commands, it
     # will be either empty (default VRF) or contain the "vrf <name" statement
     vrf = ''
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index cb8ea3be4..af2937db8 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -203,7 +203,7 @@ def verify(isis):
         if list(set(global_range) & set(local_range)):
             raise ConfigError(f'Segment-Routing Global Block ({g_low_label_value}/{g_high_label_value}) '\
                               f'conflicts with Local Block ({l_low_label_value}/{l_high_label_value})!')
-        
+
     # Check for a blank or invalid value per prefix
     if dict_search('segment_routing.prefix', isis):
         for prefix, prefix_config in isis['segment_routing']['prefix'].items():
@@ -218,7 +218,7 @@ def verify(isis):
     if dict_search('segment_routing.prefix', isis):
         for prefix, prefix_config in isis['segment_routing']['prefix'].items():
             if 'absolute' in prefix_config:
-                if ("explicit_null" in prefix_config['absolute']) and ("no_php_flag" in prefix_config['absolute']): 
+                if ("explicit_null" in prefix_config['absolute']) and ("no_php_flag" in prefix_config['absolute']):
                     raise ConfigError(f'Segment routing prefix {prefix} cannot have both explicit-null '\
                                       f'and no-php-flag configured at the same time.')
             elif 'index' in prefix_config:
@@ -232,25 +232,15 @@ def generate(isis):
     if not isis or 'deleted' in isis:
         return None
 
-    isis['protocol'] = 'isis' # required for frr/vrf.route-map.frr.j2
-    isis['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', isis)
     isis['frr_isisd_config'] = render_to_string('frr/isisd.frr.j2', isis)
     return None
 
 def apply(isis):
     isis_daemon = 'isisd'
-    zebra_daemon = 'zebra'
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
 
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section('(\s+)?ip protocol isis route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    if 'frr_zebra_config' in isis:
-        frr_cfg.add_before(frr.default_add_before, isis['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
-
     # Generate empty helper string which can be ammended to FRR commands, it
     # will be either empty (default VRF) or contain the "vrf <name" statement
     vrf = ''
diff --git a/src/conf_mode/protocols_ospf.py b/src/conf_mode/protocols_ospf.py
index eb64afa0c..fbb876123 100755
--- a/src/conf_mode/protocols_ospf.py
+++ b/src/conf_mode/protocols_ospf.py
@@ -256,25 +256,15 @@ def generate(ospf):
     if not ospf or 'deleted' in ospf:
         return None
 
-    ospf['protocol'] = 'ospf' # required for frr/vrf.route-map.frr.j2
-    ospf['frr_zebra_config'] = render_to_string('frr/vrf.route-map.frr.j2', ospf)
     ospf['frr_ospfd_config'] = render_to_string('frr/ospfd.frr.j2', ospf)
     return None
 
 def apply(ospf):
     ospf_daemon = 'ospfd'
-    zebra_daemon = 'zebra'
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
 
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section('(\s+)?ip protocol ospf route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    if 'frr_zebra_config' in ospf:
-        frr_cfg.add_before(frr.default_add_before, ospf['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
-
     # Generate empty helper string which can be ammended to FRR commands, it
     # will be either empty (default VRF) or contain the "vrf <name" statement
     vrf = ''
@@ -292,6 +282,7 @@ def apply(ospf):
 
     if 'frr_ospfd_config' in ospf:
         frr_cfg.add_before(frr.default_add_before, ospf['frr_ospfd_config'])
+
     frr_cfg.commit_configuration(ospf_daemon)
 
     return None
diff --git a/src/conf_mode/protocols_ospfv3.py b/src/conf_mode/protocols_ospfv3.py
index 1e2c02d03..ee1fdd399 100755
--- a/src/conf_mode/protocols_ospfv3.py
+++ b/src/conf_mode/protocols_ospfv3.py
@@ -146,25 +146,15 @@ def generate(ospfv3):
     if not ospfv3 or 'deleted' in ospfv3:
         return None
 
-    ospfv3['protocol'] = 'ospf6' # required for frr/vrf.route-map.v6.frr.j2
-    ospfv3['frr_zebra_config'] = render_to_string('frr/vrf.route-map.v6.frr.j2', ospfv3)
     ospfv3['new_frr_config'] = render_to_string('frr/ospf6d.frr.j2', ospfv3)
     return None
 
 def apply(ospfv3):
     ospf6_daemon = 'ospf6d'
-    zebra_daemon = 'zebra'
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
 
-    # The route-map used for the FIB (zebra) is part of the zebra daemon
-    frr_cfg.load_configuration(zebra_daemon)
-    frr_cfg.modify_section('(\s+)?ipv6 protocol ospf6 route-map [-a-zA-Z0-9.]+', stop_pattern='(\s|!)')
-    if 'frr_zebra_config' in ospfv3:
-        frr_cfg.add_before(frr.default_add_before, ospfv3['frr_zebra_config'])
-    frr_cfg.commit_configuration(zebra_daemon)
-
     # Generate empty helper string which can be ammended to FRR commands, it
     # will be either empty (default VRF) or contain the "vrf <name" statement
     vrf = ''
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 3eabf24bc..5122f60b2 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -108,6 +108,7 @@ def apply(static):
 
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
+    frr_cfg.load_configuration(static_daemon)
 
     if 'vrf' in static:
         vrf = static['vrf']
-- 
cgit v1.2.3