diff --git a/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-15.yang b/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-15.yang rename to experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang index 8cc1f8706..65cb0261f 100644 --- a/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-15.yang +++ b/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang @@ -47,7 +47,7 @@ module iana-ioam-integrity-protection-methods { "IOAM Integrity Protection Methods (https://www.iana.org/assignments/ioam/ioam.xhtml)"; - revision 2026-04-15 { + revision 2026-04-22 { description "Initial version."; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-15.yang b/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-15.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang index 7d805006c..327237306 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-15.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang @@ -63,7 +63,7 @@ module ietf-ioam-integrity { Pre-allocated Trace Option. Therefore, the model does not impose constraints that would prevent such use cases."; - revision 2026-04-15 { + revision 2026-04-22 { description "Initial version."; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-02-27.yang b/experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-04-20.yang similarity index 82% rename from experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-02-27.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-04-20.yang index 4140162e6..908ed5d34 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-02-27.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ipv6-nd@2026-04-20.yang @@ -34,11 +34,11 @@ module ietf-ipv6-nd { Author: Jiayuan Hu "; description - "This YANG module defines a YANG data model to configure and manage - IPv6 Neighbor Discovery (ND) and related functions, including - IPv6 address resolution, redirect, proxy Neighbor - Advertisement, Neighbor Unreachability Detection (NUD), Duplicate - Address Detection (DAD), and Enhanced DAD. + "This YANG module defines a YANG data model to configure and + manage IPv6 Neighbor Discovery (ND) and related functions, + including IPv6 address resolution, redirect, proxy Neighbor + Advertisement, Neighbor Unreachability Detection (NUD), + Duplicate Address Detection (DAD), and Enhanced DAD. The model is based on YANG 1.1 as defined in RFC 7950 and conforms to Network Management Datastore Architecture (NMDA) @@ -56,43 +56,21 @@ module ietf-ipv6-nd { 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. - - The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL - NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', - 'MAY', and 'OPTIONAL' in this document are to be interpreted as - described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, - they appear in all capitals, as shown here."; + for full legal notices."; reference "RFC4861: Neighbor Discovery for IP version 6 (IPv6) RFC4862: IPv6 Stateless Address Autoconfiguration RFC7527: Enhanced Duplicate Address Detection"; - revision 2026-02-27 { + revision 2026-04-20 { description - "Initial version"; + "Initial version."; reference "RFC XXXX: YANG Data Model for IPv6 Neighbor Discovery"; } /* Data nodes */ - container nd { - description - "Global parameters for IPv6 ND."; - leaf stale-timeout { - type uint32; - units "seconds"; - description - "The global timeout for Neighbor Cache entry in the STALE - state. This value applies to all interfaces unless overridden - by a per-interface setting."; - reference - "RFC4861: Neighbor Discovery for IP version 6 (IPv6) - Section 5.3"; - } - } - augment "/if:interfaces/if:interface/ip:ipv6" { description "Augments interface configuration and state data with @@ -101,7 +79,9 @@ module ietf-ipv6-nd { description "Parameters of IPv6 ND."; leaf reachable-time { - type uint32; + type uint32 { + range "1..3600000"; + } units "milliseconds"; default "30000"; description @@ -123,17 +103,6 @@ module ietf-ipv6-nd { "RFC4861: Neighbor Discovery for IP version 6 (IPv6) Section 6.3.2"; } - leaf stale-timeout { - type uint32; - units "seconds"; - description - "The timeout for Neighbor Cache entry in the STALE state on - the interface. If configured, this value overrides the global - stale-timeout."; - reference - "RFC4861: Neighbor Discovery for IP version 6 (IPv6) - Section 5.3"; - } leaf redirect { type boolean; default "false"; @@ -266,3 +235,4 @@ module ietf-ipv6-nd { } } } + diff --git a/experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-01-27.yang b/experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-04-22.yang similarity index 90% rename from experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-01-27.yang rename to experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-04-22.yang index 9754c74ee..4e5bdb41f 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-01-27.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-network-inventory@2026-04-22.yang @@ -23,7 +23,7 @@ module ietf-network-inventory { "IETF IVY Working Group"; contact "WG Web: - WG List: + WG List: Editor: Chaode Yu @@ -65,7 +65,7 @@ module ietf-network-inventory { described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2026-01-27 { + revision 2026-04-22 { description "Initial version"; reference @@ -101,6 +101,7 @@ module ietf-network-inventory { type leafref { path "/nwi:network-inventory/nwi:network-elements" + "/nwi:network-element/nwi:ne-id"; + require-instance false; } description "This type is intended to be used by data models that need to @@ -111,6 +112,28 @@ module ietf-network-inventory { * Groupings */ + grouping component-ref { + description + "This grouping is intended to be used by data models that need + to reference a component within a Network Element."; + leaf ne-ref { + type nwi:ne-ref; + description + "The reference to the Network Element which contains the + component to be referenced."; + } + leaf component-ref { + type leafref { + path "/nwi:network-inventory/nwi:network-elements/" + + "nwi:network-element[nwi:ne-id=current()/../ne-ref]" + + "/nwi:components/nwi:component/nwi:component-id"; + require-instance false; + } + description + "The reference to the component."; + } + } + grouping port-ref { description "This grouping is intended to be used by data models that need @@ -126,13 +149,13 @@ module ietf-network-inventory { path "/nwi:network-inventory/nwi:network-elements/" + "nwi:network-element[nwi:ne-id=current()/../ne-ref]" + "/nwi:components/nwi:component/nwi:component-id"; + require-instance false; } - must "derived-from-or-self (/nwi:network-inventory/ - nwi:network-elements/nwi:network-element - [nwi:ne-id=../ne-ref]/nwi:components/nwi:component - [nwi:component-id=current()]/nwi:class, 'ianahw:port')"; description - "The reference to the port component."; + "The reference to the port component. + + Note: the class of the referenced port component MUST be + 'ianahw:port' or a derived identity."; } } @@ -153,8 +176,8 @@ module ietf-network-inventory { description "The name of the entity (e.g., component), as specified by a network operator, that provides a non-volatile 'handle' - for the entity and that can be modified anytime during the - entity lifetime. + for the entity and that can change anytime during the entity + lifetime. If no value is discovered, the server MAY set the value of this node to a locally unique value in the operational @@ -181,8 +204,9 @@ module ietf-network-inventory { list software-rev { key "name"; description - "The list of the software modules configured to be active - within the entity (e.g., component)."; + "The list of the software modules representing the software + images intended to be running within the entity + (e.g., component)."; leaf name { type string; description @@ -432,8 +456,9 @@ module ietf-network-inventory { component among all the sibling components. The format of this string is - implementation-specific. It MAY encode an integer - value representing the entPhysicalParentRelPos."; + implementation-specific. When mapping from RFC 6933, + the entPhysicalParentRelPos integer value SHOULD be + encoded as an integer string."; reference "RFC 6933: Entity MIB (Version 4) - entPhysicalParentRelPos"; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2023-06-27.yang b/experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2026-04-20.yang similarity index 83% rename from experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2023-06-27.yang rename to experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2026-04-20.yang index dc8ef269f..982b2db24 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2023-06-27.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-te-path-computation@2026-04-20.yang @@ -6,8 +6,8 @@ module ietf-te-path-computation { import ietf-te { prefix te; reference - "RFCYYYY: A YANG Data Model for Traffic Engineering Tunnels - and Interfaces"; + "RFC YYYY: A YANG Data Model for Traffic Engineering Tunnels + and Interfaces"; } /* Note: The RFC Editor will replace YYYY with the number assigned @@ -16,8 +16,8 @@ module ietf-te-path-computation { import ietf-te-types { prefix te-types; reference - "RFCZZZZ: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC ZZZZ: Updated Common YANG Data Types for Traffic + Engineering"; } /* Note: The RFC Editor will replace ZZZZ with the number assigned @@ -70,7 +70,7 @@ module ietf-te-path-computation { The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2023 IETF Trust and the persons + Copyright (c) 2026 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with @@ -94,7 +94,7 @@ module ietf-te-path-computation { // replace the revision date with the module publication date // the format is (year-month-day) - revision 2023-06-27 { + revision 2026-04-20 { description "Initial revision"; reference @@ -103,27 +103,26 @@ module ietf-te-path-computation { // RFC Ed.: replace XXXX with actual RFC number and remove // this note - /* * Features */ feature svec { description - "This feature indicates that the server supports synchronized - path computation requests."; + "This feature indicates that the server supports synchronized + path computation requests."; reference - "Section 7.13 of RFC5440: Path Computation Element (PCE) - Communication Protocol (PCEP)."; + "RFC 5440: Path Computation Element (PCE) Communication + Protocol (PCEP), Section 7.13"; } feature compute-priority { description - "This feature indicates that the server supports path - computation request's priority"; + "This feature indicates that the server supports path + computation request's priority"; reference - "Section 7.4.1 of RFC5440: Path Computation Element (PCE) - Communication Protocol (PCEP)."; + "RFC 5440: Path Computation Element (PCE) Communication + Protocol (PCEP), Section 7.4.1"; } /* @@ -134,10 +133,10 @@ module ietf-te-path-computation { base te-types:tunnel-action-type; description "Action type to delete the transient states - of computed paths, as described in section 3.3.1 of - RFC XXXX."; + of computed paths."; reference - "RFC XXXX: A YANG Data Model for requesting path computation"; + "RFC XXXX: A YANG Data Model for requesting path computation, + Section 3.3.1"; } /* @@ -228,27 +227,27 @@ module ietf-te-path-computation { default "10"; description "The timeout after which the transient state reporting - the computed path SHOULD be removed."; + the computed path SHOULD be removed."; } leaf transaction-id { type string; description "The transaction-id associated with this path computation - to be used for fast deletion of the transient states - associated with multiple path computations. + to be used for fast deletion of the transient states + associated with multiple path computations. - This transaction-id can be used to explicitly delete all - the transient states of all the computed paths associated - with the same transaction-id. + This transaction-id can be used to explicitly delete all + the transient states of all the computed paths associated + with the same transaction-id. - When one path associated with a transaction-id is setup, - the transient states of all the other computed paths - with the same transaction-id are automatically removed. + When one path associated with a transaction-id is setup, + the transient states of all the other computed paths + with the same transaction-id are automatically removed. - If not specified, the transient state is removed only - when the timer expires (when the timer is specified) - or not created at all (stateless path computation, - when the timer is not specified)."; + If not specified, the transient state is removed only + when the timer expires (when the timer is specified) + or not created at all (stateless path computation, + when the timer is not specified)."; } } } // grouping requested-state @@ -387,8 +386,9 @@ module ietf-te-path-computation { description "SVEC metric type."; reference - "RFC5541: Encoding of Objective Functions in the Path - Computation Element Communication Protocol (PCEP)."; + "RFC 5541: Encoding of Objective Functions in the Path + Computation Element Communication Protocol + (PCEP)"; } leaf upper-bound { type uint64; @@ -433,7 +433,7 @@ module ietf-te-path-computation { } description "TE path metric type usable for computing a set of - synchronized requests"; + synchronized requests"; } leaf weight { type uint8; @@ -443,8 +443,7 @@ module ietf-te-path-computation { } } case objective-function { - if-feature - "te-types:path-optimization-objective-function"; + if-feature "te-types:path-optimization-objective-function"; container objective-function { description "The objective function container that includes @@ -512,23 +511,23 @@ module ietf-te-path-computation { within the RPC request by the request-id."; } leaf compute-priority { - if-feature compute-priority; + if-feature "compute-priority"; type uint8; - default 0; + default "0"; description - "The path computation request's priority (from 1 to 7) - which can be used to constraint the order by which the - path computation server processes the path computation - requests. + "The path computation request's priority (from 1 to 7) + which can be used to constraint the order by which the + path computation server processes the path computation + requests. - A higher numerical value of the priority field reflects a - higher priority. + A higher numerical value of the priority field reflects a + higher priority. - It MUST be set to the default value (i.e., 0) when - unused."; + It MUST be set to the default value (i.e., 0) when + unused."; reference - "Section 7.4.1 of RFC5440: Path Computation Element (PCE) - Communication Protocol (PCEP)."; + "RFC 5440: Path Computation Element (PCE) Communication + Protocol (PCEP), Section 7.4.1"; } choice tunnel-attributes { default "value"; @@ -541,14 +540,14 @@ module ietf-te-path-computation { container tunnel-reference { description "Attributes for a requested path that belongs to - either an exiting te-tunnel or to an entry in the - tunnel-attributes list."; + either an exiting te-tunnel or to an entry in the + tunnel-attributes list."; choice tunnel-exist { mandatory true; description "Whether the tunnel reference is to an existing - te-tunnel or to an entry in the tunnel-attributes - list"; + te-tunnel or to an entry in the tunnel-attributes + list"; case tunnel-ref { leaf tunnel-ref { type te:tunnel-ref; @@ -561,8 +560,8 @@ module ietf-te-path-computation { leaf tunnel-attributes-ref { type leafref { path "/te:tunnels-path-compute/" - + "te:path-compute-info/" - + "te-pc:tunnel-attributes/te-pc:tunnel-name"; + + "te:path-compute-info/" + + "te-pc:tunnel-attributes/te-pc:tunnel-name"; } mandatory true; description @@ -579,8 +578,8 @@ module ietf-te-path-computation { mandatory true; description "Whether this path is a primary, or a reverse - primary, or a secondary, or a reverse secondary - path."; + primary, or a secondary, or a reverse secondary + path."; case primary-path { container primary-path { presence "Indicates that the requested path @@ -598,12 +597,12 @@ module ietf-te-path-computation { leaf secondary-reverse-path { type leafref { path "/te:tunnels-path-compute/" - + "te:path-compute-info/te-pc:path-request/" - + "te-pc:request-id"; + + "te:path-compute-info/" + + "te-pc:path-request/te-pc:request-id"; } description - "A reference to the reverse secondary path - when co-routed with the secondary path."; + "A reference to the reverse secondary path + when co-routed with the secondary path."; } leaf preference { type uint8 { @@ -611,32 +610,32 @@ module ietf-te-path-computation { } default "1"; description - "Specifies a preference for this path. The - lower the number higher the preference."; + "Specifies a preference for this path. The + lower the number higher the preference."; } uses protection-restoration-properties; list primary-path-ref { min-elements 1; description "The list of primary paths that reference - this path as a candidate secondary path"; + this path as a candidate secondary path"; choice primary-path-exist { mandatory true; description "Whether the path reference is to an existing - te-tunnel path or to another path request"; + te-tunnel path or to another path request"; case path-ref { leaf primary-path-ref { type leafref { path "/te:te/te:tunnels/te:tunnel" - + "[te:name=current()/../../../" - + "tunnel-ref]/te:primary-paths/" - + "te:primary-path/te:name"; + + "[te:name=current()/../../../" + + "tunnel-ref]/te:primary-paths/" + + "te:primary-path/te:name"; } must '../../../tunnel-ref' { description "The primary-path can be referenced - if also the tunnel is referenced."; + if also the tunnel is referenced."; } mandatory true; description @@ -647,9 +646,9 @@ module ietf-te-path-computation { leaf path-request-ref { type leafref { path "/te:tunnels-path-compute/" - + "te:path-compute-info/" - + "te-pc:path-request/" - + "te-pc:request-id"; + + "te:path-compute-info/" + + "te-pc:path-request/" + + "te-pc:request-id"; } mandatory true; description @@ -668,21 +667,21 @@ module ietf-te-path-computation { mandatory true; description "Whether the path reference to the primary - paths for which this path is the reverse-path - is to an existing te-tunnel path or to - another path request."; + paths for which this path is the reverse-path + is to an existing te-tunnel path or to + another path request."; case path-ref { leaf primary-path-ref { type leafref { path "/te:te/te:tunnels/te:tunnel[te:name" - + "=current()/../../tunnel-ref]/" - + "te:primary-paths/te:primary-path/" - + "te:name"; + + "=current()/../../tunnel-ref]/" + + "te:primary-paths/te:primary-path/" + + "te:name"; } must '../../tunnel-ref' { description "The primary-path can be referenced - if also the tunnel is referenced."; + if also the tunnel is referenced."; } mandatory true; description @@ -693,9 +692,9 @@ module ietf-te-path-computation { leaf path-request-ref { type leafref { path "/te:tunnels-path-compute/" - + "te:path-compute-info/" - + "te-pc:path-request/" - + "te-pc:request-id"; + + "te:path-compute-info/" + + "te-pc:path-request/" + + "te-pc:request-id"; } mandatory true; description @@ -716,33 +715,33 @@ module ietf-te-path-computation { } default "1"; description - "Specifies a preference for this path. The - lower the number higher the preference."; + "Specifies a preference for this path. The + lower the number higher the preference."; } uses protection-restoration-properties; list primary-reverse-path { min-elements 1; description "The list of primary reverse paths that - reference this path as a candidate - secondary reverse path"; + reference this path as a candidate + secondary reverse path"; choice primary-reverse-path-exist { mandatory true; description "Whether the path reference is to an existing - te-tunnel path or to another path request"; + te-tunnel path or to another path request"; case path-ref { leaf primary-path-ref { type leafref { path "/te:te/te:tunnels/te:tunnel" - + "[te:name=current()/../../../" - + "tunnel-ref]/te:primary-paths/" - + "te:primary-path/te:name"; + + "[te:name=current()/../../../" + + "tunnel-ref]/te:primary-paths/" + + "te:primary-path/te:name"; } must '../../../tunnel-ref' { description "The primary-path can be referenced - if also the tunnel is referenced."; + if also the tunnel is referenced."; } mandatory true; description @@ -753,14 +752,14 @@ module ietf-te-path-computation { leaf path-request-ref { type leafref { path "/te:tunnels-path-compute/" - + "te:path-compute-info/" - + "te-pc:path-request/" - + "te-pc:request-id"; + + "te:path-compute-info/" + + "te-pc:path-request/" + + "te-pc:request-id"; } mandatory true; description "The referenced primary reverse path - request"; + request"; } } // case path-request-ref } // choice primary-reverse-path-exist @@ -785,19 +784,19 @@ module ietf-te-path-computation { when 'not (./source) and not (./destination)' { description "When the tunnel attributes are specified by value - within this path computation, it is assumed that the - requested path will be the only path of a tunnel. + within this path computation, it is assumed that the + requested path will be the only path of a tunnel. - If the requested path is a transit segment path - (i.e., the source and destination containers are - not present), it could be of any type. Otherwise it - could only be a primary path."; + If the requested path is a transit segment path + (i.e., the source and destination containers are + not present), it could be of any type. Otherwise it + could only be a primary path."; } - default primary-path; + default "primary-path"; description "Indicates whether the requested path is a primary - path, a secondary path, a reverse primary path or a - reverse secondary path."; + path, a secondary path, a reverse primary path or a + reverse secondary path."; case primary-path { description "The requested path is a primary path."; @@ -805,10 +804,10 @@ module ietf-te-path-computation { container secondary-path { presence "Indicates that the requested path is a secondary - path."; + path."; description "The name of the primary path which the requested - secondary path belongs to."; + secondary path belongs to."; leaf primary-path-name { type string; description @@ -818,10 +817,10 @@ module ietf-te-path-computation { container primary-reverse-path { presence "Indicates that the requested path is a primary - reverse path."; + reverse path."; description "The name of the primary path which the requested - primary reverse path belongs to."; + primary reverse path belongs to."; leaf primary-path-name { type string; description @@ -831,11 +830,11 @@ module ietf-te-path-computation { container secondary-reverse-path { presence "Indicates that the requested path is a secondary - reverse path."; + reverse path."; description "The names of the primary path and of the primary - reverse path which the requested secondary reverse - path belongs to."; + reverse path which the requested secondary reverse + path belongs to."; leaf primary-path-name { type string; description @@ -896,14 +895,14 @@ module ietf-te-path-computation { } } uses synchronization-info { - if-feature svec; + if-feature "svec"; } } // path-compute rpc input augment "/te:tunnels-path-compute/te:output/" + "te:path-compute-result" { description - "Auguments Path Computation RPC output"; + "Augments Path Computation RPC output"; list response { key "response-id"; config false; @@ -952,4 +951,5 @@ module ietf-te-path-computation { } } } // path-delete rpc output + } diff --git a/experimental/ietf-extracted-YANG-modules/ietf-voucher-request@2025-12-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-voucher-request@2025-12-18.yang index b4f795964..f508bb58f 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-voucher-request@2025-12-18.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-voucher-request@2025-12-18.yang @@ -137,7 +137,7 @@ module ietf-voucher-request { "An X.509 v3 certificate structure as specified by RFC 5280, Section 4 encoded using the ASN.1 distinguished encoding rules (DER), as specified - in [ITU-T.X690.2015]. + in [ITU.X690.2015]. The first certificate in the Registrar TLS server certificate_list sequence (the end-entity TLS @@ -154,7 +154,13 @@ module ietf-voucher-request { the voucher-request. The proximity-registrar-pubk is the Raw Public Key of the Registrar. This field is encoded - as specified in RFC7250, section 3."; + as specified in RFC7250, section 3. + The ECDSA algorithm MUST be supported. + The EdDSA algorithm as specified in + draft-ietf-tls-rfc4492bis-17 SHOULD be supported. + Support for the DSA algorithm is not recommended. + Support for the RSA algorithm is a MAY, but due to + size is discouraged."; } leaf proximity-registrar-pubk-sha256 { type binary; @@ -195,7 +201,7 @@ module ietf-voucher-request { "An X.509 v3 certificate structure, as specified by RFC 5280, Section 4, encoded using the ASN.1 distinguished encoding rules (DER), as specified - in ITU-T X.690. + in ITU X.690. The first certificate in the registrar TLS server certificate_list sequence (the end-entity TLS certificate; see RFC 8446) presented by the @@ -204,7 +210,7 @@ module ietf-voucher-request { This MUST be populated in a pledge's voucher-request when an agent-proximity assertion is requested."; reference - "ITU-T X.690: Information Technology - ASN.1 encoding + "ITU X.690: Information Technology - ASN.1 encoding rules: Specification of Basic Encoding Rules (BER), Canonical Encoding Rules (CER) and Distinguished Encoding Rules (DER) @@ -220,7 +226,7 @@ module ietf-voucher-request { "An X.509 v3 certificate structure, as specified by RFC 5280, Section 4, encoded using the ASN.1 distinguished encoding rules (DER), as specified - in ITU-T X.690. + in ITU X.690. This certificate can be used by the pledge, the registrar, and the MASA to verify the signature of agent-signed-data. It is an optional component @@ -229,7 +235,7 @@ module ietf-voucher-request { voucher-request when an agent-proximity assertion is requested."; reference - "ITU-T.X690.2015: Information Technology - ASN.1 encoding + "ITU X.690: Information Technology - ASN.1 encoding rules: Specification of Basic Encoding Rules (BER), Canonical Encoding Rules (CER) and Distinguished Encoding Rules (DER) diff --git a/experimental/ietf-extracted-YANG-modules/ietf-voucher@2025-12-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-voucher@2025-12-18.yang index 10448c3e9..fa392ffda 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-voucher@2025-12-18.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-voucher@2025-12-18.yang @@ -171,7 +171,7 @@ module ietf-voucher { as some manufacturers know that all serial-numbers are unique within the scope of a MASA. In the voucher request, whether it is mandatory or optional depends - upon the which protocol is used, such as RFC8995 and variations. + upon which protocol is used, such as RFC8995 and variations. When processing a voucher, a pledge MUST ensure that its IDevID Authority Key Identifier matches this value. If no match occurs, then the pledge MUST NOT process this diff --git a/experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2025-10-20.yang b/experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2026-02-27.yang similarity index 90% rename from experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2025-10-20.yang rename to experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2026-02-27.yang index 6ff1a8c0a..1eadb2759 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2025-10-20.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-wdm-tunnel@2026-02-27.yang @@ -1,24 +1,23 @@ module ietf-wdm-tunnel { yang-version 1.1; - namespace - "urn:ietf:params:xml:ns:yang:ietf-wdm-tunnel"; - prefix "wdm-tnl"; + namespace "urn:ietf:params:xml:ns:yang:ietf-wdm-tunnel"; + prefix wdm-tnl; import ietf-te { - prefix "te"; + prefix te; reference "RFC YYYY: A YANG Data Model for Traffic Engineering Tunnels, - Label Switched Paths and Interfaces."; + Label Switched Paths and Interfaces."; } + /* RFC Ed.: replace YYYY with the number assigned to the RFC once draft-ietf-teas-yang-te becomes an RFC.*/ import ietf-layer0-types { - prefix "l0-types"; + prefix l0-types; } - import ietf-yang-types { - prefix "yang"; + prefix yang; } organization @@ -41,33 +40,28 @@ module ietf-wdm-tunnel { Editor: Aihua Guo "; - description "This module defines a YANG data model for configuring and managing Wavelength-Division Multiplexing (WDM) switched optical tunnels. - The model fully conforms to the Network Management - Datastore Architecture (NMDA). + Copyright (c) 2026 IETF Trust and the persons + identified as authors of the code. All rights reserved. - Copyright (c) 2021 IETF Trust and the persons - identified as authors of the code. All rights reserved. + Redistribution and use in source and binary forms, with or + without modification, is permitted pursuant to, and subject + to the license terms contained in, the Revised BSD License + set forth in Section 4.c of the IETF Trust's Legal Provisions + Relating to IETF Documents + (https://trustee.ietf.org/license-info). - Redistribution and use in source and binary forms, with or - without modification, is permitted pursuant to, and subject - to the license terms contained in, the Simplified BSD License - set 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; see + the RFC itself for full legal notices."; - This version of this YANG module is part of RFC XXXX; see - the RFC itself for full legal notices."; - - revision "2025-10-20" { + revision 2026-02-27 { description "Updated revision with combined WSON and Flexi-grid tunnel YANG model"; - reference "RFC XXXX: YANG data model for WDM tunnels"; // RFC Ed.: replace XXXX with actual RFC number, update date @@ -77,10 +71,12 @@ module ietf-wdm-tunnel { /* * Identities */ + identity otsig-termination-type { description "Digital termination type applicable to OTSiG"; } + identity otsi-lane-termination-type { description "Digital termination type applicable to a single OTSi. @@ -89,24 +85,28 @@ module ietf-wdm-tunnel { in the transmitting direction or immediately after inverse multiplexing in the receiving direction."; } + identity digital-mapping-type { description "Digital mapping type for the client payload of transceivers"; } + identity inverse-mux-type { description "Inverse multiplexing type"; } + identity otsig-regeneration-layer { description "Level of 3R regeneration"; } - //TBD: types to be added + //TBD: types to be added /* * Groupings */ + grouping additional-transceiver-configuration-constraints { description "This grouping defines additional optional constraints for @@ -123,46 +123,39 @@ module ietf-wdm-tunnel { For instance, if the frequency is restricted to the C-band, the list of operational modes should not include any modes applicable only to the L-band."; - leaf otsi-carrier-frequency { - type l0-types:frequency-thz; - description - "OTSi carrier frequency, i.e. configured transmitter - frequency."; + type l0-types:frequency-thz; + description + "OTSi carrier frequency, i.e. configured transmitter + frequency."; } - container tx-tune-constraints { description "The permissible tuning frequency range for the transmitter."; - uses l0-types:transceiver-tuning-range; } - leaf-list line-coding-bitrate { type identityref { base l0-types:line-coding; } description - "The list of the bit rate/line coding of the optical - tributary signal that constrains the configuration of - the transceiver."; - reference + "The list of the bit rate/line coding of the optical + tributary signal that constrains the configuration of + the transceiver."; + reference "ITU-T G.698.2 section 7.1.2"; } - leaf tx-channel-power { type l0-types:power-dbm; description "The preferred channel transmit power."; } - leaf preferred-rx-channel-power { type l0-types:power-dbm; description "The preferred channel received power."; } - uses l0-types:path-constraints; } @@ -170,15 +163,13 @@ module ietf-wdm-tunnel { description "This grouping defines constraints for transceiver configurations"; - leaf-list operational-modes { - type string { + type string { length "1..255"; } description "List of operational mode ids of the transceiver."; } - uses additional-transceiver-configuration-constraints; } @@ -186,7 +177,6 @@ module ietf-wdm-tunnel { description "This grouping specifies common configurations for transceivers."; - leaf transceiver-id { type uint32; description @@ -194,15 +184,15 @@ module ietf-wdm-tunnel { } leaf otsi-carrier-id { type uint16; - description - "OTSi carrier identifier associated with the - transceiver."; + description + "OTSi carrier identifier associated with the + transceiver."; } leaf otsi-carrier-frequency { - type l0-types:frequency-thz; - description - "OTSi carrier frequency, i.e. configured transmitter - frequency."; + type l0-types:frequency-thz; + description + "OTSi carrier frequency, i.e. configured transmitter + frequency."; } leaf tx-channel-power { type l0-types:power-dbm; @@ -216,7 +206,6 @@ module ietf-wdm-tunnel { "This grouping specifies common states for incoming and outgoing transceivers associated with a regenerator group."; - leaf operational-mode { type string { length "1..255"; @@ -224,7 +213,6 @@ module ietf-wdm-tunnel { description "Operational mode of the transceiver."; } - leaf line-coding-bitrate { type identityref { base l0-types:line-coding; @@ -243,15 +231,12 @@ module ietf-wdm-tunnel { "This grouping specifies common configurations for incoming and outgoing transceivers associated with a regenerator group."; - uses regenerator-incoming-outgoing-common-state; - leaf preferred-rx-channel-power { type l0-types:power-dbm; description "The preferred channel received power."; } - uses l0-types:path-constraints; } @@ -260,35 +245,30 @@ module ietf-wdm-tunnel { "This grouping specifies the configuration of digital layer termination applicable to the transceivers."; - container digital-terminations { description "Digital layer termination applicable to the transceivers."; - list digital-termination { key "index"; description "Sequence of digital layer terminations."; - leaf index { type uint8; description "An index number used to identify entries in the list, organized in ascending order of their values."; } - leaf termination-type { type identityref { base otsig-termination-type; } description - "Digital layer termination before/after inverse - multiplexing in the tx/rx direction of the transceiver, - that applies to the whole OTSiG, also applicable to - the special case when there is a single OTSi in the - OTSiG, i.e. without inverse multiplexing."; + "Digital layer termination before/after inverse + multiplexing in the tx/rx direction of the transceiver, + that applies to the whole OTSiG, also applicable to + the special case when there is a single OTSi in the + OTSiG, i.e. without inverse multiplexing."; } - leaf mapping-type { type identityref { base digital-mapping-type; @@ -305,15 +285,11 @@ module ietf-wdm-tunnel { description "This grouping specifies inverse-multiplexing configurations applicable to multi-carrier transceivers."; - container inverse-multiplexing { - presence - "When present, it indicates that the transceiver - supports inverse multiplexing."; - + presence "When present, it indicates that the transceiver + supports inverse multiplexing."; description "Transceiver configuration for inverse multiplexing."; - leaf inverse-mux-type { type identityref { base inverse-mux-type; @@ -321,7 +297,6 @@ module ietf-wdm-tunnel { description "Type of inverse multiplexing."; } - leaf otsi-lane-termination-type { type identityref { base otsi-lane-termination-type; @@ -332,13 +307,11 @@ module ietf-wdm-tunnel { transceiver, that applies to a single OTSi within the inverse multiplexing group."; } - container additional-transceivers { description "Configuration for additional transceivers with an index value 1 and higher within the same inverse multiplexing group."; - leaf index { type uint8 { range "1..max"; @@ -347,7 +320,6 @@ module ietf-wdm-tunnel { "The index of the transceiver in the inverse multiplexing group starting from value 1."; } - uses transceiver-common-config; } } @@ -358,32 +330,27 @@ module ietf-wdm-tunnel { "This grouping specifies configurations for transceivers at source, destination nodes, as well as at regenerator nodes with a single pair of regenerator."; - leaf transponder-id { type uint32; - description "transponder identifier"; + description + "transponder identifier"; } - uses transponder-digital-termination-config; - container transceiver { description - "Specifies transceiver configurations. The attributes - specified in this container, excluding those within - the inverse-multiplexing container, apply to a single - transceiver when inverse multiplexing is not supported, - as well as to the first transceiver, identified by an - index value of 0 when inverse multiplexing is enabled. - - Attributes within the inverse-multiplexing container - are applicable exclusively to transceivers with an - index value of 1 or higher, belonging to the same - inverse multiplexing group."; - + "Specifies transceiver configurations. The attributes + specified in this container, excluding those within + the inverse-multiplexing container, apply to a single + transceiver when inverse multiplexing is not supported, + as well as to the first transceiver, identified by an + index value of 0 when inverse multiplexing is enabled. + + Attributes within the inverse-multiplexing container + are applicable exclusively to transceivers with an + index value of 1 or higher, belonging to the same + inverse multiplexing group."; uses transceiver-common-config; - uses regenerator-incoming-outgoing-common-config; - uses transceiver-inverse-multiplexing-config; } } @@ -393,16 +360,15 @@ module ietf-wdm-tunnel { "This grouping specifies configurations for transceivers at at regenerator nodes with multiple pairs of regenerators."; - leaf transponder-id { type uint32; - description "transponder identifier"; + description + "transponder identifier"; } container transceiver { description - "Specifies transceiver configurations at a regenerator - node with multiple pairs of regenerators."; - + "Specifies transceiver configurations at a regenerator + node with multiple pairs of regenerators."; uses transceiver-common-config; } } @@ -410,8 +376,7 @@ module ietf-wdm-tunnel { grouping regenerator-common-config { description "This grouping defines a set of common attributes - applicable to 3R regenerators."; - + applicable to 3R regenerators."; leaf regen-group-id { type uint32; description @@ -423,21 +388,21 @@ module ietf-wdm-tunnel { } description "Indicate the chosen level of digital layer - regeneration, e.g. ODU, FlexOnM, before/after inverse - multiplexing in the tx/rx direction, that applies to - the whole OTSiG. It also applies to the case when - there is only one OTSi in the OTSiG, i.e. without - inverse multiplexing, in which case the number of - OTSis in the OTSiGs before/after the regenerator - may be different."; + regeneration, e.g. ODU, FlexOnM, before/after inverse + multiplexing in the tx/rx direction, that applies to + the whole OTSiG. It also applies to the case when + there is only one OTSi in the OTSiG, i.e. without + inverse multiplexing, in which case the number of + OTSis in the OTSiGs before/after the regenerator + may be different."; } } + grouping path-transceiver-config { description "This grouping defines a set of transceivers on a node, serving as either source transceivers, destination transceivers, or regenerators."; - choice node-position { description "The relative position of the node within the path."; @@ -446,7 +411,6 @@ module ietf-wdm-tunnel { description "Constraints for configuring transceivers at the source node transponder."; - uses transceiver-config; } } @@ -455,7 +419,6 @@ module ietf-wdm-tunnel { description "Constraints for configuring transceivers at the source node transponder."; - uses transceiver-config; } } @@ -485,22 +448,17 @@ module ietf-wdm-tunnel { transponder, labeled 'outgoing', receives and transmits signal from/to the same segment of the optical path toward the destination."; - uses regenerator-common-config; - container incoming-transponder { description "Constraints for transceiver configurations in the incoming direction of the regenerator."; - uses transceiver-config; } - container outgoing-transponder { description "Constraints for transceiver configurations at the outgoing direction of the regenerator"; - uses transceiver-config; } } @@ -533,30 +491,23 @@ module ietf-wdm-tunnel { multiple transponder, labeled 'outgoing', receives and transmits signal from/to the same segment of the optical path toward the destination."; - container common-incoming { description "Common configuration for transponders in the incoming direction."; - uses regenerator-incoming-outgoing-common-config; } - container common-outgoing { description "Common configuration for transponders in the outgoing direction."; - uses regenerator-incoming-outgoing-common-config; } - list regenerator { key "index"; - description "A list of regenerators used at the regenerator node."; - leaf index { type uint8; description @@ -565,20 +516,16 @@ module ietf-wdm-tunnel { values."; } uses regenerator-common-config; - container incoming-transponder { description "Constraints for transceiver configurations in the incoming direction of the regenerator."; - uses multi-regen-transceiver-config; } - container outgoing-transponder { description "Constraints for transceiver configurations at the outgoing direction of the regenerator"; - uses multi-regen-transceiver-config; } } @@ -590,18 +537,15 @@ module ietf-wdm-tunnel { grouping transceiver-measured-parameters { description "Measured transceiver parameters."; - container pre-fec-ber { description "Timestamp and value of the Pre-FEC Bit Error Rate (BER) of the received signal."; - leaf timestamp { type yang:timestamp; description "Timestamp associated with the Pre-FEC BER."; } - leaf value { type decimal64 { fraction-digits 18; @@ -610,18 +554,15 @@ module ietf-wdm-tunnel { "Pre-FEC BER of the received signal."; } } - container q-factor { description "Timestamp and value of the estimated Q-factor based on the pre-FEC BER."; - leaf timestamp { type yang:timestamp; description "Timestamp associated with the Q-factor."; } - leaf value { type l0-types:decimal-2-or-unknown; units "dB"; @@ -636,34 +577,28 @@ module ietf-wdm-tunnel { "This grouping specifies transceiver state parameters at source, destination nodes, as well as at regenerator nodes with a single pair of regenerator."; - leaf transponder-id { type uint32; - description "transponder identifier"; + description + "transponder identifier"; } - uses transponder-digital-termination-config; - container transceiver { description - "Specifies transceiver states. The attributes - specified in this container, excluding those within - the inverse-multiplexing container, apply to a single - transceiver when inverse multiplexing is not supported, - as well as to the first transceiver, identified by an - index value of 0 when inverse multiplexing is enabled. - - Attributes within the inverse-multiplexing container - are applicable exclusively to transceivers with an - index value of 1 or higher, belonging to the same - inverse multiplexing group."; - + "Specifies transceiver states. The attributes + specified in this container, excluding those within + the inverse-multiplexing container, apply to a single + transceiver when inverse multiplexing is not supported, + as well as to the first transceiver, identified by an + index value of 0 when inverse multiplexing is enabled. + + Attributes within the inverse-multiplexing container + are applicable exclusively to transceivers with an + index value of 1 or higher, belonging to the same + inverse multiplexing group."; uses transceiver-common-config; - uses regenerator-incoming-outgoing-common-state; - uses l0-types:common-transceiver-readonly-param; - uses transceiver-inverse-multiplexing-config; } } @@ -672,20 +607,19 @@ module ietf-wdm-tunnel { description "This grouping includes end-to-end media channel path id information."; - leaf-list e2e-mc-path-id { type uint16; description "The list of the possible end-to-end Media Channel - (e2e-MC) paths associated with the OTSi which have - different optical impairments. + (e2e-MC) paths associated with the OTSi which have + different optical impairments. - This list is meaningful in case the OTSi can be associated - with multiple end-to-end Media Channel (e2e-MC) paths - (e.g., when OPS protection is configured). + This list is meaningful in case the OTSi can be associated + with multiple end-to-end Media Channel (e2e-MC) paths + (e.g., when OPS protection is configured). - The list can be empty when the OTSi has only one - e2e-MC path."; + The list can be empty when the OTSi has only one + e2e-MC path."; } } @@ -694,7 +628,6 @@ module ietf-wdm-tunnel { "This grouping defines a set of transceivers on a node, serving as either source transceivers, destination transceivers, or regenerators."; - choice node-position { description "The relative position of the node within the path."; @@ -702,7 +635,6 @@ module ietf-wdm-tunnel { container source-transponder { description "Transceiver states at the source node transponder."; - uses transceiver-state; } } @@ -711,7 +643,6 @@ module ietf-wdm-tunnel { description "Transceiver states at the destination node transponder."; - uses transceiver-state; } } @@ -740,22 +671,17 @@ module ietf-wdm-tunnel { transponder, labeled 'outgoing', receives and transmits signal from/to the same segment of the optical path toward the destination."; - uses regenerator-common-config; - container incoming-transponder { description "Constraints for transceiver configurations in the incoming direction of the regenerator."; - uses transceiver-state; } - container outgoing-transponder { description "Constraints for transceiver configurations at the outgoing direction of the regenerator"; - uses transceiver-state; } } @@ -786,30 +712,23 @@ module ietf-wdm-tunnel { multiple transponder, labeled 'outgoing', receives and transmits signal from/to the same segment of the optical path toward the destination."; - container common-incoming { description "Common configuration for transponders in the incoming direction."; - uses regenerator-incoming-outgoing-common-state; } - container common-outgoing { description "Common configuration for transponders in the outgoing direction."; - uses regenerator-incoming-outgoing-common-state; } - list regenerator { key "index"; - description "A list of regenerators used at the regenerator node."; - leaf index { type uint8; description @@ -818,20 +737,16 @@ module ietf-wdm-tunnel { values."; } uses regenerator-common-config; - container incoming-transponder { description "Constraints for transceiver configurations in the incoming direction of the regenerator."; - uses multi-regen-transceiver-config; } - container outgoing-transponder { description "Constraints for transceiver configurations at the outgoing direction of the regenerator"; - uses multi-regen-transceiver-config; } } @@ -844,11 +759,9 @@ module ietf-wdm-tunnel { description "This grouping defines the constraints for transceiver configurations."; - container transceiver-constraint { description "Constraints for transceiver configurations"; - uses transceiver-constraints; } } @@ -856,23 +769,19 @@ module ietf-wdm-tunnel { grouping wdm-constraint { description "Grouping for WDM tunnel constraints"; - container wdm-constraint { description "WDM tunnel constraints."; - uses global-transceiver-constraint; - leaf use-regen { type boolean; - default false; + default "false"; description "Indicate whether or not regenerators (e.g. 3R) should be considered. When this parameter is set to true, the tunnel path may include a regen when the path is not feasible for direct optical reach."; } - /* leaf-list regen-levels { when '../use-regen = "true"' { @@ -886,8 +795,7 @@ module ietf-wdm-tunnel { "Indicate the levels of 3R regeration permitted by the tunnel."; } - */ - + */ leaf wavelength-conversion { when '../use-regen = "true"' { description @@ -895,32 +803,28 @@ module ietf-wdm-tunnel { to be considered."; } type boolean; - default false; + default "false"; description "Indicate whether or not wavelength conversion is allowed along the tunnel path. Applicable only when 3R regeneration is enabled."; } - uses l0-types:tunnel-attributes; - leaf guard-band-size { type l0-types:frequency-thz; description "Guard band size in THz."; } - leaf matching-fwd-rev-wavelength { type boolean; - default true; + default "true"; description "Indicate whether or not the assigned channels for forward and reverse wavelength path must be the same."; } - leaf allow-retuning { type boolean; - default false; + default "false"; description "Indicate whether or not re-tuning is allowed when one or more paths of a WDM tunnel is being restored. Typically, @@ -940,10 +844,10 @@ module ietf-wdm-tunnel { /* * Data nodes */ - /* * Global constraints for WDM tunnel */ + augment "/te:te/te:tunnels/te:tunnel" { description "Augment with additional parameters required for WDM @@ -957,6 +861,7 @@ module ietf-wdm-tunnel { * Applicable to starting, terminating and regenerator * transceivers. */ + augment "/te:te/te:tunnels/te:tunnel/te:primary-paths/" + "te:primary-path/te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/" @@ -964,7 +869,6 @@ module ietf-wdm-tunnel { description "Augment TE primary explicit path (include or exclude) with transceiver configurations."; - uses path-transceiver-config; } @@ -975,7 +879,6 @@ module ietf-wdm-tunnel { description "Augment TE primary explicit path (exclude always) with transceiver configurations."; - uses path-transceiver-config; } @@ -984,6 +887,7 @@ module ietf-wdm-tunnel { * Applicable to starting, terminating and regenerator * transceivers. */ + augment "/te:te/te:tunnels/te:tunnel/te:primary-paths/" + "te:primary-path/te:primary-reverse-path/" + "te:explicit-route-objects/" @@ -992,7 +896,6 @@ module ietf-wdm-tunnel { description "Augment TE primary reverse explicit path (include or exclude) with transceiver configurations."; - uses path-transceiver-config; } @@ -1004,7 +907,6 @@ module ietf-wdm-tunnel { description "Augment TE primary reverse explicit path (exclude always) with transceiver configurations."; - uses path-transceiver-config; } @@ -1013,6 +915,7 @@ module ietf-wdm-tunnel { * Applicable to starting, terminating and regenerator * transceivers. */ + augment "/te:te/te:tunnels/te:tunnel/te:secondary-paths/" + "te:secondary-path/te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/" @@ -1020,7 +923,6 @@ module ietf-wdm-tunnel { description "Augment TE secondary explicit path (include or exclude) with transceiver configurations."; - uses path-transceiver-config; } @@ -1031,7 +933,6 @@ module ietf-wdm-tunnel { description "Augment TE secondary explicit path (exclude always) with transceiver configurations."; - uses path-transceiver-config; } @@ -1040,6 +941,7 @@ module ietf-wdm-tunnel { * Applicable to starting, terminating and regenerator * transceivers. */ + augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-reverse-paths/" + "te:secondary-reverse-path/" @@ -1049,7 +951,6 @@ module ietf-wdm-tunnel { description "Augment TE secondary reverse explicit path (include or exclude) with transceiver configurations."; - uses path-transceiver-config; } @@ -1062,13 +963,13 @@ module ietf-wdm-tunnel { description "Augment TE secondary reverse explicit path (exclude always) with transceiver configurations."; - uses path-transceiver-config; } /* * Computed transceiver properties for primary path. */ + augment "/te:te/te:tunnels/te:tunnel/te:primary-paths/" + "te:primary-path/te:computed-paths-properties/" + "te:computed-path-properties/te:path-properties/" @@ -1077,7 +978,6 @@ module ietf-wdm-tunnel { description "Augment TE computed primary path with transceiver properties."; - uses path-transceiver-state; } @@ -1091,7 +991,6 @@ module ietf-wdm-tunnel { description "Augment source transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1105,7 +1004,6 @@ module ietf-wdm-tunnel { description "Augment destination transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1120,7 +1018,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1135,7 +1032,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1149,7 +1045,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1163,13 +1058,13 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } /* * Computed transceiver properties for primary reverse path. */ + augment "/te:te/te:tunnels/te:tunnel/te:primary-paths/" + "te:primary-path/te:primary-reverse-path/" + "te:computed-paths-properties/" @@ -1179,7 +1074,6 @@ module ietf-wdm-tunnel { description "Augment TE computed primary path with transceiver properties."; - uses path-transceiver-state; } @@ -1194,7 +1088,6 @@ module ietf-wdm-tunnel { description "Augment source transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1209,7 +1102,6 @@ module ietf-wdm-tunnel { description "Augment destination transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1225,7 +1117,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1241,7 +1132,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1256,7 +1146,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1271,13 +1160,13 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } /* * Computed transceiver properties for secondary path. */ + augment "/te:te/te:tunnels/te:tunnel/te:secondary-paths/" + "te:secondary-path/te:computed-paths-properties/" + "te:computed-path-properties/te:path-properties/" @@ -1286,7 +1175,6 @@ module ietf-wdm-tunnel { description "Augment TE computed primary path with transceiver properties."; - uses path-transceiver-state; } @@ -1300,7 +1188,6 @@ module ietf-wdm-tunnel { description "Augment source transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1314,7 +1201,6 @@ module ietf-wdm-tunnel { description "Augment destination transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1329,7 +1215,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1344,7 +1229,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1358,7 +1242,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1372,13 +1255,13 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } /* * Computed transceiver properties for secondary reverse path. */ + augment "/te:te/te:tunnels/te:tunnel/te:secondary-reverse-paths/" + "te:secondary-reverse-path/te:computed-paths-properties/" + "te:computed-path-properties/te:path-properties/" @@ -1387,7 +1270,6 @@ module ietf-wdm-tunnel { description "Augment TE computed primary path with transceiver properties."; - uses path-transceiver-state; } @@ -1401,7 +1283,6 @@ module ietf-wdm-tunnel { description "Augment source transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1415,7 +1296,6 @@ module ietf-wdm-tunnel { description "Augment destination transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1430,7 +1310,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1445,7 +1324,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1459,7 +1337,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional estimated parameters."; - uses l0-types:path-properties; } @@ -1473,20 +1350,19 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional estimated parameters."; - uses l0-types:path-properties; } /* * Actual transceiver state. */ + augment "/te:te/te:lsps/te:lsp/" + "te:lsp-actual-route-information/" + "te:lsp-actual-route-information/te:type/" + "te:numbered-node-hop/te:numbered-node-hop" { description "Augment TE LSP with WDM path state."; - uses path-transceiver-state; } @@ -1499,7 +1375,6 @@ module ietf-wdm-tunnel { description "Augment source transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1512,7 +1387,6 @@ module ietf-wdm-tunnel { description "Augment destination transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1526,7 +1400,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1540,7 +1413,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1553,7 +1425,6 @@ module ietf-wdm-tunnel { description "Augment regen incoming transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1566,7 +1437,6 @@ module ietf-wdm-tunnel { description "Augment regen outgoing transceiver with additional measured parameters."; - uses transceiver-measured-parameters; } @@ -1577,7 +1447,6 @@ module ietf-wdm-tunnel { description "Augment TE LSP with end-to-end media channel information."; - uses e2e-media-channel-info; } @@ -1588,7 +1457,6 @@ module ietf-wdm-tunnel { description "Augment TE LSP with end-to-end media channel information."; - uses e2e-media-channel-info; } @@ -1601,7 +1469,7 @@ module ietf-wdm-tunnel { + "te:label-restrictions/te:label-restriction" { description "Augment TE label range information for the ingress segment - of the named path constraint."; + of the named path constraint."; uses l0-types:wdm-label-range-info; } @@ -1611,7 +1479,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the egress segment - of the named path constraint."; + of the named path constraint."; uses l0-types:wdm-label-range-info; } @@ -1621,7 +1489,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the ingress segment - of the primay path."; + of the primay path."; uses l0-types:wdm-label-range-info; } @@ -1631,7 +1499,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the egress segment - of the primay path."; + of the primay path."; uses l0-types:wdm-label-range-info; } @@ -1642,7 +1510,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the ingress segment - of the primay reverse path."; + of the primay reverse path."; uses l0-types:wdm-label-range-info; } @@ -1653,7 +1521,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the egress segment - of the primay reverse path."; + of the primay reverse path."; uses l0-types:wdm-label-range-info; } @@ -1663,7 +1531,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the ingress segment - of the secondary path."; + of the secondary path."; uses l0-types:wdm-label-range-info; } @@ -1673,7 +1541,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the egress segment - of the secondary path."; + of the secondary path."; uses l0-types:wdm-label-range-info; } @@ -1683,7 +1551,7 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the ingress segment - of the secondary reverse path."; + of the secondary reverse path."; uses l0-types:wdm-label-range-info; } @@ -1693,13 +1561,14 @@ module ietf-wdm-tunnel { + "te:label-restriction" { description "Augment TE label range information for the egress segment - of the secondary reverse path."; + of the secondary reverse path."; uses l0-types:wdm-label-range-info; } /* * Augment TE label. */ + augment "/te:te/te:globals/te:named-path-constraints/" + "te:named-path-constraint/" + "te:explicit-route-objects/" @@ -1707,8 +1576,8 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects always - excluded by the path computation with the named path - constraint."; + excluded by the path computation with the named path + constraint."; case wdm { uses l0-types:wdm-label-hop; } @@ -1721,12 +1590,13 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects included - or excluded by the path computation with the named path - constraint."; + or excluded by the path computation with the named path + constraint."; case wdm { uses l0-types:wdm-label-hop; } } + augment "/te:te/te:globals/te:named-path-constraints/" + "te:named-path-constraint/te:path-in-segment/" + "te:label-restrictions/" @@ -1734,7 +1604,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the ingress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1747,7 +1617,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the ingress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1759,7 +1629,7 @@ module ietf-wdm-tunnel { + "te:label-step/te:technology" { description "Augment TE label range step for the ingress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-step; } @@ -1772,7 +1642,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the egress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1785,7 +1655,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the egress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1797,7 +1667,7 @@ module ietf-wdm-tunnel { + "te:label-step/te:technology" { description "Augment TE label range step for the egress segment - of the named path constraint."; + of the named path constraint."; case wdm { uses l0-types:wdm-label-step; } @@ -1806,13 +1676,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-exclude-objects/" + + "te:optimization-metric/" + + "te:explicit-route-exclude-objects/" + "te:route-object-exclude-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects excluded by the path computation of the primary - path."; + route objects excluded by the path computation of the primary + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1821,13 +1692,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-include-objects/" + + "te:optimization-metric/" + + "te:explicit-route-include-objects/" + "te:route-object-include-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects included by the path computation of the primary - path."; + route objects included by the path computation of the primary + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1840,7 +1712,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects always - excluded by the path computation of the primary path."; + excluded by the path computation of the primary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1853,7 +1725,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects included - or excluded by the path computation of the primary path."; + or excluded by the path computation of the primary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1866,7 +1738,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the ingress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1879,7 +1751,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the ingress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1891,7 +1763,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the ingress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-step; } @@ -1904,7 +1776,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the egress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1917,7 +1789,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the egress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -1929,7 +1801,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range end for the egress segment - of the primay path."; + of the primay path."; case wdm { uses l0-types:wdm-label-step; } @@ -1944,7 +1816,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the route object of the computed - primary path."; + primary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1954,13 +1826,14 @@ module ietf-wdm-tunnel { + "te:primary-paths/te:primary-path/" + "te:primary-reverse-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-exclude-objects/" + + "te:optimization-metric/" + + "te:explicit-route-exclude-objects/" + "te:route-object-exclude-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects excluded by the path computation of the primary - reverse path."; + route objects excluded by the path computation of the primary + reverse path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1970,13 +1843,14 @@ module ietf-wdm-tunnel { + "te:primary-paths/te:primary-path/" + "te:primary-reverse-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-include-objects/" + + "te:optimization-metric/" + + "te:explicit-route-include-objects/" + "te:route-object-include-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects included by the path computation of the primary - reverse path."; + route objects included by the path computation of the primary + reverse path."; case wdm { uses l0-types:wdm-label-hop; } @@ -1991,8 +1865,8 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects always - excluded by the path computation of the primary reverse - path."; + excluded by the path computation of the primary reverse + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2007,8 +1881,8 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects included - or excluded by the path computation of the primary reverse - path."; + or excluded by the path computation of the primary reverse + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2022,7 +1896,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the ingress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2036,7 +1910,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the ingress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2049,7 +1923,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the ingress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-step; } @@ -2063,7 +1937,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the egress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2077,7 +1951,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the egress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2090,7 +1964,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the egress segment - of the primay reverse path."; + of the primay reverse path."; case wdm { uses l0-types:wdm-label-step; } @@ -2099,13 +1973,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:primary-reverse-path/" - + "te:computed-paths-properties/te:computed-path-properties/" + + "te:computed-paths-properties/" + + "te:computed-path-properties/" + "te:path-properties/te:path-route-objects/" + "te:path-route-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the route object of the computed - primary reverse path."; + primary reverse path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2114,13 +1989,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-exclude-objects/" + + "te:optimization-metric/" + + "te:explicit-route-exclude-objects/" + "te:route-object-exclude-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects excluded by the path computation of the - secondary path."; + route objects excluded by the path computation of the + secondary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2129,13 +2005,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-include-objects/" + + "te:optimization-metric/" + + "te:explicit-route-include-objects/" + "te:route-object-include-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects included by the path computation of the - secondary path."; + route objects included by the path computation of the + secondary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2148,7 +2025,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects always - excluded by the path computation of the secondary path."; + excluded by the path computation of the secondary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2161,7 +2038,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects included - or excluded by the path computation of the secondary path."; + or excluded by the path computation of the secondary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2174,7 +2051,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the ingress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2187,18 +2064,19 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the ingress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-start-end; } } + augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" + "te:path-in-segment/te:label-restrictions/" + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the ingress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-step; } @@ -2211,7 +2089,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the egress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2224,7 +2102,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the egress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2236,7 +2114,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the egress segment - of the secondary path."; + of the secondary path."; case wdm { uses l0-types:wdm-label-step; } @@ -2251,7 +2129,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the route object of the computed - secondary path."; + secondary path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2260,13 +2138,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-reverse-paths/te:secondary-reverse-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-exclude-objects/" + + "te:optimization-metric/" + + "te:explicit-route-exclude-objects/" + "te:route-object-exclude-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects excluded by the path computation of the - secondary reverse path."; + route objects excluded by the path computation of the + secondary reverse path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2275,13 +2154,14 @@ module ietf-wdm-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-reverse-paths/te:secondary-reverse-path/" + "te:optimizations/te:algorithm/te:metric/" - + "te:optimization-metric/te:explicit-route-include-objects/" + + "te:optimization-metric/" + + "te:explicit-route-include-objects/" + "te:route-object-include-object/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the optimization of the explicit - route objects included by the path computation of the - secondary reverse path."; + route objects included by the path computation of the + secondary reverse path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2294,8 +2174,8 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects always - excluded by the path computation of the secondary reverse - path."; + excluded by the path computation of the secondary reverse + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2308,8 +2188,8 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the explicit route objects included - or excluded by the path computation of the secondary reverse - path."; + or excluded by the path computation of the secondary reverse + path."; case wdm { uses l0-types:wdm-label-hop; } @@ -2322,7 +2202,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the ingress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2335,7 +2215,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the ingress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2347,7 +2227,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the ingress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-step; } @@ -2360,7 +2240,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range start for the egress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2373,7 +2253,7 @@ module ietf-wdm-tunnel { + "te:te-label/te:technology" { description "Augment TE label range end for the egress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-start-end; } @@ -2385,7 +2265,7 @@ module ietf-wdm-tunnel { + "te:label-restriction/te:label-step/te:technology" { description "Augment TE label range step for the egress segment - of the secondary reverse path."; + of the secondary reverse path."; case wdm { uses l0-types:wdm-label-step; } @@ -2400,7 +2280,7 @@ module ietf-wdm-tunnel { + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the route object of the computed - secondary reverse path."; + secondary reverse path."; case wdm { uses l0-types:wdm-label-hop; } diff --git a/standard/iana/yang-parameters.xml b/standard/iana/yang-parameters.xml index 79e8281d6..334f0e97b 100644 --- a/standard/iana/yang-parameters.xml +++ b/standard/iana/yang-parameters.xml @@ -4,7 +4,7 @@ YANG Parameters 2010-06-10 - 2026-04-03 + 2026-04-23 YANG Module Names @@ -375,6 +375,16 @@ and Subsequent Address Family Identi + + ietf-adaptive-subscription + N + + urn:ietf:params:xml:ns:yang:ietf-adaptive-subscription + adaps + + + 's module file will be posted upon the document's publication as an RFC. + ietf-alarms N