Skip to content

Commit

Permalink
tools: Add missing formats keyword to segment-routing in frr-reload
Browse files Browse the repository at this point in the history
When reloading the following configuration:
```
segment-routing
 srv6
  formats
   format usid-f3216
     wide-local-id-block explicit start 100
   exit
   !
   format uncompressed-f4024
   exit
   !
  exit
  !
 exit
 !
exit
```
frr-reload.py does not properly enter the `formats` context. Because of this,
it fails with an unknown command error when applying new or updating format
configuration.

Signed-off-by: Jonathan Voss <jvoss@onvox.net>
(cherry picked from commit 5b8b821)

# Conflicts:
#	tools/frr-reload.py
  • Loading branch information
jvoss authored and mergify[bot] committed Dec 31, 2024
1 parent 5f0beaa commit 74723a0
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions tools/frr-reload.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,15 @@ def get_normalized_interface_vrf(line):
"policy ": {"candidate-path ": {}},
"pcep": {"pcc": {}, "pce ": {}, "pce-config ": {}},
},
<<<<<<< HEAD
"srv6": {"locators": {"locator ": {}}},
=======
"srv6": {
"locators": {"locator ": {}},
"encapsulation": {},
"formats": {"format": {}},
},
>>>>>>> 5b8b821f2 (tools: Add missing formats keyword to segment-routing in frr-reload)
},
"nexthop-group ": {},
"route-map ": {},
Expand Down

0 comments on commit 74723a0

Please sign in to comment.