ospf: route retransmit-interval and transmit-delay CLI through ietf-ospf YANG

Extends the per-interface CLI-through-YANG conversion already done for
cost / hello-interval / dead-interval / priority / mtu-ignore / passive to
the two remaining per-interface scalars that have RFC 9129 callbacks:
retransmit-interval and transmit-delay.

Commands converted on each daemon:
  v2:  ip ospf retransmit-interval / no ip ospf retransmit-interval +
       the hidden `ospf retransmit-interval` / `no ospf retransmit-interval`
       backwards-compat aliases
       ip ospf transmit-delay / no ip ospf transmit-delay + the matching
       hidden `ospf transmit-delay` / `no ospf transmit-delay` aliases
  v3:  ipv6 ospf6 retransmit-interval / no ipv6 ospf6 retransmit-interval
       ipv6 ospf6 transmit-delay / no ipv6 ospf6 transmit-delay

Conversion pattern (matches the cost / hello / dead / priority / mtu-ignore
/ passive slice):

  * v2 commands take an optional `[A.B.C.D]` per-address override that
    has no RFC 9129 representation. Each DEFPY_YANG body checks
    `if (!ifaddr_str && per_iface_xpath returns 0)` and dispatches
    through nb_cli_enqueue_change / nb_cli_apply_changes; on the
    negative path it falls back to the legacy direct-mutation logic,
    preserving the per-address-override capability for operators that
    need it.
  * The YANG path also requires the interface to be in an area
    (if_area on IF_DEF_PARAMS). Operators setting per-interface attrs
    on an unattached interface continue to use the legacy path -- the
    YANG model can't express "interface params before area assignment"
    because the leaves live under areas/area[id]/interfaces.
  * Per-leaf bodies factor into small `_set_apply` / `_unset_apply`
    helpers shared by the main `ip ospf X` form and the hidden
    backwards-compat `ospf X` alias (v2 only).
  * v3 collapses the legacy DEFUN+ALIAS pair into two DEFPY_YANG forms
    (one for set, one for `no`), each guarded by `ospf6_per_iface_xpath`
    before falling back to direct ospf6_interface mutation.

Topotest: extends `test_ospf_per_iface_cli_routes_through_yang` to drive
`ip ospf retransmit-interval 23` + `ip ospf transmit-delay 31` (and v3
equivalents) on r1-eth1 alongside the previously-covered six leaves,
verifies each lands in `show running-config <daemon>`, then unwinds via
`no` and verifies absence. The `b3b` and `transmit-delay` focused
mgmtd-write tests continue to cover the YANG-side of the round-trip.

Doc: no change. The converted-leaves paragraph already lists
retransmit-interval and transmit-delay; the "Existing CLI commands for
those leaves set the same YANG nodes as mgmtd writes" sentence now
becomes accurate for these two.

Signed-off-by: Eric Parsonage <eric@eparsonage.com>

Author: lamestllama

ospf6d/ospf6_interface.c

@@ -2494,72 +2494,116 @@ DEFPY(no_ipv6_ospf6_gr_hdelay,
 }
 
 /* interface variable set command */
-DEFUN (ipv6_ospf6_transmitdelay,
+DEFPY_YANG (ipv6_ospf6_transmitdelay,
        ipv6_ospf6_transmitdelay_cmd,
-       "ipv6 ospf6 transmit-delay (1-3600)",
+       "ipv6 ospf6 transmit-delay (1-3600)$interval",
        IP6_STR
        OSPF6_STR
        "Link state transmit delay\n"
        SECONDS_STR)
 {
 	VTY_DECLVAR_CONTEXT(interface, ifp);
-	int idx_number = 3;
 	struct ospf6_interface *oi;
+	char xpath[XPATH_MAXLEN];
+
 	assert(ifp);
+	if (ospf6_per_iface_xpath(xpath, sizeof(xpath), ifp,
+				  "/transmit-delay") == 0) {
+		nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, interval_str);
+		return nb_cli_apply_changes(vty, NULL);
+	}
 
 	oi = (struct ospf6_interface *)ifp->info;
 	if (oi == NULL)
 		oi = ospf6_interface_create(ifp);
 	assert(oi);
-
-	oi->transdelay = strmatch(argv[0]->text, "no")
-				 ? OSPF6_INTERFACE_TRANSDELAY
-				 : strtoul(argv[idx_number]->arg, NULL, 10);
+	oi->transdelay = interval;
 	return CMD_SUCCESS;
 }
 
-ALIAS (ipv6_ospf6_transmitdelay,
+DEFPY_YANG (no_ipv6_ospf6_transmitdelay,
        no_ipv6_ospf6_transmitdelay_cmd,
        "no ipv6 ospf6 transmit-delay [(1-3600)]",
        NO_STR
        IP6_STR
        OSPF6_STR
        "Link state transmit delay\n"
        SECONDS_STR)
+{
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct ospf6_interface *oi;
+	char xpath[XPATH_MAXLEN];
+
+	assert(ifp);
+	if (ospf6_per_iface_xpath(xpath, sizeof(xpath), ifp,
+				  "/transmit-delay") == 0) {
+		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+		return nb_cli_apply_changes(vty, NULL);
+	}
+
+	oi = (struct ospf6_interface *)ifp->info;
+	if (oi == NULL)
+		oi = ospf6_interface_create(ifp);
+	assert(oi);
+	oi->transdelay = OSPF6_INTERFACE_TRANSDELAY;
+	return CMD_SUCCESS;
+}
 
 /* interface variable set command */
-DEFUN (ipv6_ospf6_retransmitinterval,
+DEFPY_YANG (ipv6_ospf6_retransmitinterval,
        ipv6_ospf6_retransmitinterval_cmd,
-       "ipv6 ospf6 retransmit-interval (1-65535)",
+       "ipv6 ospf6 retransmit-interval (1-65535)$interval",
        IP6_STR
        OSPF6_STR
        "Time between retransmitting lost link state advertisements\n"
        SECONDS_STR)
 {
 	VTY_DECLVAR_CONTEXT(interface, ifp);
-	int idx_number = 3;
 	struct ospf6_interface *oi;
+	char xpath[XPATH_MAXLEN];
+
 	assert(ifp);
+	if (ospf6_per_iface_xpath(xpath, sizeof(xpath), ifp,
+				  "/retransmit-interval") == 0) {
+		nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, interval_str);
+		return nb_cli_apply_changes(vty, NULL);
+	}
 
 	oi = (struct ospf6_interface *)ifp->info;
 	if (oi == NULL)
 		oi = ospf6_interface_create(ifp);
 	assert(oi);
-
-	oi->rxmt_interval = strmatch(argv[0]->text, "no")
-				    ? OSPF_RETRANSMIT_INTERVAL_DEFAULT
-				    : strtoul(argv[idx_number]->arg, NULL, 10);
+	oi->rxmt_interval = interval;
 	return CMD_SUCCESS;
 }
 
-ALIAS (ipv6_ospf6_retransmitinterval,
+DEFPY_YANG (no_ipv6_ospf6_retransmitinterval,
        no_ipv6_ospf6_retransmitinterval_cmd,
        "no ipv6 ospf6 retransmit-interval [(1-65535)]",
        NO_STR
        IP6_STR
        OSPF6_STR
        "Time between retransmitting lost link state advertisements\n"
        SECONDS_STR)
+{
+	VTY_DECLVAR_CONTEXT(interface, ifp);
+	struct ospf6_interface *oi;
+	char xpath[XPATH_MAXLEN];
+
+	assert(ifp);
+	if (ospf6_per_iface_xpath(xpath, sizeof(xpath), ifp,
+				  "/retransmit-interval") == 0) {
+		nb_cli_enqueue_change(vty, xpath, NB_OP_DESTROY, NULL);
+		return nb_cli_apply_changes(vty, NULL);
+	}
+
+	oi = (struct ospf6_interface *)ifp->info;
+	if (oi == NULL)
+		oi = ospf6_interface_create(ifp);
+	assert(oi);
+	oi->rxmt_interval = OSPF_RETRANSMIT_INTERVAL_DEFAULT;
+	return CMD_SUCCESS;
+}
 
 void ospf6_priority_recompute(struct ospf6_interface *oi)
 {