From d95ff3a91573b2bc52a52b6a98b86d76667e1e36 Mon Sep 17 00:00:00 2001
From: Jon-Olov Vatn <jo@vatn.se>
Date: Fri, 13 Sep 2024 11:01:23 +0200
Subject: [PATCH 1/2] Adding deviations for unsupported OSPF RPCs and
 Notifications

---
 src/confd/yang/confd.inc                      |  2 +-
 ...-06.yang => infix-routing@2024-09-13.yang} | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 rename src/confd/yang/{infix-routing@2024-03-06.yang => infix-routing@2024-09-13.yang} (94%)

diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc
index 927d1d79c..cc5c4abc4 100644
--- a/src/confd/yang/confd.inc
+++ b/src/confd/yang/confd.inc
@@ -27,7 +27,7 @@ MODULES=(
 	"ieee802-dot1q-types@2022-10-29.yang"
 	"infix-ip@2023-09-14.yang"
 	"infix-if-type@2024-01-29.yang"
-	"infix-routing@2024-03-06.yang"
+	"infix-routing@2024-09-13.yang"
 	"ieee802-dot1ab-lldp@2022-03-15.yang"
 	"infix-lldp@2023-08-23.yang"
 	"infix-dhcp-client@2024-04-12.yang"
diff --git a/src/confd/yang/infix-routing@2024-03-06.yang b/src/confd/yang/infix-routing@2024-09-13.yang
similarity index 94%
rename from src/confd/yang/infix-routing@2024-03-06.yang
rename to src/confd/yang/infix-routing@2024-09-13.yang
index 0a0f00dd1..286412196 100644
--- a/src/confd/yang/infix-routing@2024-03-06.yang
+++ b/src/confd/yang/infix-routing@2024-09-13.yang
@@ -24,6 +24,10 @@ module infix-routing {
   import ietf-routing-types {
     prefix rt-types;
   }
+  revision 2024-09-13 {
+    description "Declare deviations for non-supported OSPF RPCs and Notifications";
+    reference "internal";
+  }
   revision 2024-03-06 {
     description "Obsolete leaf enable in favor for enabled in default-route-advertise";
     reference "internal";
@@ -424,4 +428,51 @@ module infix-routing {
   deviation "/ietf-r:routing/ietf-r:control-plane-protocols/ietf-r:control-plane-protocol/ospf:ospf/ospf:database/ospf:as-scope-lsa-type/ospf:as-scope-lsas/ospf:as-scope-lsa/ospf:version/ospf:ospfv2/ospf:ospfv2/ospf:header" {
     deviate not-supported;
   }
+
+  /* OSPF RPCs */ 
+  deviation "/ospf:clear-neighbor" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:clear-database" {
+    deviate not-supported;
+  }
+
+  /* OSPF Notifications */
+  deviation "/ospf:if-state-change" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:if-config-error" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:nbr-state-change" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:nbr-restart-helper-status-change" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:if-rx-bad-packet" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:lsdb-approaching-overflow" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:lsdb-overflow" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:nssa-translator-status-change" {
+    deviate not-supported;
+  }
+
+  deviation "/ospf:restart-status-change" {
+    deviate not-supported;
+  }
+
 }

From eb98f74f44d17191ad9e4b9993c08a4b651d92fb Mon Sep 17 00:00:00 2001
From: Jon-Olov Vatn <jo@vatn.se>
Date: Fri, 13 Sep 2024 11:16:16 +0200
Subject: [PATCH 2/2] Updated Changlog for deviation fixes in
 infix-routing.yang

---
 doc/ChangeLog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
index eba0c23c6..0f3ea4cda 100644
--- a/doc/ChangeLog.md
+++ b/doc/ChangeLog.md
@@ -10,6 +10,8 @@ All notable changes to the project are documented in this file.
 ### Changes
 
 ### Fixes
+- Updated `infix-routing.yang` to declare deviations for non-supported
+  OSPF RPCs and Notifications in `ietf-ospf.yang`.
 - Fix #601: CLI regression in 'show ospf' family of commands causing
   authorized users, like `admin`, to not being able to query status
   of OSPF or BFD.  Workaround by using the UNIX shell `sudo vtysh`.