Merge pull request #14111 from opensourcerouting/isisd-tilfa-topotest…

…-fixes tests: improve stability of the IS-IS TI-LFA topotest
FRRouting · Jul 29, 2023 · aba77de · aba77de
2 parents f3a4a85 + 2dd4cad
commit aba77de
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 53 deletions.
diff --git a/isisd/isis_sr.c b/isisd/isis_sr.c
@@ -923,13 +923,14 @@ static int sr_adj_ip_disabled(struct isis_adjacency *adj, int family,
 }
 
 /**
- * Activate local Prefix-SID when loopback interface goes up for IS-IS.
+ * Update the Node-SID flag of the configured Prefix-SID mappings in response
+ * to an address addition or removal event.
  *
- * @param ifp	Loopback Interface
+ * @param ifp	Interface
  *
  * @return	0
  */
-static int sr_if_new_hook(struct interface *ifp)
+int sr_if_addr_update(struct interface *ifp)
 {
 	struct sr_prefix_cfg *pcfgs[SR_ALGORITHM_COUNT] = {NULL};
 	struct isis_circuit *circuit;
@@ -947,13 +948,7 @@ static int sr_if_new_hook(struct interface *ifp)
 	if (!area)
 		return 0;
 
-	/*
-	 * Update the Node-SID flag of the configured Prefix-SID mappings if
-	 * necessary. This needs to be done here since isisd reads the startup
-	 * configuration before receiving interface information from zebra.
-	 */
 	FOR_ALL_INTERFACES_ADDRESSES (ifp, connected, node) {
-
 		for (int i = 0; i < SR_ALGORITHM_COUNT; i++) {
 			pcfgs[i] = isis_sr_cfg_prefix_find(
 				area, connected->address, i);
@@ -1313,7 +1308,6 @@ void isis_sr_init(void)
 	hook_register(isis_adj_state_change_hook, sr_adj_state_change);
 	hook_register(isis_adj_ip_enabled_hook, sr_adj_ip_enabled);
 	hook_register(isis_adj_ip_disabled_hook, sr_adj_ip_disabled);
-	hook_register(isis_if_new_hook, sr_if_new_hook);
 }
 
 /**
@@ -1325,5 +1319,4 @@ void isis_sr_term(void)
 	hook_unregister(isis_adj_state_change_hook, sr_adj_state_change);
 	hook_unregister(isis_adj_ip_enabled_hook, sr_adj_ip_enabled);
 	hook_unregister(isis_adj_ip_disabled_hook, sr_adj_ip_disabled);
-	hook_unregister(isis_if_new_hook, sr_if_new_hook);
 }
diff --git a/isisd/isis_sr.h b/isisd/isis_sr.h
@@ -222,6 +222,7 @@ extern struct sr_adjacency *isis_sr_adj_sid_find(struct isis_adjacency *adj,
 						 int family,
 						 enum sr_adj_type type);
 extern void isis_area_delete_backup_adj_sids(struct isis_area *area, int level);
+extern int sr_if_addr_update(struct interface *ifp);
 extern char *sr_op2str(char *buf, size_t size, mpls_label_t label_in,
 		       mpls_label_t label_out);
 extern int isis_sr_start(struct isis_area *area);

diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
@@ -98,6 +98,8 @@ static int isis_zebra_if_address_add(ZAPI_CALLBACK_ARGS)
 			isis_circuit_add_addr(circuit, c);
 	}
 
+	sr_if_addr_update(c->ifp);
+
 	return 0;
 }
 
@@ -125,6 +127,8 @@ static int isis_zebra_if_address_del(ZAPI_CALLBACK_ARGS)
 			isis_circuit_del_addr(circuit, c);
 	}
 
+	sr_if_addr_update(c->ifp);
+
 	connected_free(&c);
 
 	return 0;

diff --git a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf
@@ -17,7 +17,7 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis priority 100
  isis fast-reroute ti-lfa
 !

diff --git a/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt1/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,14 +11,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf
@@ -16,23 +16,23 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt2/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf
@@ -16,23 +16,23 @@ interface eth-sw1
  ip router isis 1
  ipv6 router isis 1
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5-1
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt3/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,14 +49,14 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0001",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 100,
                   "state": "up"
                 },
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 64,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf
@@ -17,31 +17,31 @@ interface eth-rt2-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt2-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt4/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0002",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0005",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf
@@ -17,31 +17,31 @@ interface eth-rt3-1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt3-2
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt4
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt6
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1

diff --git a/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref b/tests/topotests/isis_tilfa_topo1/rt5/step1/show_yang_interface_isis_adjacencies.ref
@@ -11,7 +11,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -30,7 +30,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0003",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -49,7 +49,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0004",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }
@@ -68,7 +68,7 @@
                 {
                   "neighbor-sys-type": "level-1",
                   "neighbor-sysid": "0000.0000.0006",
-                  "hold-timer": 3,
+                  "hold-timer": 10,
                   "neighbor-priority": 0,
                   "state": "up"
                 }

diff --git a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf
@@ -17,15 +17,15 @@ interface eth-rt4
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 interface eth-rt5
  ip router isis 1
  ipv6 router isis 1
  isis network point-to-point
  isis hello-interval 1
- isis hello-multiplier 3
+ isis hello-multiplier 10
  isis fast-reroute ti-lfa
 !
 router isis 1