From bd76235cc3ba664ba17a5ad63f1e7b2a6783cb0b Mon Sep 17 00:00:00 2001 From: Alexander Orel <140761159+xandrorel@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:10:37 -0400 Subject: [PATCH 1/5] Update openconfig-isis-routing.yang --- release/models/isis/openconfig-isis-routing.yang | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index 80a3154ff..787be99fe 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -297,6 +297,12 @@ submodule openconfig-isis-routing { description "Subsequent address-family type."; } + leaf enabled { + type boolean; + description + "When set to true, the functionality within which this leaf is + defined is enabled, when set to false it is explicitly disabled."; + } //prefer single topology } From 4d2d5f628c7f90e6b79a575651218b93db26ff47 Mon Sep 17 00:00:00 2001 From: Alexander Orel <140761159+xandrorel@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:36:17 -0400 Subject: [PATCH 2/5] Update openconfig-isis-routing.yang --- release/models/isis/openconfig-isis-routing.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index 787be99fe..609ecc60d 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -535,7 +535,6 @@ submodule openconfig-isis-routing { description "This container defines AFI-SAFI multi-topology state information"; uses isis-mt-config; - uses rt-admin-config; } } } From e7d3542048505c6055ef45e46816ccebdc4936e8 Mon Sep 17 00:00:00 2001 From: Alexander Orel <140761159+xandrorel@users.noreply.github.com> Date: Wed, 23 Oct 2024 17:03:16 -0400 Subject: [PATCH 3/5] Update version in openconfig-isis-routing.yang --- release/models/isis/openconfig-isis-routing.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index 609ecc60d..c06e1436e 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -20,7 +20,7 @@ submodule openconfig-isis-routing { description "This module describes YANG model for ISIS Routing"; - oc-ext:openconfig-version "1.7.0"; + oc-ext:openconfig-version "1.7.1"; revision "2024-02-28" { description From 2ccf0af1b1b25faa1a3ff5e4932282a8e922fdff Mon Sep 17 00:00:00 2001 From: Alexander Orel <140761159+xandrorel@users.noreply.github.com> Date: Fri, 25 Oct 2024 19:39:24 +0000 Subject: [PATCH 4/5] Merge branch 'master' into isis-mt-config-enabled --- release/models/isis/openconfig-isis-lsp.yang | 8 +++++++- release/models/isis/openconfig-isis-routing.yang | 6 ++++++ release/models/isis/openconfig-isis.yang | 8 +++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/release/models/isis/openconfig-isis-lsp.yang b/release/models/isis/openconfig-isis-lsp.yang index 707a8706e..f8408dd98 100644 --- a/release/models/isis/openconfig-isis-lsp.yang +++ b/release/models/isis/openconfig-isis-lsp.yang @@ -39,9 +39,15 @@ submodule openconfig-isis-lsp { revision "2024-02-28" { description "ISIS graceful-restart timers and per-level configuration."; - reference "1.7.0"; + reference "1.7.1"; } + revision "2024-10-25" { + description + "Add enabled leaf into isis multi-topology configuration."; + reference "1.7.1"; + } + revision "2024-02-20" { description "Fix typo in RFC reference for adjacency-state."; diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index c06e1436e..dfbfb5816 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -22,6 +22,12 @@ submodule openconfig-isis-routing { oc-ext:openconfig-version "1.7.1"; + revision "2024-10-25" { + description + "Add enabled leaf into isis multi-topology configuration."; + reference "1.7.1"; + } + revision "2024-02-28" { description "ISIS graceful-restart timers and per-level configuration."; diff --git a/release/models/isis/openconfig-isis.yang b/release/models/isis/openconfig-isis.yang index fcad2fb68..cf7457fde 100644 --- a/release/models/isis/openconfig-isis.yang +++ b/release/models/isis/openconfig-isis.yang @@ -54,8 +54,14 @@ module openconfig-isis { +-> { levels config } +-> { level adjacencies }"; - oc-ext:openconfig-version "1.7.0"; + oc-ext:openconfig-version "1.7.1"; + revision "2024-10-25" { + description + "Add enabled leaf into isis multi-topology configuration."; + reference "1.7.1"; + } + revision "2024-02-28" { description "ISIS graceful-restart timers and per-level configuration."; From 2a3e9e5dd85dfcb4edf32385811996d2e7883f4f Mon Sep 17 00:00:00 2001 From: Alexander Orel <140761159+xandrorel@users.noreply.github.com> Date: Fri, 25 Oct 2024 20:16:33 +0000 Subject: [PATCH 5/5] Fixing trailing spaces and missing version update --- release/models/isis/openconfig-isis-lsp.yang | 14 +++++++------- release/models/isis/openconfig-isis-routing.yang | 2 +- release/models/isis/openconfig-isis.yang | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/release/models/isis/openconfig-isis-lsp.yang b/release/models/isis/openconfig-isis-lsp.yang index f8408dd98..123375680 100644 --- a/release/models/isis/openconfig-isis-lsp.yang +++ b/release/models/isis/openconfig-isis-lsp.yang @@ -34,20 +34,20 @@ 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 "1.7.1"; - revision "2024-02-28" { + revision "2024-10-25" { description - "ISIS graceful-restart timers and per-level configuration."; + "Add enabled leaf into isis multi-topology configuration."; reference "1.7.1"; } - revision "2024-10-25" { + revision "2024-02-28" { description - "Add enabled leaf into isis multi-topology configuration."; - reference "1.7.1"; + "ISIS graceful-restart timers and per-level configuration."; + reference "1.7.0"; } - + revision "2024-02-20" { description "Fix typo in RFC reference for adjacency-state."; diff --git a/release/models/isis/openconfig-isis-routing.yang b/release/models/isis/openconfig-isis-routing.yang index dfbfb5816..19447d990 100644 --- a/release/models/isis/openconfig-isis-routing.yang +++ b/release/models/isis/openconfig-isis-routing.yang @@ -27,7 +27,7 @@ submodule openconfig-isis-routing { "Add enabled leaf into isis multi-topology configuration."; reference "1.7.1"; } - + revision "2024-02-28" { description "ISIS graceful-restart timers and per-level configuration."; diff --git a/release/models/isis/openconfig-isis.yang b/release/models/isis/openconfig-isis.yang index cf7457fde..c59e39713 100644 --- a/release/models/isis/openconfig-isis.yang +++ b/release/models/isis/openconfig-isis.yang @@ -61,7 +61,7 @@ module openconfig-isis { "Add enabled leaf into isis multi-topology configuration."; reference "1.7.1"; } - + revision "2024-02-28" { description "ISIS graceful-restart timers and per-level configuration.";