diff --git a/experimental/ietf-extracted-YANG-modules/ietf-altmark@2024-06-19.yang b/experimental/ietf-extracted-YANG-modules/ietf-altmark@2024-06-19.yang index e971ec1a9..0babc0f2e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-altmark@2024-06-19.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-altmark@2024-06-19.yang @@ -85,7 +85,6 @@ module ietf-altmark { /* * IDENTITIES */ - identity filter { description "Base identity to represent a filter. A filter is used to @@ -182,7 +181,6 @@ module ietf-altmark { description "It indicates the AltMark Period."; } - identity flow-mon-id { description "It indicates the FlowMonID."; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2023-03-06.yang b/experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2024-09-02.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2023-03-06.yang rename to experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2024-09-02.yang index 3d1100340..a400250d0 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2023-03-06.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-isis-flex-algo@2024-09-02.yang @@ -33,11 +33,11 @@ module ietf-isis-flex-algo { organization "IETF LSR - Link State Routing Working Group"; contact - "WG Web: + "WG Web: WG List: Author: Yingzhen Qu - + Author: Acee Lindem Author: Stephane Litkowski @@ -46,12 +46,12 @@ module ietf-isis-flex-algo { description "The YANG module defines the configuration and operational - state for ISIS Flexible Algorithm as defined in RFC xxxx. + state for ISIS Flexible Algorithm as defined in RFC 9350. This YANG model conforms to the Network Management Datastore Architecture (NMDA) as described in RFC 8342. - Copyright (c) 2023 IETF Trust and the persons identified as + Copyright (c) 2024 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -73,7 +73,7 @@ module ietf-isis-flex-algo { reference "RFC XXXX: YANG Data Model for ISIS Flexible Algorithm."; - revision 2023-03-06 { + revision 2024-09-02 { description "Initial Version"; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2023-03-06.yang b/experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2024-09-02.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2023-03-06.yang rename to experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2024-09-02.yang index e94bdcb35..f7535dbcd 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2023-03-06.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-isis-link-attr@2024-09-02.yang @@ -26,11 +26,11 @@ module ietf-isis-link-attr { "IETF LSR - Link State Routing Working Group"; contact - "WG Web: + "WG Web: WG List: Author: Yingzhen Qu - + Author: Acee Lindem Author: Stephane Litkowski @@ -39,11 +39,11 @@ module ietf-isis-link-attr { description "This YANG module defines the configuration and operational state for IS-IS application specific link attributes feature as - defined in RFC 8919. + defined in RFC 9479. This YANG model conforms to the Network Management Datastore Architecture (NMDA) as described in RFC 8342. - Copyright (c) 2023 IETF Trust and the persons identified as + Copyright (c) 2024 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -64,7 +64,7 @@ module ietf-isis-link-attr { reference "RFC XXXX"; - revision 2023-03-06 { + revision 2024-09-02 { description "Initial version"; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2023-03-06.yang b/experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2024-09-02.yang similarity index 84% rename from experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2023-03-06.yang rename to experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2024-09-02.yang index c80ad8ef1..6fbd5fef0 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2023-03-06.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-isis-msd@2024-09-02.yang @@ -21,11 +21,11 @@ module ietf-isis-msd { organization "IETF LSR - LSR Working Group"; contact - "WG Web: + "WG Web: WG List: Author: Yingzhen Qu - + Author: Acee Lindem Author: Stephane Litkowski @@ -41,7 +41,7 @@ module ietf-isis-msd { This YANG model conforms to the Network Management Datastore Architecture (NMDA) as described in RFC 8342. - Copyright (c) 2023 IETF Trust and the persons identified as + Copyright (c) 2024 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -63,7 +63,7 @@ module ietf-isis-msd { reference "RFC XXXX: YANG Data Model for ISIS MSD"; - revision 2023-03-06 { + revision 2024-09-02 { description "Initial Version"; reference @@ -76,18 +76,7 @@ module ietf-isis-msd { container link-msd-sub-tlv { list link-msds { key "msd-type"; - leaf msd-type { - type identityref { - base mpls-msd:msd-base-type; - } - description - "MSD-Types"; - } - leaf msd-value { - type uint8; - description - "MSD value, in the range of 0-255."; - } + uses mpls-msd:msd-type-value; description "List of link MSDs"; } @@ -112,18 +101,7 @@ module ietf-isis-msd { container node-msd-tlv { list node-msds { key "msd-type"; - leaf msd-type { - type identityref { - base mpls-msd:msd-base-type; - } - description - "MSD-Types"; - } - leaf msd-value { - type uint8; - description - "MSD value, in the range of 0-255."; - } + uses mpls-msd:msd-type-value; description "Node MSD is the smallest link MSD supported by the node."; @@ -136,7 +114,6 @@ module ietf-isis-msd { } /* link MSD sub-tlv */ - augment "/rt:routing/" + "rt:control-plane-protocols/rt:control-plane-protocol" + "/isis:isis/isis:database/isis:levels/isis:lsp" diff --git a/experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2023-03-06.yang b/experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2024-09-02.yang similarity index 80% rename from experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2023-03-06.yang rename to experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2024-09-02.yang index 6ed4e7ea4..2259ed3b4 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2023-03-06.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-isis-remaining-lifetime@2024-09-02.yang @@ -14,22 +14,22 @@ module ietf-isis-remaining-lifetime { "IETF LSR - Link State Routing Working Group"; contact - "WG Web: + "WG Web: WG List: Author: Yingzhen Qu - + Author: Acee Lindem Author: Stephane Litkowski "; description - "This YANG module defines the configuration and operational - state for IS-IS Minimum Remaining Lifetime feature as defined - in RFC 7987. + "This YANG module defines a notification which is sent when the + IS-IS system detects corrupted lifetime of an LSP. This is for + IS-IS Minimum Remaining Lifetime feature as defined in RFC 7987. - Copyright (c) 2023 IETF Trust and the persons identified as + Copyright (c) 2024 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or @@ -44,7 +44,7 @@ module ietf-isis-remaining-lifetime { reference "RFC XXXX"; - revision 2023-03-06 { + revision 2024-09-02 { description "Initial version"; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-02-28.yang b/experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-09-01.yang similarity index 93% rename from experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-02-28.yang rename to experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-09-01.yang index 41bbea1ad..7ebd8ba85 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-02-28.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-isis-srv6@2024-09-01.yang @@ -49,7 +49,7 @@ module ietf-isis-srv6 { "; description - "The YANG module defines the configuration and operatioanl state + "The YANG module defines the configuration and operational state for IS-IS extension to support Segment Routing over IPv6 data plane. @@ -76,7 +76,7 @@ module ietf-isis-srv6 { described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2024-02-28 { + revision 2024-09-01 { description "Initial revision."; reference @@ -187,6 +187,7 @@ module ietf-isis-srv6 { description "Base identity for SRv6 End.X SID sub-TLV bits."; } + identity b-bit { base srv6-endx-sid-bit; description @@ -461,10 +462,10 @@ module ietf-isis-srv6 { + "/isis:isis" { when "derived-from-or-self(../rt:type, 'isis:isis')" { description - "This augment ISIS routing protocol when used"; + "This augment IS-IS routing protocol when used"; } description - "This augments ISIS protocol configuration + "This augments IS-IS protocol configuration with SRv6."; container srv6-cfg { leaf enable { @@ -477,7 +478,7 @@ module ietf-isis-srv6 { type boolean; default "false"; description - "Enable ISIS segment-routing IPv6 with default Locator."; + "Enable IS-IS segment-routing IPv6 with default Locator."; } leaf-list locator-name { when "../default-locator = 'false'" { @@ -489,7 +490,7 @@ module ietf-isis-srv6 { + "/srv6:locators/srv6:locator/srv6:name"; } description - "Enable ISIS segment-routing IPv6 with specified Locator."; + "Enable IS-IS segment-routing IPv6 with specified Locator."; } leaf persistent-end-x-sid { type boolean; @@ -498,7 +499,7 @@ module ietf-isis-srv6 { "Enable the persistent nature of End.X sid"; } description - "Configuration about ISIS segment-routing IPv6."; + "Configuration about IS-IS segment-routing IPv6."; } container micro-loop-avoidance { leaf srv6-enable { @@ -527,10 +528,10 @@ module ietf-isis-srv6 { + "/isis:isis/isis:fast-reroute" { when "derived-from-or-self(../../rt:type, 'isis:isis')" { description - "This augment ISIS routing protocol when used"; + "This augment IS-IS routing protocol when used"; } description - "This augments ISIS IPFRR with IPV6 TILFA."; + "This augments IS-IS IPFRR with IPV6 TILFA."; container srv6-ti-lfa { if-feature "srv6-ti-lfa"; leaf enable { @@ -539,7 +540,7 @@ module ietf-isis-srv6 { "Enables SRv6 TI-LFA computation."; } description - "SRv6 TILFA configuration."; + "SRv6 TI-LFA configuration."; } } @@ -551,10 +552,10 @@ module ietf-isis-srv6 { + "/isis:router-capabilities" { when "derived-from-or-self(../../../../../rt:type, 'isis:isis')" { description - "This augment ISIS routing protocol when used"; + "This augment IS-IS routing protocol when used"; } description - "This augments ISIS protocol router capability."; + "This augments IS-IS protocol router capability."; uses srv6-capability; uses srv6:srv6-msd-signaled; } @@ -566,10 +567,10 @@ module ietf-isis-srv6 { when "derived-from-or-self(../../../../../../rt:type," + "'isis:isis')" { description - "This augment ISIS routing protocol when used."; + "This augment IS-IS routing protocol when used."; } description - "This augments ISIS protocol neighbor."; + "This augments IS-IS protocol neighbor."; container srv6-adjacency-sids { description "This defines svr6 end-x sids for the adjacency."; @@ -589,10 +590,10 @@ module ietf-isis-srv6 { when "derived-from-or-self(../../../../../../rt:type," + "'isis:isis')" { description - "This augment ISIS routing protocol when used."; + "This augment IS-IS routing protocol when used."; } description - "This augments ISIS protocol neighbor."; + "This augments IS-IS protocol neighbor."; container srv6-adjacency-sids { description "This defines svr6 end-x sids for the adjacency."; @@ -610,10 +611,10 @@ module ietf-isis-srv6 { + "/isis:isis/isis:database/isis:levels/isis:lsp" { when "derived-from-or-self(../../../../rt:type, 'isis:isis')" { description - "This augment ISIS routing protocol when used."; + "This augment IS-IS routing protocol when used."; } description - "This augments ISIS protocol LSDB."; + "This augments IS-IS protocol LSDB."; container srv6-locators { description "This defines srv6 locator tlvs."; @@ -633,10 +634,10 @@ module ietf-isis-srv6 { when "derived-from-or-self(../../../../../rt:type," + "'isis:isis')" { description - "This augment ISIS routing protocol when used."; + "This augment IS-IS routing protocol when used."; } description - "This augments ISIS protocol operational state + "This augments IS-IS protocol operational state with segment routing."; uses srv6-adjacency-state; } diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-03-03.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-09-02.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-03-03.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-09-02.yang index 40dc7b072..8a2bbde28 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-03-03.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-srv6@2024-09-02.yang @@ -17,6 +17,9 @@ module ietf-ospfv3-srv6 { } import ietf-ospfv3-extended-lsa { prefix ospfv3-e-lsa; + reference + "RFC 9587: YANG Data Model for OSPFv3 Extended Link State + Advertisements (LSAs)"; } import ietf-ospf { prefix ospf; @@ -55,7 +58,7 @@ module ietf-ospfv3-srv6 { "; description - "The YANG module defines the configuration and operatioanl state + "The YANG module defines the configuration and operational state for OSPFv3 extensions to support Segment Routing over IPv6 data plane. @@ -71,7 +74,6 @@ module ietf-ospfv3-srv6 { forth in Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself for full legal notices. @@ -82,7 +84,7 @@ module ietf-ospfv3-srv6 { described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2024-03-03 { + revision 2024-09-02 { description "Initial revision."; reference @@ -216,7 +218,6 @@ module ietf-ospfv3-srv6 { description "Intra-Area"; } - identity INTER-AREA-LOCATOR { base LOCATOR-ROUTE-TYPE; description