diff options
| author | Christian Franke <chris@opensourcerouting.org> | 2018-03-22 14:58:53 +0100 |
|---|---|---|
| committer | Christian Franke <chris@opensourcerouting.org> | 2018-09-05 11:38:13 +0200 |
| commit | 65f18157115a1c95653551b6e0d8423bdbf8c906 (patch) | |
| tree | 1adb1e1e909baad05942c67086776c00ba3dc816 /isisd/isis_circuit.c | |
| parent | isisd: Fix error output for 'no ip router isis' command (diff) | |
| download | frr-65f18157115a1c95653551b6e0d8423bdbf8c906.tar.xz frr-65f18157115a1c95653551b6e0d8423bdbf8c906.zip | |
fabricd: adjust IS-IS defaults as per draft
OpenFabric specifies that it should always be run with wide metrics via
P2P links and only as Level-2. Implement this as default and remove all
the knobs from fabricd which allow other configuration.
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Diffstat (limited to 'isisd/isis_circuit.c')
| -rw-r--r-- | isisd/isis_circuit.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index a18ee19d6..7ecc71023 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -412,7 +412,7 @@ void isis_circuit_if_add(struct isis_circuit *circuit, struct interface *ifp) isis_circuit_if_bind(circuit, ifp); if (if_is_broadcast(ifp)) { - if (circuit->circ_type_config == CIRCUIT_T_P2P) + if (fabricd || circuit->circ_type_config == CIRCUIT_T_P2P) circuit->circ_type = CIRCUIT_T_P2P; else circuit->circ_type = CIRCUIT_T_BROADCAST; @@ -976,14 +976,16 @@ int isis_interface_config_write(struct vty *vty) } /* ISIS - circuit type */ - if (circuit->is_type == IS_LEVEL_1) { - vty_out(vty, " " PROTO_NAME " circuit-type level-1\n"); - write++; - } else { - if (circuit->is_type == IS_LEVEL_2) { - vty_out(vty, - " " PROTO_NAME " circuit-type level-2-only\n"); + if (!fabricd) { + if (circuit->is_type == IS_LEVEL_1) { + vty_out(vty, " " PROTO_NAME " circuit-type level-1\n"); write++; + } else { + if (circuit->is_type == IS_LEVEL_2) { + vty_out(vty, + " " PROTO_NAME " circuit-type level-2-only\n"); + write++; + } } } |