Merge pull request #1436 from kernelkit/ospf-neighbor-must-expression

OSPF neighbor must expression

[skip ci]

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

doc/ChangeLog.md

@@ -27,8 +27,8 @@ All notable changes to the project are documented in this file.
   - `set ssh known-hosts <host> <keytype> <pubkey>` — pre-enroll a host key
     received out-of-band, e.g. after a factory reset changes the device host key
   - `no ssh known-hosts <host>` — remove a stale or changed host key entry
-- Add OSPF point-to-multipoint (P2MP) and hybrid interface type support
-
+- Add OSPF point-to-multipoint (P2MP) and hybrid interface type support.  This
+  also includes support for setting static neighbors, issue #1426
 
 ### Fixes
 

src/confd/yang/confd.inc

@@ -31,7 +31,7 @@ MODULES=(
 	"ieee802-dot1q-types@2022-10-29.yang"
 	"infix-ip@2025-11-02.yang"
 	"infix-if-type@2026-01-07.yang"
-	"infix-routing@2026-03-04.yang"
+	"infix-routing@2026-03-11.yang"
 	"ieee802-dot1ab-lldp@2022-03-15.yang"
 	"infix-lldp@2025-05-05.yang"
 	"infix-dhcp-common@2025-12-21.yang"

src/confd/yang/confd/infix-routing.yang

@@ -26,7 +26,7 @@ module infix-routing {
   contact      "kernelkit@googlegroups.com";
   description  "Deviations and augments for ietf-routing, ietf-ospf, and ietf-rip.";
 
-  revision 2026-03-04 {
+  revision 2026-03-11 {
     description "Remove interface-type deviation to expose standard ietf-ospf
                  interface types including point-to-multipoint and hybrid.
                  Un-deviate static-neighbors for non-broadcast P2MP support.";
@@ -452,6 +452,13 @@ module infix-routing {
   }
 
   /* OSPF Area Interface */
+  deviation "/rt:routing/rt:control-plane-protocols/rt:control-plane-protocol/ospf:ospf/ospf:areas/ospf:area/ospf:interfaces/ospf:interface/ospf:static-neighbors/ospf:neighbor" {
+    deviate add {
+      must "../../ospf:interface-type = 'point-to-multipoint' or ../../ospf:interface-type = 'non-broadcast'" {
+        error-message "Static neighbors are only applicable to point-to-multipoint or non-broadcast interface types.";
+      }
+    }
+  }
   deviation "/rt:routing/rt:control-plane-protocols/rt:control-plane-protocol/ospf:ospf/ospf:areas/ospf:area/ospf:interfaces/ospf:interface/ospf:multi-areas"    {
     deviate not-supported;
   }