diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2020-05-19 06:19:14 +0200 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2020-05-16 04:47:43 +0200 |
| commit | 27171928534c109f36c3d79211f5e3964e90b649 (patch) | |
| tree | b676d18aad194e5278831fd108bfe373fa15c051 /isisd/isis_nb.c | |
| parent | zebra: optimize the RIB get_next() callback (diff) | |
| download | frr-27171928534c109f36c3d79211f5e3964e90b649.tar.xz frr-27171928534c109f36c3d79211f5e3964e90b649.zip | |
isisd, yang: move IS-IS interface state data to the appropriate place
Now that the "frr-interface" list has a "state" container, move the
IS-IS interface state nodes underneath it using a new augmentation.
Also, update the IS-IS SR topotest to account for this change. Make
use of symlinks where possible to avoid having multiple files with
the same content.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'isisd/isis_nb.c')
| -rw-r--r-- | isisd/isis_nb.c | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/isisd/isis_nb.c b/isisd/isis_nb.c index 8e976d9bc..f1f183cc5 100644 --- a/isisd/isis_nb.c +++ b/isisd/isis_nb.c @@ -763,99 +763,105 @@ const struct frr_yang_module_info frr_isisd_info = { }, }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis", .cbs = { - .get_next = lib_interface_isis_adjacencies_adjacency_get_next, + .get_elem = lib_interface_state_isis_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem, + .get_next = lib_interface_state_isis_adjacencies_adjacency_get_next, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_sys_type_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_sysid_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/hold-timer", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_snpa_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-priority", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/hold-timer", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_hold_timer_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/state", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-priority", .cbs = { - .get_elem = lib_interface_isis_adjacencies_adjacency_state_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_priority_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-changes", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/state", .cbs = { - .get_elem = lib_interface_isis_event_counters_adjacency_changes_get_elem, + .get_elem = lib_interface_state_isis_adjacencies_adjacency_state_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-number", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-changes", .cbs = { - .get_elem = lib_interface_isis_event_counters_adjacency_number_get_elem, + .get_elem = lib_interface_state_isis_event_counters_adjacency_changes_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/init-fails", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-number", .cbs = { - .get_elem = lib_interface_isis_event_counters_init_fails_get_elem, + .get_elem = lib_interface_state_isis_event_counters_adjacency_number_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-rejects", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/init-fails", .cbs = { - .get_elem = lib_interface_isis_event_counters_adjacency_rejects_get_elem, + .get_elem = lib_interface_state_isis_event_counters_init_fails_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/id-len-mismatch", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-rejects", .cbs = { - .get_elem = lib_interface_isis_event_counters_id_len_mismatch_get_elem, + .get_elem = lib_interface_state_isis_event_counters_adjacency_rejects_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/max-area-addresses-mismatch", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/id-len-mismatch", .cbs = { - .get_elem = lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem, + .get_elem = lib_interface_state_isis_event_counters_id_len_mismatch_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-type-fails", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/max-area-addresses-mismatch", .cbs = { - .get_elem = lib_interface_isis_event_counters_authentication_type_fails_get_elem, + .get_elem = lib_interface_state_isis_event_counters_max_area_addresses_mismatch_get_elem, } }, { - .xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-fails", + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-type-fails", .cbs = { - .get_elem = lib_interface_isis_event_counters_authentication_fails_get_elem, + .get_elem = lib_interface_state_isis_event_counters_authentication_type_fails_get_elem, + } + }, + { + .xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-fails", + .cbs = { + .get_elem = lib_interface_state_isis_event_counters_authentication_fails_get_elem, } }, { |