tests: topotests/ospf_topo1: cover new per-leaf CLI conversions

Extends test_ospf_per_iface_cli_routes_through_yang to exercise
`ip ospf network point-to-point` and the v3 equivalent alongside
the other per-interface CLIs, and adds dedicated CLI tests for
the new YANG-routed paths:

  * test_ospf_network_dmvpn_falls_back_to_legacy -- confirms the
    FRR-augment fallback for `ip ospf network point-to-point dmvpn`
    keeps producing the expected running-config text and that
    `no ip ospf network` unwinds both the legacy and the YANG-
    backed state cleanly.

  * test_ospf_distance_cli_routes_through_yang -- cycles `distance
    137` / `no distance` and the three-scope `distance ospf
    intra-area X inter-area Y external Z` / `no distance ospf` on
    ospfd and asserts the running-config cycles in and out as
    expected. v3 path coverage stays in
    test_ospf_yang_preference_config because legacy distance on
    OSPF6_NODE additionally calls ospf6_restart_spf, which trips
    a pre-existing ospf6_route_remove_all use-after-free with a
    populated route table.

Coverage for the area attachment and area range CLI conversions
(`ip ospf area`, `ipv6 ospf6 area`, `area X range PREFIX [...]`)
relies on the existing
test_ospf_yang_area_interface_*_config / area_ranges_config tests,
which exercise the same YANG list-create / leaf-modify path via
`mgmt set-config`; a dedicated legacy-CLI fixture would require a
topology without `network <prefix> area X` statements and is left
for a follow-up.

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

Author: lamestllama

tests/topotests/ospf_topo1/test_ospf_topo1.py

@@ -691,6 +691,69 @@ def _set_yang_area_attrs(router, protocol_type, area_id, attrs):
     router.vtysh_cmd("\n".join(lines))
 
 
+def test_ospf_distance_cli_routes_through_yang():
+    """The legacy single-value `distance N` / `no distance` and multi-value
+    `distance ospf intra-area X inter-area Y external Z` / `no distance ospf`
+    forms continue to work via vtysh but now route through the ietf-ospf
+    YANG `/preference/all` and `/preference/{intra-area,inter-area,external}`
+    leaves. Verify by issuing the legacy CLI and confirming the daemon's
+    running-config reflects the change exactly as before.
+
+    The OSPFv3 path is covered indirectly by test_ospf_yang_preference_config;
+    legacy `distance` invocations in OSPF6_NODE additionally trigger
+    ospf6_restart_spf, which trips a pre-existing ospf6_route_remove_all
+    use-after-free when the route table is populated, so this test sticks
+    to OSPFv2 for the legacy CLI."""
+    tgen = get_topogen()
+    if tgen.routers_have_failure():
+        pytest.skip("skipped because of router(s) failure")
+
+    r1 = tgen.gears["r1"]
+    daemon = "ospfd"
+    router_block = "router ospf"
+    cli_proto = "ospf"
+
+    # single-value scope (preference/all)
+    r1.vtysh_cmd(
+        "configure terminal\n" "{}\n" " distance 137\n".format(router_block)
+    )
+    running = r1.vtysh_cmd("show running-config {}".format(daemon))
+    assert " distance 137" in running, running
+
+    r1.vtysh_cmd(
+        "configure terminal\n" "{}\n" " no distance\n".format(router_block)
+    )
+    running = r1.vtysh_cmd("show running-config {}".format(daemon))
+    assert "distance 137" not in running, running
+
+    # multi-value scope (preference/intra-area + /inter-area + /external)
+    r1.vtysh_cmd(
+        "configure terminal\n"
+        "{}\n"
+        " distance {} intra-area 21 inter-area 22 external 23\n".format(
+            router_block, cli_proto
+        )
+    )
+    running = r1.vtysh_cmd("show running-config {}".format(daemon))
+    assert (
+        "distance {} intra-area 21".format(cli_proto) in running
+    ), "expected 'distance {} intra-area 21' in {} running-config, got:\n{}".format(
+        cli_proto, daemon, running
+    )
+    assert "inter-area 22" in running, running
+    assert "external 23" in running, running
+
+    r1.vtysh_cmd(
+        "configure terminal\n"
+        "{}\n"
+        " no distance {}\n".format(router_block, cli_proto)
+    )
+    running = r1.vtysh_cmd("show running-config {}".format(daemon))
+    assert "intra-area 21" not in running, running
+    assert "inter-area 22" not in running, running
+    assert "external 23" not in running, running
+
+
 def test_ospf_area_cli_routes_through_yang():
     """The legacy `area X stub`, `area X stub no-summary`, `area X
     default-cost N`, and their `no` forms continue to work via vtysh but
@@ -1021,12 +1084,13 @@ def test_ospf_per_iface_cli_routes_through_yang():
     Drives `ip ospf cost N`, `ip ospf hello-interval N`, `ip ospf
     dead-interval N`, `ip ospf priority N`, `ip ospf mtu-ignore`,
     `ip ospf passive`, `ip ospf retransmit-interval N`, `ip ospf
-    transmit-delay N` and their v3 siblings via vtysh on r1-eth1
-    (which the fixture already attached to area 0 for both
-    daemons), confirms each lands in running-config, then unwinds
-    via the corresponding `no` form. Covers both the conversion
-    of the main DEFUN to DEFPY_YANG and the routing through the
-    NB callbacks landed in the per-interface slices.
+    transmit-delay N`, `ip ospf network point-to-point` and their
+    v3 siblings via vtysh on r1-eth1 (which the fixture already
+    attached to area 0 for both daemons), confirms each lands in
+    running-config, then unwinds via the corresponding `no` form.
+    Covers both the conversion of the main DEFUN to DEFPY_YANG and
+    the routing through the NB callbacks landed in the per-interface
+    slices.
     """
     tgen = get_topogen()
     if tgen.routers_have_failure():
@@ -1046,6 +1110,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         " ip ospf passive\n"
         " ip ospf retransmit-interval 23\n"
         " ip ospf transmit-delay 31\n"
+        " ip ospf network point-to-point\n"
     )
     running = r1.vtysh_cmd("show running-config ospfd")
     for expected in (
@@ -1057,6 +1122,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         "ip ospf passive",
         "ip ospf retransmit-interval 23",
         "ip ospf transmit-delay 31",
+        "ip ospf network point-to-point",
     ):
         assert (
             expected in running
@@ -1075,6 +1141,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         " no ip ospf passive\n"
         " no ip ospf retransmit-interval\n"
         " no ip ospf transmit-delay\n"
+        " no ip ospf network\n"
     )
     running = r1.vtysh_cmd("show running-config ospfd")
     for unexpected in (
@@ -1086,6 +1153,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         "ip ospf passive",
         "ip ospf retransmit-interval 23",
         "ip ospf transmit-delay 31",
+        "ip ospf network point-to-point",
     ):
         assert (
             unexpected not in running
@@ -1103,6 +1171,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         " ipv6 ospf6 passive\n"
         " ipv6 ospf6 retransmit-interval 23\n"
         " ipv6 ospf6 transmit-delay 31\n"
+        " ipv6 ospf6 network point-to-point\n"
     )
     running = r1.vtysh_cmd("show running-config ospf6d")
     for expected in (
@@ -1114,6 +1183,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         "ipv6 ospf6 passive",
         "ipv6 ospf6 retransmit-interval 23",
         "ipv6 ospf6 transmit-delay 31",
+        "ipv6 ospf6 network point-to-point",
     ):
         assert (
             expected in running
@@ -1132,6 +1202,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         " no ipv6 ospf6 passive\n"
         " no ipv6 ospf6 retransmit-interval\n"
         " no ipv6 ospf6 transmit-delay\n"
+        " no ipv6 ospf6 network\n"
     )
     running = r1.vtysh_cmd("show running-config ospf6d")
     for unexpected in (
@@ -1143,6 +1214,7 @@ def test_ospf_per_iface_cli_routes_through_yang():
         "ipv6 ospf6 passive",
         "ipv6 ospf6 retransmit-interval 23",
         "ipv6 ospf6 transmit-delay 31",
+        "ipv6 ospf6 network point-to-point",
     ):
         assert (
             unexpected not in running
@@ -1158,6 +1230,44 @@ def test_ospf_per_iface_cli_routes_through_yang():
     )
 
 
+def test_ospf_network_dmvpn_falls_back_to_legacy():
+    """`ip ospf network point-to-point dmvpn` keeps working via the
+    legacy direct-mutation path because RFC 9129's interface-type
+    enum doesn't model the FRR-specific dmvpn flag.
+
+    The DEFPY_YANG body classifies the FRR-modifier as out-of-scope
+    for YANG and falls through to ospf_network_legacy_apply.  This
+    test confirms the running-config still shows the dmvpn modifier
+    after the conversion.
+    """
+    tgen = get_topogen()
+    if tgen.routers_have_failure():
+        pytest.skip("skipped because of router(s) failure")
+
+    r1 = tgen.gears["r1"]
+
+    r1.vtysh_cmd(
+        "configure terminal\n"
+        "interface r1-eth1\n"
+        " ip ospf network point-to-point dmvpn\n"
+    )
+    running = r1.vtysh_cmd("show running-config ospfd")
+    assert "ip ospf network point-to-point dmvpn" in running, (
+        "expected 'ip ospf network point-to-point dmvpn' in running-config "
+        "after legacy CLI set, got:\n" + running
+    )
+
+    r1.vtysh_cmd(
+        "configure terminal\n"
+        "interface r1-eth1\n"
+        " no ip ospf network\n"
+    )
+    running = r1.vtysh_cmd("show running-config ospfd")
+    assert "ip ospf network" not in running, (
+        "ip ospf network should be removed after CLI no form, got:\n" + running
+    )
+
+
 def test_ospf_yang_preference_config():
     """per-instance preference (admin distance) round-trip via mgmtd.