Merge pull request #998 from sever-sever/T7639

T7639: Add patches to fix FRR reload for IS-IS segment routing

Author: c-po

scripts/package-build/frr/patches/frr/0004-tools-Add-missing-keyword-segment-routing-srv6-in-fr.patch

@@ -0,0 +1,39 @@
+From b4babae93b81be46c105e59c74b1708f00b68704 Mon Sep 17 00:00:00 2001
+From: Carmine Scarpitta <cscarpit@cisco.com>
+Date: Sat, 23 Nov 2024 08:46:00 +0100
+Subject: [PATCH 4/5] tools: Add missing keyword `segment-routing srv6` in
+ frr-reload
+
+Fix the error below:
+
+```
+[58564|mgmtd] sending configuration
+[58565|zebra] sending configuration,
+line 10: % Unknown command[52]:  node-msd
+[58573|isisd] sending configuration
+[58565|zebra] Configuration file[/etc/frr/frr.conf] processing failure: 2
+```
+
+Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
+---
+ tools/frr-reload.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/frr-reload.py b/tools/frr-reload.py
+index 08a1f1e07e..baa6285f45 100755
+--- a/tools/frr-reload.py
++++ b/tools/frr-reload.py
+@@ -255,7 +255,9 @@ ctx_keywords = {
+     },
+     "router rip": {},
+     "router ripng": {},
+-    "router isis ": {},
++    "router isis ": {
++        "segment-routing srv6": {},
++    },
+     "router openfabric ": {},
+     "router ospf": {},
+     "router ospf6": {},
+-- 
+2.39.5
+

scripts/package-build/frr/patches/frr/0005-tools-Add-missing-keyword-node-msd-in-frr-reload.patch

@@ -0,0 +1,41 @@
+From 458e8a851608b8308b564e6cbfe95314629dccda Mon Sep 17 00:00:00 2001
+From: Carmine Scarpitta <cscarpit@cisco.com>
+Date: Sat, 23 Nov 2024 08:46:50 +0100
+Subject: [PATCH 5/5] tools: Add missing keyword `node-msd` in frr-reload
+
+Fix the error below:
+
+```
+[58564|mgmtd] sending configuration
+[58565|zebra] sending configuration,
+line 14: % Unknown command[52]:  max-segs-left 3
+line 18: % Unknown command[52]:  max-end-pop 3
+line 22: % Unknown command[52]:  max-h-encaps 2
+line 26: % Unknown command[52]:  max-end-d 5
+[58573|isisd] sending configuration
+[58565|zebra] Configuration file[/etc/frr/frr.conf] processing failure: 2
+```
+
+Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
+---
+ tools/frr-reload.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/frr-reload.py b/tools/frr-reload.py
+index baa6285f45..33d6cf0444 100755
+--- a/tools/frr-reload.py
++++ b/tools/frr-reload.py
+@@ -256,7 +256,9 @@ ctx_keywords = {
+     "router rip": {},
+     "router ripng": {},
+     "router isis ": {
+-        "segment-routing srv6": {},
++        "segment-routing srv6": {
++            "node-msd": {},
++        },
+     },
+     "router openfabric ": {},
+     "router ospf": {},
+-- 
+2.39.5
+