Skip to content

Commit edb2c56

Browse files
donaldsharpdonaldsharp
authored
Merge pull request FRRouting#6425 from opensourcerouting/nb-state-cbs-fixes
northbound state callbacks fixes
2 parents e6af96d + 2717192 commit edb2c56

File tree

66 files changed

+712
-3103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+712
-3103
lines changed

‎isisd/isis_nb.c

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -763,99 +763,105 @@ const struct frr_yang_module_info frr_isisd_info = {
763763
},
764764
},
765765
{
766-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency",
766+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis",
767767
.cbs = {
768-
.get_next = lib_interface_isis_adjacencies_adjacency_get_next,
768+
.get_elem = lib_interface_state_isis_get_elem,
769769
}
770770
},
771771
{
772-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type",
772+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency",
773773
.cbs = {
774-
.get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem,
774+
.get_next = lib_interface_state_isis_adjacencies_adjacency_get_next,
775775
}
776776
},
777777
{
778-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid",
778+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type",
779779
.cbs = {
780-
.get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem,
780+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_sys_type_get_elem,
781781
}
782782
},
783783
{
784-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id",
784+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid",
785785
.cbs = {
786-
.get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem,
786+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_sysid_get_elem,
787787
}
788788
},
789789
{
790-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa",
790+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id",
791791
.cbs = {
792-
.get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem,
792+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem,
793793
}
794794
},
795795
{
796-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/hold-timer",
796+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa",
797797
.cbs = {
798-
.get_elem = lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem,
798+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_snpa_get_elem,
799799
}
800800
},
801801
{
802-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-priority",
802+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/hold-timer",
803803
.cbs = {
804-
.get_elem = lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem,
804+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_hold_timer_get_elem,
805805
}
806806
},
807807
{
808-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/state",
808+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-priority",
809809
.cbs = {
810-
.get_elem = lib_interface_isis_adjacencies_adjacency_state_get_elem,
810+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_neighbor_priority_get_elem,
811811
}
812812
},
813813
{
814-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-changes",
814+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/state",
815815
.cbs = {
816-
.get_elem = lib_interface_isis_event_counters_adjacency_changes_get_elem,
816+
.get_elem = lib_interface_state_isis_adjacencies_adjacency_state_get_elem,
817817
}
818818
},
819819
{
820-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-number",
820+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-changes",
821821
.cbs = {
822-
.get_elem = lib_interface_isis_event_counters_adjacency_number_get_elem,
822+
.get_elem = lib_interface_state_isis_event_counters_adjacency_changes_get_elem,
823823
}
824824
},
825825
{
826-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/init-fails",
826+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-number",
827827
.cbs = {
828-
.get_elem = lib_interface_isis_event_counters_init_fails_get_elem,
828+
.get_elem = lib_interface_state_isis_event_counters_adjacency_number_get_elem,
829829
}
830830
},
831831
{
832-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-rejects",
832+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/init-fails",
833833
.cbs = {
834-
.get_elem = lib_interface_isis_event_counters_adjacency_rejects_get_elem,
834+
.get_elem = lib_interface_state_isis_event_counters_init_fails_get_elem,
835835
}
836836
},
837837
{
838-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/id-len-mismatch",
838+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-rejects",
839839
.cbs = {
840-
.get_elem = lib_interface_isis_event_counters_id_len_mismatch_get_elem,
840+
.get_elem = lib_interface_state_isis_event_counters_adjacency_rejects_get_elem,
841841
}
842842
},
843843
{
844-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/max-area-addresses-mismatch",
844+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/id-len-mismatch",
845845
.cbs = {
846-
.get_elem = lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem,
846+
.get_elem = lib_interface_state_isis_event_counters_id_len_mismatch_get_elem,
847847
}
848848
},
849849
{
850-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-type-fails",
850+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/max-area-addresses-mismatch",
851851
.cbs = {
852-
.get_elem = lib_interface_isis_event_counters_authentication_type_fails_get_elem,
852+
.get_elem = lib_interface_state_isis_event_counters_max_area_addresses_mismatch_get_elem,
853853
}
854854
},
855855
{
856-
.xpath = "/frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-fails",
856+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-type-fails",
857857
.cbs = {
858-
.get_elem = lib_interface_isis_event_counters_authentication_fails_get_elem,
858+
.get_elem = lib_interface_state_isis_event_counters_authentication_type_fails_get_elem,
859+
}
860+
},
861+
{
862+
.xpath = "/frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-fails",
863+
.cbs = {
864+
.get_elem = lib_interface_state_isis_event_counters_authentication_fails_get_elem,
859865
}
860866
},
861867
{

‎isisd/isis_nb.h

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -238,45 +238,52 @@ int lib_interface_isis_multi_topology_ipv6_management_modify(
238238
struct nb_cb_modify_args *args);
239239
int lib_interface_isis_multi_topology_ipv6_dstsrc_modify(
240240
struct nb_cb_modify_args *args);
241-
const void *lib_interface_isis_adjacencies_adjacency_get_next(
241+
struct yang_data *
242+
lib_interface_state_isis_get_elem(struct nb_cb_get_elem_args *args);
243+
const void *lib_interface_state_isis_adjacencies_adjacency_get_next(
242244
struct nb_cb_get_next_args *args);
243245
struct yang_data *
244-
lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
246+
lib_interface_state_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
245247
struct nb_cb_get_elem_args *args);
246248
struct yang_data *
247-
lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
249+
lib_interface_state_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
248250
struct nb_cb_get_elem_args *args);
249251
struct yang_data *
250-
lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
252+
lib_interface_state_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
251253
struct nb_cb_get_elem_args *args);
252254
struct yang_data *
253-
lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
255+
lib_interface_state_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
254256
struct nb_cb_get_elem_args *args);
255-
struct yang_data *lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem(
257+
struct yang_data *
258+
lib_interface_state_isis_adjacencies_adjacency_hold_timer_get_elem(
256259
struct nb_cb_get_elem_args *args);
257260
struct yang_data *
258-
lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem(
261+
lib_interface_state_isis_adjacencies_adjacency_neighbor_priority_get_elem(
259262
struct nb_cb_get_elem_args *args);
260-
struct yang_data *lib_interface_isis_adjacencies_adjacency_state_get_elem(
263+
struct yang_data *lib_interface_state_isis_adjacencies_adjacency_state_get_elem(
261264
struct nb_cb_get_elem_args *args);
262-
struct yang_data *lib_interface_isis_event_counters_adjacency_changes_get_elem(
265+
struct yang_data *
266+
lib_interface_state_isis_event_counters_adjacency_changes_get_elem(
263267
struct nb_cb_get_elem_args *args);
264-
struct yang_data *lib_interface_isis_event_counters_adjacency_number_get_elem(
268+
struct yang_data *
269+
lib_interface_state_isis_event_counters_adjacency_number_get_elem(
265270
struct nb_cb_get_elem_args *args);
266-
struct yang_data *lib_interface_isis_event_counters_init_fails_get_elem(
271+
struct yang_data *lib_interface_state_isis_event_counters_init_fails_get_elem(
267272
struct nb_cb_get_elem_args *args);
268-
struct yang_data *lib_interface_isis_event_counters_adjacency_rejects_get_elem(
273+
struct yang_data *
274+
lib_interface_state_isis_event_counters_adjacency_rejects_get_elem(
269275
struct nb_cb_get_elem_args *args);
270-
struct yang_data *lib_interface_isis_event_counters_id_len_mismatch_get_elem(
276+
struct yang_data *
277+
lib_interface_state_isis_event_counters_id_len_mismatch_get_elem(
271278
struct nb_cb_get_elem_args *args);
272279
struct yang_data *
273-
lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem(
280+
lib_interface_state_isis_event_counters_max_area_addresses_mismatch_get_elem(
274281
struct nb_cb_get_elem_args *args);
275282
struct yang_data *
276-
lib_interface_isis_event_counters_authentication_type_fails_get_elem(
283+
lib_interface_state_isis_event_counters_authentication_type_fails_get_elem(
277284
struct nb_cb_get_elem_args *args);
278285
struct yang_data *
279-
lib_interface_isis_event_counters_authentication_fails_get_elem(
286+
lib_interface_state_isis_event_counters_authentication_fails_get_elem(
280287
struct nb_cb_get_elem_args *args);
281288

282289
/* Optional 'pre_validate' callbacks. */

0 commit comments

Comments
 (0)