]> git.puffer.fish Git - matthieu/frr.git/commitdiff
isisd: fix wrong check for MT commands
authoranlan_cs <anlan_cs@126.com>
Sun, 6 Oct 2024 13:06:15 +0000 (21:06 +0800)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Tue, 8 Oct 2024 05:11:10 +0000 (05:11 +0000)
```
anlan# show run
!
interface eth0
 ip router isis A
exit
!
router isis A
 metric-style narrow <- NOT wide
exit
!
end
anlan (config)# int eth0
anlan (config-if)# no isis topology ipv6-unicast
% Configuration failed.

Error type: validation
Error description: Multi topology IS-IS can only be used with wide metrics
```

The MT commands are mainly controlled by the binded area, not by interface.
Currently if there is any MT configuration in the area, `metric-style` must
be with the `wide` mode, this requirement is sufficient.  So, the
unnecessary/wrong check for MT in the interface should be removed.

Signed-off-by: anlan_cs <anlan_cs@126.com>
(cherry picked from commit 424cec61c0860c74436954a1f8ba6ee7fe8e04a5)

isisd/isis_nb_config.c

index 763b8b73d270ffbc45dca589160c06747930b5c6..e5b9552bd31f63a4fe9b7178fef706807c36d034 100644 (file)
@@ -4300,14 +4300,6 @@ static int lib_interface_isis_multi_topology_common(
 
        switch (event) {
        case NB_EV_VALIDATE:
-               circuit = nb_running_get_entry(dnode, NULL, false);
-               if (circuit && circuit->area && circuit->area->oldmetric) {
-                       snprintf(
-                               errmsg, errmsg_len,
-                               "Multi topology IS-IS can only be used with wide metrics");
-                       return NB_ERR_VALIDATION;
-               }
-               break;
        case NB_EV_PREPARE:
        case NB_EV_ABORT:
                break;