From 41ac322498cb25d037c35460fce5eb71bc00df87 Mon Sep 17 00:00:00 2001 From: Ebben Aries Date: Mon, 10 Feb 2025 11:13:15 -0800 Subject: [PATCH 1/2] Refactor IS-IS Graceful Restart nodes * (M) release/models/isis/openconfig-isis-lsp.yang * (M) release/models/isis/openconfig-isis-routing.yang * (M) release/models/isis/openconfig-isis.yang - Refactor IS-IS GR leaves according to RFC, remove defaults - Removal of non-standard `interface-time-expirations` leaf --- release/models/isis/openconfig-isis-lsp.yang | 10 +++- .../models/isis/openconfig-isis-routing.yang | 10 +++- release/models/isis/openconfig-isis.yang | 52 ++++++++++--------- 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/release/models/isis/openconfig-isis-lsp.yang b/release/models/isis/openconfig-isis-lsp.yang index 707a8706e..f0e030367 100644 --- a/release/models/isis/openconfig-isis-lsp.yang +++ b/release/models/isis/openconfig-isis-lsp.yang @@ -34,7 +34,15 @@ submodule openconfig-isis-lsp { Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (http://trustee.ietf.org/license-info)."; - oc-ext:openconfig-version "1.7.0"; + oc-ext:openconfig-version "2.0.0"; + + revision "2025-02-10" { + description + "Remove graceful-restart restart-time defaults and update + description statements, reference and grouping naming. Removal of + non-standard interface-time-expirations leaf."; + reference "2.0.0"; + } revision "2024-02-28" { description diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index 80a3154ff..9aa1a7748 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -20,7 +20,15 @@ submodule openconfig-isis-routing { description "This module describes YANG model for ISIS Routing"; - oc-ext:openconfig-version "1.7.0"; + oc-ext:openconfig-version "2.0.0"; + + revision "2025-02-10" { + description + "Remove graceful-restart restart-time defaults and update + description statements, reference and grouping naming. Removal of + non-standard interface-time-expirations leaf."; + reference "2.0.0"; + } revision "2024-02-28" { description diff --git a/release/models/isis/openconfig-isis.yang b/release/models/isis/openconfig-isis.yang index fcad2fb68..59b8c5344 100644 --- a/release/models/isis/openconfig-isis.yang +++ b/release/models/isis/openconfig-isis.yang @@ -54,7 +54,15 @@ module openconfig-isis { +-> { levels config } +-> { level adjacencies }"; - oc-ext:openconfig-version "1.7.0"; + oc-ext:openconfig-version "2.0.0"; + + revision "2025-02-10" { + description + "Remove graceful-restart restart-time defaults and update + description statements, reference and grouping naming. Removal of + non-standard interface-time-expirations leaf."; + reference "2.0.0"; + } revision "2024-02-28" { description @@ -938,29 +946,24 @@ module openconfig-isis { "When this leaf is set to TRUE, planned restart procedures as described in RFC 8706 are not used."; reference - "RFC 5706: Restart Signaling for IS-IS"; + "IETF RFC 8706, Section 3.2: Restart Signaling for IS-IS"; } - - reference - "RFC 5306: Restart Signaling for IS-IS; RFC 5706: Restart Signaling - for IS-IS"; } - grouping isis-graceful-restart-level-config { + grouping isis-graceful-restart-global-level-config { description "This grouping defines ISIS graceful restart configuration relevant - for ISIS level/LSDB"; + for ISIS at global system and per-level/LSDB hierarchies."; leaf restart-time { type uint16; - default 30; + units "seconds"; description - "Value of RFC5306/RFC8706 T2 timer"; + "Value of T2 or T3 timers at either the LSDB/level or global + system context."; + reference + "IETF RFC 8706, Section 3.1: Restart Signaling for IS-IS"; } - - reference - "RFC 5306: Restart Signaling for IS-IS; RFC 5706: Restart Signaling - for IS-IS"; } grouping isis-graceful-restart-interface-config { @@ -970,21 +973,20 @@ module openconfig-isis { leaf interface-timer { type uint16; + units "seconds"; description - "Value of RFC5306/RFC8706 T1 timer"; + "Value of T1 timer per interface."; + reference + "IETF RFC 8706, Section 3.1: Restart Signaling for IS-IS"; } leaf interface-time-expirations { - type int64; + type uint32; description "Number of times T1 expires before IIH without Restart TLV's RR flag set is sent. That is GR helper is not supported by adjacents - Inermediate System"; + Intermediate System"; } - - reference - "RFC 5306: Restart Signaling for IS-IS; RFC 5706: Restart Signaling - for IS-IS"; } // configuration context containers @@ -1186,7 +1188,7 @@ module openconfig-isis { uses admin-config; uses isis-graceful-restart-config; - uses isis-graceful-restart-level-config; + uses isis-graceful-restart-global-level-config; uses isis-graceful-restart-interface-config; } @@ -1197,7 +1199,7 @@ module openconfig-isis { uses admin-config; uses isis-graceful-restart-config; - uses isis-graceful-restart-level-config; + uses isis-graceful-restart-global-level-config; uses isis-graceful-restart-interface-config; } } @@ -1585,7 +1587,7 @@ module openconfig-isis { "This container defines ISIS graceful-restart configuration."; uses admin-config; - uses isis-graceful-restart-level-config; + uses isis-graceful-restart-global-level-config; } container state { @@ -1594,7 +1596,7 @@ module openconfig-isis { "This container defines state information for ISIS graceful-restart."; uses admin-config; - uses isis-graceful-restart-level-config; + uses isis-graceful-restart-global-level-config; } } From 7b8a832a53590471fd465ee201cb0e19a096eb25 Mon Sep 17 00:00:00 2001 From: Ebben Aries Date: Mon, 10 Feb 2025 11:33:33 -0800 Subject: [PATCH 2/2] Missed: removal of interface-time-expirations leaf --- release/models/isis/openconfig-isis.yang | 8 -------- 1 file changed, 8 deletions(-) diff --git a/release/models/isis/openconfig-isis.yang b/release/models/isis/openconfig-isis.yang index 59b8c5344..a7c00cce6 100644 --- a/release/models/isis/openconfig-isis.yang +++ b/release/models/isis/openconfig-isis.yang @@ -979,14 +979,6 @@ module openconfig-isis { reference "IETF RFC 8706, Section 3.1: Restart Signaling for IS-IS"; } - - leaf interface-time-expirations { - type uint32; - description - "Number of times T1 expires before IIH without Restart TLV's RR flag - set is sent. That is GR helper is not supported by adjacents - Intermediate System"; - } } // configuration context containers