From 7bae85fd670dce0c4708011af7523f1e56c1054a Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Sat, 19 Aug 2023 11:10:26 +0200
Subject: bgp: T5466: rename type on CLI per-nexhop -> per-nexthop for l3vpn
 MPLS labels

This fixes a CLI typo added in commit 77ef9f800 ("T5466: L3VPN label allocation
mode").
---
 data/templates/frr/bgpd.frr.j2                    | 4 ++--
 interface-definitions/include/bgp/afi-label.xml.i | 2 +-
 smoketest/scripts/cli/test_protocols_bgp.py       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/templates/frr/bgpd.frr.j2 b/data/templates/frr/bgpd.frr.j2
index a41f4e280..7fa974254 100644
--- a/data/templates/frr/bgpd.frr.j2
+++ b/data/templates/frr/bgpd.frr.j2
@@ -349,8 +349,8 @@ router bgp {{ system_as }} {{ 'vrf ' ~ vrf if vrf is vyos_defined }}
 {%         if afi_config.label.vpn.export is vyos_defined %}
   label vpn export {{ afi_config.label.vpn.export }}
 {%         endif %}
-{%         if afi_config.label.vpn.allocation_mode.per_nexhop is vyos_defined %}
-  label vpn export allocation-mode per-nexthop 
+{%         if afi_config.label.vpn.allocation_mode.per_nexthop is vyos_defined %}
+  label vpn export allocation-mode per-nexthop
 {%         endif %}
 {%         if afi_config.local_install is vyos_defined %}
 {%             for interface in afi_config.local_install.interface %}
diff --git a/interface-definitions/include/bgp/afi-label.xml.i b/interface-definitions/include/bgp/afi-label.xml.i
index 8d5c33864..2c5eed18b 100644
--- a/interface-definitions/include/bgp/afi-label.xml.i
+++ b/interface-definitions/include/bgp/afi-label.xml.i
@@ -34,7 +34,7 @@
             <help>Label allocation mode</help>
           </properties>
           <children>
-            <leafNode name="per-nexhop">
+            <leafNode name="per-nexthop">
               <properties>
                 <help>Allocate a label per connected next-hop in the VRF</help>
                 <valueless/>
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index b34ab53c2..77952d8d9 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -868,7 +868,7 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
             self.cli_set(base_path + ['address-family', afi, 'export', 'vpn'])
             self.cli_set(base_path + ['address-family', afi, 'import', 'vpn'])
             self.cli_set(base_path + ['address-family', afi, 'label', 'vpn', 'export', label])
-            self.cli_set(base_path + ['address-family', afi, 'label', 'vpn', 'allocation-mode', 'per-nexhop'])
+            self.cli_set(base_path + ['address-family', afi, 'label', 'vpn', 'allocation-mode', 'per-nexthop'])
             self.cli_set(base_path + ['address-family', afi, 'rd', 'vpn', 'export', rd])
             self.cli_set(base_path + ['address-family', afi, 'route-map', 'vpn', 'export', route_map_out])
             self.cli_set(base_path + ['address-family', afi, 'route-map', 'vpn', 'import', route_map_in])
-- 
cgit v1.2.3