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>

diff --git a/isisd/isis_nb.c b/isisd/isis_nb.c
index 8e976d9bc8f99b84393816e0fc230b49ed0fc1e3..f1f183cc5953025cfa98058197ff0a609ea0f95b 100644 (file)
--- 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,
                        }
                },
                {

diff --git a/isisd/isis_nb.h b/isisd/isis_nb.h
index 58f6c3892628ec379d13beda7ed05e247e7422b1..36dbc2d619e3e6a0d7b948b0709495be2aeb2d48 100644 (file)
--- a/isisd/isis_nb.h
+++ b/isisd/isis_nb.h
@@ -238,45 +238,52 @@ int lib_interface_isis_multi_topology_ipv6_management_modify(
        struct nb_cb_modify_args *args);
 int lib_interface_isis_multi_topology_ipv6_dstsrc_modify(
        struct nb_cb_modify_args *args);
-const void *lib_interface_isis_adjacencies_adjacency_get_next(
+struct yang_data *
+lib_interface_state_isis_get_elem(struct nb_cb_get_elem_args *args);
+const void *lib_interface_state_isis_adjacencies_adjacency_get_next(
        struct nb_cb_get_next_args *args);
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem(
+struct yang_data *
+lib_interface_state_isis_adjacencies_adjacency_hold_timer_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_priority_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_adjacencies_adjacency_state_get_elem(
+struct yang_data *lib_interface_state_isis_adjacencies_adjacency_state_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_event_counters_adjacency_changes_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_changes_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_event_counters_adjacency_number_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_number_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_event_counters_init_fails_get_elem(
+struct yang_data *lib_interface_state_isis_event_counters_init_fails_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_event_counters_adjacency_rejects_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_rejects_get_elem(
        struct nb_cb_get_elem_args *args);
-struct yang_data *lib_interface_isis_event_counters_id_len_mismatch_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_id_len_mismatch_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem(
+lib_interface_state_isis_event_counters_max_area_addresses_mismatch_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_event_counters_authentication_type_fails_get_elem(
+lib_interface_state_isis_event_counters_authentication_type_fails_get_elem(
        struct nb_cb_get_elem_args *args);
 struct yang_data *
-lib_interface_isis_event_counters_authentication_fails_get_elem(
+lib_interface_state_isis_event_counters_authentication_fails_get_elem(
        struct nb_cb_get_elem_args *args);
 
 /* Optional 'pre_validate' callbacks. */

diff --git a/isisd/isis_nb_state.c b/isisd/isis_nb_state.c
index 1a10b8a8cf6600943d50dfe1a2a889398065dcb0..4e325ed8da087139bb352536cf425e7a27d95ad8 100644 (file)
--- a/isisd/isis_nb_state.c
+++ b/isisd/isis_nb_state.c
@@ -29,9 +29,30 @@
 #include "isisd/isis_misc.h"
 
 /*
- * XPath: /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency
+ * XPath: /frr-interface:lib/interface/state/frr-isisd:isis
  */
-const void *lib_interface_isis_adjacencies_adjacency_get_next(
+struct yang_data *
+lib_interface_state_isis_get_elem(struct nb_cb_get_elem_args *args)
+{
+       struct interface *ifp;
+       struct isis_circuit *circuit;
+
+       ifp = (struct interface *)args->list_entry;
+       if (!ifp)
+               return NULL;
+
+       circuit = circuit_scan_by_ifp(ifp);
+       if (!circuit || !circuit->area)
+               return NULL;
+
+       return yang_data_new(args->xpath, NULL);
+}
+
+/*
+ * XPath:
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency
+ */
+const void *lib_interface_state_isis_adjacencies_adjacency_get_next(
        struct nb_cb_get_next_args *args)
 {
        struct interface *ifp;
@@ -104,10 +125,10 @@ const void *lib_interface_isis_adjacencies_adjacency_get_next(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sys-type
  */
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -117,10 +138,10 @@ lib_interface_isis_adjacencies_adjacency_neighbor_sys_type_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-sysid
  */
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -130,10 +151,10 @@ lib_interface_isis_adjacencies_adjacency_neighbor_sysid_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-extended-circuit-id
  */
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -143,10 +164,10 @@ lib_interface_isis_adjacencies_adjacency_neighbor_extended_circuit_id_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-snpa
  */
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -156,9 +177,10 @@ lib_interface_isis_adjacencies_adjacency_neighbor_snpa_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/hold-timer
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/hold-timer
  */
-struct yang_data *lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem(
+struct yang_data *
+lib_interface_state_isis_adjacencies_adjacency_hold_timer_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -168,10 +190,10 @@ struct yang_data *lib_interface_isis_adjacencies_adjacency_hold_timer_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/neighbor-priority
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/neighbor-priority
  */
 struct yang_data *
-lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem(
+lib_interface_state_isis_adjacencies_adjacency_neighbor_priority_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -181,9 +203,9 @@ lib_interface_isis_adjacencies_adjacency_neighbor_priority_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/adjacencies/adjacency/state
+ * /frr-interface:lib/interface/state/frr-isisd:isis/adjacencies/adjacency/state
  */
-struct yang_data *lib_interface_isis_adjacencies_adjacency_state_get_elem(
+struct yang_data *lib_interface_state_isis_adjacencies_adjacency_state_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        const struct isis_adjacency *adj = args->list_entry;
@@ -194,9 +216,10 @@ struct yang_data *lib_interface_isis_adjacencies_adjacency_state_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-changes
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-changes
  */
-struct yang_data *lib_interface_isis_event_counters_adjacency_changes_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_changes_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -215,9 +238,10 @@ struct yang_data *lib_interface_isis_event_counters_adjacency_changes_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-number
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-number
  */
-struct yang_data *lib_interface_isis_event_counters_adjacency_number_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_number_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -259,9 +283,10 @@ struct yang_data *lib_interface_isis_event_counters_adjacency_number_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/init-fails
  */
-struct yang_data *lib_interface_isis_event_counters_init_fails_get_elem(
+struct yang_data *lib_interface_state_isis_event_counters_init_fails_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -280,9 +305,10 @@ struct yang_data *lib_interface_isis_event_counters_init_fails_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/adjacency-rejects
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/adjacency-rejects
  */
-struct yang_data *lib_interface_isis_event_counters_adjacency_rejects_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_adjacency_rejects_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -301,9 +327,10 @@ struct yang_data *lib_interface_isis_event_counters_adjacency_rejects_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/id-len-mismatch
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/id-len-mismatch
  */
-struct yang_data *lib_interface_isis_event_counters_id_len_mismatch_get_elem(
+struct yang_data *
+lib_interface_state_isis_event_counters_id_len_mismatch_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -322,10 +349,10 @@ struct yang_data *lib_interface_isis_event_counters_id_len_mismatch_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/max-area-addresses-mismatch
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/max-area-addresses-mismatch
  */
 struct yang_data *
-lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem(
+lib_interface_state_isis_event_counters_max_area_addresses_mismatch_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -345,10 +372,10 @@ lib_interface_isis_event_counters_max_area_addresses_mismatch_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-type-fails
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-type-fails
  */
 struct yang_data *
-lib_interface_isis_event_counters_authentication_type_fails_get_elem(
+lib_interface_state_isis_event_counters_authentication_type_fails_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;
@@ -367,10 +394,10 @@ lib_interface_isis_event_counters_authentication_type_fails_get_elem(
 
 /*
  * XPath:
- * /frr-interface:lib/interface/frr-isisd:isis/event-counters/authentication-fails
+ * /frr-interface:lib/interface/state/frr-isisd:isis/event-counters/authentication-fails
  */
 struct yang_data *
-lib_interface_isis_event_counters_authentication_fails_get_elem(
+lib_interface_state_isis_event_counters_authentication_fails_get_elem(
        struct nb_cb_get_elem_args *args)
 {
        struct interface *ifp;

diff --git a/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
index ce2d356f235d65c9d81ff87d872559e4c265002e..69dcc91b1d622ae84586548e512a7799ebd1c8bd 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,26 +4,28 @@
       {
         "name": "eth-sw1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                },
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step2/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step3/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step4/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index ce2d356f235d65c9d81ff87d872559e4c265002e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt1/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
index 1e65fbff582e68e709572a9434be693c202a7f2e..be018fd59fb85dd579f03d0496f24baf7795cd7a 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,62 +4,68 @@
       {
         "name": "eth-rt4-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0004",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt4-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0004",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-sw1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                },
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0001",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step2/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step3/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step4/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 1e65fbff582e68e709572a9434be693c202a7f2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt4-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt2/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
index 9c8a4056c0317a54c5398234d33dca7263927e2e..82069cec4800e05140eac8ec2f1db26162b150b9 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,62 +4,68 @@
       {
         "name": "eth-rt5-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0005",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt5-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0005",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-sw1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0001",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                },
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 2,
+                  "hold-timer": 9,
+                  "neighbor-priority": 64,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step2/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step3/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step4/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 9c8a4056c0317a54c5398234d33dca7263927e2e..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt5-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-sw1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0001",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              },
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 2,
-                "hold-timer": 9,
-                "neighbor-priority": 64,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt3/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
index 5889349cd835165c7e2a74e0712174bf82ed4cdb..9d7a19e86833a7359bbbd063214daacb8aedd2dc 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,72 +4,80 @@
       {
         "name": "eth-rt2-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt2-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt5",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0005",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt6",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0006",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..5fb8a361ac485a7909ae8cb60d92e067aaf0e58b 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt4/step2/show_yang_interface_isis_adjacencies.ref
@@ -4,54 +4,60 @@
       {
         "name": "eth-rt2-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt2-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt6",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0006",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
index f7327f0517c8d528231fe1fde16a236a686d60b1..2a56f54e1613f8a1b6a47821345bb0ff1bb752db 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt4/step3/show_yang_interface_isis_adjacencies.ref
@@ -4,36 +4,40 @@
       {
         "name": "eth-rt2-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt2-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0002",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step4/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index d2fad659bd8bd0aee5c91317ce71aef308cd4b6d..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt2-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt2-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0002",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..761cb2fd2fc99268e44f24f6b3cff4e915c2d3ce
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt4/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step2/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
index 0342069fe36da0b566ed149ed75bc1c6ad1312a0..4a3e626123049cfccb8622e76a6c5acf1fd8230b 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,72 +4,80 @@
       {
         "name": "eth-rt3-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt3-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt4",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0004",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt6",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0006",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..ae26b5be99bef9c16cffe9b0f9564f6f41a7bb9c 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt5/step2/show_yang_interface_isis_adjacencies.ref
@@ -4,54 +4,60 @@
       {
         "name": "eth-rt3-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt3-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt6",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0006",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
index 0466f315c18b35ba6faa3c29d7e09be4ac127fcd..7e62a65ea116c68a286280a04f45b905fe28e0cb 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt5/step3/show_yang_interface_isis_adjacencies.ref
@@ -4,36 +4,40 @@
       {
         "name": "eth-rt3-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt3-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..ae26b5be99bef9c16cffe9b0f9564f6f41a7bb9c 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt5/step4/show_yang_interface_isis_adjacencies.ref
@@ -4,54 +4,60 @@
       {
         "name": "eth-rt3-1",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt3-2",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0003",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt6",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0006",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 3518cc13e1c221a3bde5d8039d8adf82ae673e17..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt3-1",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt3-2",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0003",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt6",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0006",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..7cdaabf53f3cd617a73489395f012187440d8b0c
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt5/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step4/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..49c40a471c6770550e0f75da6632a13924d613d8 100644 (file)
--- a/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
+++ b/tests/topotests/isis-sr-topo1/rt6/step1/show_yang_interface_isis_adjacencies.ref
@@ -4,36 +4,40 @@
       {
         "name": "eth-rt4",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0004",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       },
       {
         "name": "eth-rt5",
         "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
+        "state": {
+          "frr-isisd:isis": {
+            "adjacencies": {
+              "adjacency": [
+                {
+                  "neighbor-sys-type": "level-1",
+                  "neighbor-sysid": "0000.0000.0005",
+                  "neighbor-extended-circuit-id": 0,
+                  "hold-timer": 9,
+                  "neighbor-priority": 0,
+                  "state": "up"
+                }
+              ]
+            }
           }
         }
       }

diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step10/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step2/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step4/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step5/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step6/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step7/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step8/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
deleted file mode 100644 (file)
index 89ce0f65a847abface50eb17b9117dccabc0fcc0..0000000000000000000000000000000000000000
--- a/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "frr-interface:lib": {
-    "interface": [
-      {
-        "name": "eth-rt4",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0004",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "eth-rt5",
-        "vrf": "default",
-        "frr-isisd:isis": {
-          "adjacencies": {
-            "adjacency": [
-              {
-                "neighbor-sys-type": "level-1",
-                "neighbor-sysid": "0000.0000.0005",
-                "neighbor-extended-circuit-id": 0,
-                "hold-timer": 9,
-                "neighbor-priority": 0,
-                "state": "up"
-              }
-            ]
-          }
-        }
-      }
-    ]
-  }
-}

diff --git a/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..0879b84d23cb1c63558d36b00e5a65ee8392cd34
--- /dev/null
+++ b/tests/topotests/isis-sr-topo1/rt6/step9/show_yang_interface_isis_adjacencies.ref
@@ -0,0 +1 @@
+../step1/show_yang_interface_isis_adjacencies.ref
\ No newline at end of file

diff --git a/yang/frr-isisd.yang b/yang/frr-isisd.yang
index 5882f0522ffe3e76c6f883397a5c22fc4114dc2a..445a59bc8a3b6f89e1566c81653d844094447892 100644 (file)
--- a/yang/frr-isisd.yang
+++ b/yang/frr-isisd.yang
@@ -1298,6 +1298,16 @@ module frr-isisd {
       description
         "IS-IS interface parameters.";
       uses interface-config;
+    }
+  }
+
+  augment "/frr-interface:lib/frr-interface:interface/frr-interface:state" {
+    description
+      "Extends interface model with IS-IS operational data.";
+    container isis {
+      presence "Present if an IS-IS circuit is defined for this interface.";
+      description
+        "IS-IS interface operational data.";
 
       uses interface-state;
     }