From d6be6d151bad8ae595e0ba7fd3b66f48841c1a86 Mon Sep 17 00:00:00 2001 From: italobusi Date: Thu, 16 Nov 2023 19:59:49 +0100 Subject: [PATCH 01/10] Updated TE packet types module description Updated TE packet types module description: fix #250 --- ietf-te-packet-types.yang | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ietf-te-packet-types.yang b/ietf-te-packet-types.yang index 2d0d545..ca46c05 100644 --- a/ietf-te-packet-types.yang +++ b/ietf-te-packet-types.yang @@ -37,9 +37,10 @@ module ietf-te-packet-types { "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to MPLS TE. The model fully - conforms to the Network Management Datastore Architecture - (NMDA). + data type definitions specific to Packet Traffic Enginnering (TE). + + The model fully conforms to the Network Management Datastore + Architecture (NMDA). Copyright (c) 2023 IETF Trust and the persons identified as authors of the code. All rights reserved. @@ -54,18 +55,18 @@ module ietf-te-packet-types { 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."; - - revision 2023-07-10 { + revision 2023-11-16 { description "Added common TE packet identities: - bandwidth-profile-type. Added common TE packet groupings: - te-packet-path-bandwidth; - - te-packet-link-bandwidth."; + - te-packet-link-bandwidth. + + Updated module description."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note From 0190109421d44ab871836eabe5b7fcb1d7e39a3e Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 17 Nov 2023 00:18:06 +0100 Subject: [PATCH 02/10] Updated TE types Added support for (full) LSP re-routing: see #243 - obsoleted identity lsp-protection-reroute-extra; - obsoleted identity lsp-protection-reroute; - added identity restoration-scheme-rerouting. --- ietf-te-types.yang | 47 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/ietf-te-types.yang b/ietf-te-types.yang index 9757ebb..8c2ce05 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -83,6 +83,7 @@ module ietf-te-types { - identity association-type-diversity; - identity tunnel-admin-state-auto; - identity lsp-restoration-restore-none; + - identity restoration-scheme-rerouting; - base identity path-computation-error-reason and its derived identities; - base identity protocol-origin-type and @@ -97,12 +98,13 @@ module ietf-te-types { - description and reference of identity action-exercise. Obsoleted: - - identity of-minimize-agg-bandwidth-consumption - - identity of-minimize-load-most-loaded-link - - identity of-minimize-cost-path-set"; + - identity of-minimize-agg-bandwidth-consumption; + - identity of-minimize-load-most-loaded-link; + - identity of-minimize-cost-path-set; + - identity lsp-protection-reroute-extra; + - identity lsp-protection-reroute."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -1466,6 +1468,21 @@ module ietf-te-types { "Base identity for LSP restoration schemes."; } + // CHANGE NOTE: The identity restoration-scheme-rerouting + // below has been added in this module revision + // RFC Editor: remove the note above and this note + identity restoration-scheme-rerouting { + base restoration-scheme-type; + description + "Restoration LSP is computed after the failure detection. + + This restoration schema is also known as + 'Full LSP Re-routing.'"; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } + identity restoration-scheme-preconfigured { base restoration-scheme-type; description @@ -1510,19 +1527,35 @@ module ietf-te-types { Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute-extra + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute-extra { base lsp-protection-type; + status obsolete; description - "'(Full) Rerouting' LSP protection type."; + "'(Full) Rerouting' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute { base lsp-protection-type; + status obsolete; description - "'Rerouting without Extra-Traffic' LSP protection type."; + "'Rerouting without Extra-Traffic' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; From 4910be9cc15e1dd5474632b28588a11426fcd939 Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 17 Nov 2023 01:05:51 +0100 Subject: [PATCH 03/10] Updated path metric types Updated path metric types: see #103: - moved identity path-metric-loss from ietf-te-mpls to ietf-te-packet-types; - added identity path-metric-delay-varation to ietf-te-packet-types. Few doubts raised in https://github.com/tsaad-dev/te/issues/103#issuecomment-1815519361 --- ietf-te-packet-types.yang | 56 ++++++++++++++++++++++++++++++++++++++- ietf-te-types.yang | 13 +++++---- 2 files changed, 63 insertions(+), 6 deletions(-) diff --git a/ietf-te-packet-types.yang b/ietf-te-packet-types.yang index ca46c05..243894d 100644 --- a/ietf-te-packet-types.yang +++ b/ietf-te-packet-types.yang @@ -58,7 +58,9 @@ module ietf-te-packet-types { revision 2023-11-16 { description "Added common TE packet identities: - - bandwidth-profile-type. + - bandwidth-profile-type; + - path-metric-loss; + - path-metric-delay-varation. Added common TE packet groupings: - te-packet-path-bandwidth; @@ -124,6 +126,58 @@ module ietf-te-packet-types { Marker with Efficient Handling of in-Profile Traffic"; } + // CHANGE NOTE: The identity path-metric-loss below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-loss { + base path-metric-type; + description + "The path loss (as a packet percentage) metric type + encodes a function of the unidirectional loss metrics of all + links traversed by a P2P path. + + The basic unit is 0.000003%, + where (2^24 - 2) or 50.331642% is the maximum value of the + path loss percentage that can be expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + + // CHANGE NOTE: The identity path-metric-delay-varation below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-delay-varation { + base path-metric-type; + description + "The path delay variation encodes the sum of the unidirectional + delay variation metrics of all links traversed by a P2P path. + + The path delay variation metric unit is in microseconds, where + (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + maximum value of the path delay variation that can be + expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + /* * Typedefs */ diff --git a/ietf-te-types.yang b/ietf-te-types.yang index 8c2ce05..a7515d4 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -75,8 +75,7 @@ module ietf-te-types { 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."; - - revision 2023-06-27 { + revision 2023-11-17 { description "Added: - base identity lsp-provisioning-error-reason; @@ -3735,9 +3734,13 @@ module ietf-te-types { type uint64; default "0"; description - "Upper bound on the end-to-end TE path metric. A zero - indicates an unbounded upper limit for the specific - 'metric-type'."; + "Upper bound on the end-to-end TE path metric. + + A zero indicates an unbounded upper limit for the + specific 'metric-type'. + + The unit of is interpreted in the context of the + path-metric-type."; } } } From 4e0f024ac20b10eec908b8b14f9fc2c4c723a53d Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 17 Nov 2023 08:57:31 +0100 Subject: [PATCH 04/10] Updated RFC8776-bis I-D Clarify that derived identities from path-metric-type should describe the unit and maximum value of the associated path metric: see #103 --- .../draft-ietf-teas-rfc8776-update.md | 16 +- .../draft-ietf-teas-rfc8776-update.txt | 2450 +++++++++-------- .../draft-ietf-teas-rfc8776-update.xml | 1743 ++++++------ ietf-te-mpls.yang | 13 +- ietf-te-packet-types.yang | 9 +- ietf-te-types.yang | 34 +- 6 files changed, 2282 insertions(+), 1983 deletions(-) diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md index e1f48e1..a373b7f 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md @@ -305,13 +305,19 @@ switching-capabilities: > A base YANG identity for supported interface switching capabilities as defined in {{?RFC3471}}. resource-affinities-type: - +exx > A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in {{?RFC2702}} and {{?RFC3209}}. +CHANGE NOTE: The description of the path-metric-type has been updated + path-metric-type: > A base YANG identity for supported path metric types as defined in {{?RFC3785}} and {{?RFC7471}}. +> Since the unit of path metric bound is interpreted in the context of the metric-type, derived identities SHOULD describe the unit and maximum value of the path metric. + +> For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in {{?RFC7471}} for OSPF, and {{?RFC8570}} for IS-IS. + explicit-route-hop: > A YANG grouping that defines supported explicit routes as defined in {{?RFC3209}} and {{?RFC3477}}. @@ -416,6 +422,14 @@ bandwidth-profile-type: > A base YANG identity for various bandwidth profiles specified in {{MEF_10.3}}, {{?RFC2697}}, {{?RFC2698}} and {{?RFC4115}} that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs). +path-metric-loss: + +> A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path loss metric type, defined in {{?RFC8233}}. + +path-metric-delay-variation: + +> A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path delay variation metric type, defined in {{?RFC8233}}. + te-packet-path-bandwidth > A YANG grouping that defines the path bandwidth information and could be used in any Packet TE model (e.g., MPLS-TE topology model) for the path bandwidth representation (e.g., the bandwidth of an MPLS-TE LSP). diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt index b186a6c..4753e44 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt @@ -6,13 +6,13 @@ TEAS Working Group I. Busi Internet-Draft Huawei Obsoletes: 8776 (if approved) A. Guo Intended status: Standards Track Futurewei Technologies -Expires: 18 March 2024 X. Liu +Expires: 20 May 2024 X. Liu Alef Edge T. Saad Cisco Systems Inc. I. Bryskin Individual - 15 September 2023 + 17 November 2023 Common YANG Data Types for Traffic Engineering @@ -41,7 +41,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on 18 March 2024. + This Internet-Draft will expire on 20 May 2024. Copyright Notice @@ -53,9 +53,9 @@ Copyright Notice -Busi, et al. Expires 18 March 2024 [Page 1] +Busi, et al. Expires 20 May 2024 [Page 1] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 This document is subject to BCP 78 and the IETF Trust's Legal @@ -80,19 +80,19 @@ Table of Contents 3.1.2. Protocol Origin . . . . . . . . . . . . . . . . . . . 11 3.2. Packet TE Types Module Contents . . . . . . . . . . . . . 11 4. TE Types YANG Module . . . . . . . . . . . . . . . . . . . . 13 - 5. Packet TE Types YANG Module . . . . . . . . . . . . . . . . . 96 - 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 109 - 7. Security Considerations . . . . . . . . . . . . . . . . . . . 110 - 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 111 - 8.1. Normative References . . . . . . . . . . . . . . . . . . 111 - 8.2. Informative References . . . . . . . . . . . . . . . . . 113 - Appendix A. Changes from RFC 8776 . . . . . . . . . . . . . . . 121 - A.1. TE Types YANG Diffs . . . . . . . . . . . . . . . . . . . 121 - A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 136 - Appendix B. Option Considered for updating RFC8776 . . . . . . . 140 - Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 141 - Contributors . . . . . . . . . . . . . . . . . . . . . . . . . . 141 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 141 + 5. Packet TE Types YANG Module . . . . . . . . . . . . . . . . . 98 + 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 112 + 7. Security Considerations . . . . . . . . . . . . . . . . . . . 113 + 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 113 + 8.1. Normative References . . . . . . . . . . . . . . . . . . 113 + 8.2. Informative References . . . . . . . . . . . . . . . . . 116 + Appendix A. Changes from RFC 8776 . . . . . . . . . . . . . . . 123 + A.1. TE Types YANG Diffs . . . . . . . . . . . . . . . . . . . 123 + A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 138 + Appendix B. Option Considered for updating RFC8776 . . . . . . . 142 + Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 144 + Contributors . . . . . . . . . . . . . . . . . . . . . . . . . . 144 + Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 144 1. Introduction @@ -109,9 +109,9 @@ Table of Contents -Busi, et al. Expires 18 March 2024 [Page 2] +Busi, et al. Expires 20 May 2024 [Page 2] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 This document introduces a collection of common data types derived @@ -165,9 +165,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 3] +Busi, et al. Expires 20 May 2024 [Page 3] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 +=================+======================+===========+ @@ -221,9 +221,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 4] +Busi, et al. Expires 20 May 2024 [Page 4] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 DS-TE: @@ -277,9 +277,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 5] +Busi, et al. Expires 20 May 2024 [Page 5] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 te-bandwidth: @@ -333,9 +333,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 6] +Busi, et al. Expires 20 May 2024 [Page 6] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 A type representing the identifier for a node in a TE topology. @@ -389,9 +389,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 7] +Busi, et al. Expires 20 May 2024 [Page 7] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 path-attribute-flags: @@ -445,9 +445,9 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 8] +Busi, et al. Expires 20 May 2024 [Page 8] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 minimize-agg-bandwidth-consumption, of-minimize-load-most-loaded-link @@ -478,17 +478,34 @@ Internet-Draft TE Common YANG Types September 2023 A base YANG identity for supported interface switching capabilities as defined in [RFC3471]. - resource-affinities-type: + resource-affinities-type: exx > A base YANG identity for supported + attribute filters associated with a tunnel that must be satisfied for + a link to be acceptable as defined in [RFC2702] and [RFC3209]. - A base YANG identity for supported attribute filters associated - with a tunnel that must be satisfied for a link to be acceptable - as defined in [RFC2702] and [RFC3209]. + CHANGE NOTE: The description of the path-metric-type has been updated path-metric-type: A base YANG identity for supported path metric types as defined in [RFC3785] and [RFC7471]. + Since the unit of path metric bound is interpreted in the context + of the metric-type, derived identities SHOULD describe the unit + and maximum value of the path metric. + + For example, the bound of the 'path-metric-loss', defined in + 'ietf-te-packet-types', is defined in multiples of the basic unit + 0.000003% as described in [RFC7471] for OSPF, and [RFC8570] for + IS-IS. + + + + +Busi, et al. Expires 20 May 2024 [Page 9] + +Internet-Draft TE Common YANG Types November 2023 + + explicit-route-hop: A YANG grouping that defines supported explicit routes as defined @@ -499,13 +516,6 @@ Internet-Draft TE Common YANG Types September 2023 An enumerated type for the different TE link access types as defined in [RFC3630]. - - -Busi, et al. Expires 18 March 2024 [Page 9] - -Internet-Draft TE Common YANG Types September 2023 - - CHANGE NOTE: The module "ietf-te-types" has been updated to add the following YANG identities, types and groupings. @@ -542,6 +552,16 @@ Internet-Draft TE Common YANG Types September 2023 This is a common grouping to define the LSP encoding and switching types. + + + + + +Busi, et al. Expires 20 May 2024 [Page 10] + +Internet-Draft TE Common YANG Types November 2023 + + CHANGE NOTE: The tunnel-admin-state-auto YANG identity, derived from the tunnel-admin-status-type base YANG identity has also been added. No description is provided, since no description for the tunnel- @@ -554,14 +574,6 @@ Internet-Draft TE Common YANG Types September 2023 RFC Editor: remove the two CHANGE NOTEs above and this note - - - -Busi, et al. Expires 18 March 2024 [Page 10] - -Internet-Draft TE Common YANG Types September 2023 - - 3.1.1. Path Computation Errors The "ietf-te-types" module contains the YANG reusable identities for @@ -599,6 +611,13 @@ Internet-Draft TE Common YANG Types September 2023 backup-protection-type: + + +Busi, et al. Expires 20 May 2024 [Page 11] + +Internet-Draft TE Common YANG Types November 2023 + + A base YANG identity for supported protection types that a backup or bypass tunnel can provide as defined in [RFC4090]. @@ -609,15 +628,6 @@ Internet-Draft TE Common YANG Types September 2023 bc-type: - - - - -Busi, et al. Expires 18 March 2024 [Page 11] - -Internet-Draft TE Common YANG Types September 2023 - - A type that represents Diffserv-TE Bandwidth Constraints (BCs) as defined in [RFC4124]. @@ -648,6 +658,26 @@ Internet-Draft TE Common YANG Types September 2023 [MEF_10.3], [RFC2697], [RFC2698] and [RFC4115] that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs). + path-metric-loss: + + A YANG identity, derived from the 'path-metric-type' base + identity, defined in 'ietf-te-types', that represents the path + loss metric type, defined in [RFC8233]. + + path-metric-delay-variation: + + + + +Busi, et al. Expires 20 May 2024 [Page 12] + +Internet-Draft TE Common YANG Types November 2023 + + + A YANG identity, derived from the 'path-metric-type' base + identity, defined in 'ietf-te-types', that represents the path + delay variation metric type, defined in [RFC8233]. + te-packet-path-bandwidth A YANG grouping that defines the path bandwidth information and @@ -662,18 +692,6 @@ Internet-Draft TE Common YANG Types September 2023 The Packet TE path bandwidth can be represented by a bandwidth profile as follow: - - - - - - - -Busi, et al. Expires 18 March 2024 [Page 12] - -Internet-Draft TE Common YANG Types September 2023 - - +--:(packet) +--rw bandwidth-profile-name? string +--rw bandwidth-profile-type? identityref @@ -704,6 +722,14 @@ Internet-Draft TE Common YANG Types September 2023 * "ietf-routing-types" as defined in [RFC8294] + + + +Busi, et al. Expires 20 May 2024 [Page 13] + +Internet-Draft TE Common YANG Types November 2023 + + In addition to [RFC6991] and [RFC8294], this module references the following documents in defining the types and YANG groupings: [RFC3272], [RFC4090], [RFC4202], [RFC4328], [RFC4561], [RFC4657], @@ -722,14 +748,6 @@ Internet-Draft TE Common YANG Types September 2023 prefix te-types; import ietf-inet-types { - - - -Busi, et al. Expires 18 March 2024 [Page 13] - -Internet-Draft TE Common YANG Types September 2023 - - prefix inet; reference "RFC 6991: Common YANG Data Types"; @@ -760,6 +778,14 @@ Internet-Draft TE Common YANG Types September 2023 Working Group"; contact "WG Web: + + + +Busi, et al. Expires 20 May 2024 [Page 14] + +Internet-Draft TE Common YANG Types November 2023 + + WG List: Editor: Tarek Saad @@ -778,14 +804,6 @@ Internet-Draft TE Common YANG Types September 2023 "; description "This YANG module contains a collection of generally useful - - - -Busi, et al. Expires 18 March 2024 [Page 14] - -Internet-Draft TE Common YANG Types September 2023 - - YANG data type definitions specific to TE. The model fully conforms to the Network Management Datastore Architecture (NMDA). @@ -809,14 +827,22 @@ Internet-Draft TE Common YANG Types September 2023 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."; - - revision 2023-06-27 { + revision 2023-11-17 { description "Added: - base identity lsp-provisioning-error-reason; - identity association-type-diversity; - identity tunnel-admin-state-auto; - identity lsp-restoration-restore-none; + + + +Busi, et al. Expires 20 May 2024 [Page 15] + +Internet-Draft TE Common YANG Types November 2023 + + + - identity restoration-scheme-rerouting; - base identity path-computation-error-reason and its derived identities; - base identity protocol-origin-type and @@ -831,20 +857,13 @@ Internet-Draft TE Common YANG Types September 2023 - description and reference of identity action-exercise. Obsoleted: - - identity of-minimize-agg-bandwidth-consumption - - identity of-minimize-load-most-loaded-link - - identity of-minimize-cost-path-set"; - - - -Busi, et al. Expires 18 March 2024 [Page 15] - -Internet-Draft TE Common YANG Types September 2023 - - + - identity of-minimize-agg-bandwidth-consumption; + - identity of-minimize-load-most-loaded-link; + - identity of-minimize-cost-path-set; + - identity lsp-protection-reroute-extra; + - identity lsp-protection-reroute."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -871,6 +890,14 @@ Internet-Draft TE Common YANG Types September 2023 The most significant byte in the hex-string is the farthest to the left in the byte sequence. Leading zero bytes in the configured value may be omitted for brevity."; + + + +Busi, et al. Expires 20 May 2024 [Page 16] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2 @@ -890,14 +917,6 @@ Internet-Draft TE Common YANG Types September 2023 typedef extended-admin-group { type yang:hex-string; - - - -Busi, et al. Expires 18 March 2024 [Page 16] - -Internet-Draft TE Common YANG Types September 2023 - - description "Extended administrative group / resource class / color representation in 'hex-string' type. @@ -927,6 +946,14 @@ Internet-Draft TE Common YANG Types September 2023 enum unknown { value 0; description + + + +Busi, et al. Expires 20 May 2024 [Page 17] + +Internet-Draft TE Common YANG Types November 2023 + + "Unknown."; } enum normal { @@ -946,14 +973,6 @@ Internet-Draft TE Common YANG Types September 2023 reference "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for Explicitly - - - -Busi, et al. Expires 18 March 2024 [Page 17] - -Internet-Draft TE Common YANG Types September 2023 - - Routed Label Switched Paths (LSPs) Using TE Metric Extensions RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; @@ -983,6 +1002,14 @@ Internet-Draft TE Common YANG Types September 2023 enum testing { description "In some test mode."; + + + +Busi, et al. Expires 20 May 2024 [Page 18] + +Internet-Draft TE Common YANG Types November 2023 + + } enum preparing-maintenance { description @@ -1002,14 +1029,6 @@ Internet-Draft TE Common YANG Types September 2023 "Status is unknown."; } } - - - -Busi, et al. Expires 18 March 2024 [Page 18] - -Internet-Draft TE Common YANG Types September 2023 - - description "Defines a type representing the common states of a TE resource."; @@ -1039,6 +1058,14 @@ Internet-Draft TE Common YANG Types September 2023 (e.g., 0x1p10), where the units are in bytes per second. For the Optical Transport Network (OTN) switching type, + + + +Busi, et al. Expires 20 May 2024 [Page 19] + +Internet-Draft TE Common YANG Types November 2023 + + a list of integers can be used, such as '0,2,3,1', indicating two ODU0s and one ODU3. ('ODU' stands for 'Optical Data Unit'.) For Dense Wavelength Division Multiplexing (DWDM), @@ -1058,14 +1085,6 @@ Internet-Draft TE Common YANG Types September 2023 range "0..7"; } description - - - -Busi, et al. Expires 18 March 2024 [Page 19] - -Internet-Draft TE Common YANG Types September 2023 - - "The Differentiated Services Class-Type of traffic."; reference "RFC 4124: Protocol Extensions for Support of Diffserv-aware @@ -1095,6 +1114,14 @@ Internet-Draft TE Common YANG Types September 2023 enum strict { description "A strict hop in an explicit path."; + + + +Busi, et al. Expires 20 May 2024 [Page 20] + +Internet-Draft TE Common YANG Types November 2023 + + } } description @@ -1114,14 +1141,6 @@ Internet-Draft TE Common YANG Types September 2023 description "The link is multi-access, including broadcast and NBMA."; } - - - -Busi, et al. Expires 18 March 2024 [Page 20] - -Internet-Draft TE Common YANG Types September 2023 - - } description "Defines a type representing the access type of a TE link."; @@ -1151,6 +1170,14 @@ Internet-Draft TE Common YANG Types September 2023 enum incoming { description "The explicit route represents an incoming link on + + + +Busi, et al. Expires 20 May 2024 [Page 21] + +Internet-Draft TE Common YANG Types November 2023 + + a node."; } enum outgoing { @@ -1170,14 +1197,6 @@ Internet-Draft TE Common YANG Types September 2023 "TE metric."; reference "RFC 3785: Use of Interior Gateway Protocol (IGP) Metric as a - - - -Busi, et al. Expires 18 March 2024 [Page 21] - -Internet-Draft TE Common YANG Types September 2023 - - second MPLS Traffic Engineering (TE) Metric"; } @@ -1207,6 +1226,14 @@ Internet-Draft TE Common YANG Types September 2023 typedef te-oper-status { type te-common-status; + + + +Busi, et al. Expires 20 May 2024 [Page 22] + +Internet-Draft TE Common YANG Types November 2023 + + description "Defines a type representing the operational status of a TE resource."; @@ -1226,14 +1253,6 @@ Internet-Draft TE Common YANG Types September 2023 description "Node disjoint."; } - - - -Busi, et al. Expires 18 March 2024 [Page 22] - -Internet-Draft TE Common YANG Types September 2023 - - bit link { position 1; description @@ -1263,6 +1282,14 @@ Internet-Draft TE Common YANG Types September 2023 } enum recovery-started { description + + + +Busi, et al. Expires 20 May 2024 [Page 23] + +Internet-Draft TE Common YANG Types November 2023 + + "The recovery action has been started but not completed."; } enum recovery-succeeded { @@ -1282,14 +1309,6 @@ Internet-Draft TE Common YANG Types September 2023 enum reversion-succeeded { description "The reversion action has succeeded."; - - - -Busi, et al. Expires 18 March 2024 [Page 23] - -Internet-Draft TE Common YANG Types September 2023 - - } enum reversion-failed { description @@ -1319,6 +1338,14 @@ Internet-Draft TE Common YANG Types September 2023 "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS) RFC 6378: MPLS Transport Profile (MPLS-TP) Linear Protection"; + + + +Busi, et al. Expires 20 May 2024 [Page 24] + +Internet-Draft TE Common YANG Types November 2023 + + } typedef te-template-name { @@ -1338,14 +1365,6 @@ Internet-Draft TE Common YANG Types September 2023 "A TE node or TE link has been added."; } enum remove { - - - -Busi, et al. Expires 18 March 2024 [Page 24] - -Internet-Draft TE Common YANG Types September 2023 - - value 1; description "A TE node or TE link has been removed."; @@ -1375,6 +1394,14 @@ Internet-Draft TE Common YANG Types September 2023 "An identifier for a topology. It is optional to have one or more prefixes at the beginning, separated by colons. The prefixes can be 'network-types' as + + + +Busi, et al. Expires 20 May 2024 [Page 25] + +Internet-Draft TE Common YANG Types November 2023 + + defined in the 'ietf-network' module in RFC 8345, to help the user better understand the topology before further inquiry is made."; @@ -1394,14 +1421,6 @@ Internet-Draft TE Common YANG Types September 2023 This attribute is mapped to a local or remote link identifier as defined in RFCs 3630 and 5305."; reference - - - -Busi, et al. Expires 18 March 2024 [Page 25] - -Internet-Draft TE Common YANG Types September 2023 - - "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2 RFC 5305: IS-IS Extensions for Traffic Engineering"; @@ -1431,6 +1450,14 @@ Internet-Draft TE Common YANG Types September 2023 } description "The type of TE path, indicating whether a path is a primary, + + + +Busi, et al. Expires 20 May 2024 [Page 26] + +Internet-Draft TE Common YANG Types November 2023 + + or a reverse primary, or a secondary, or a reverse secondary path."; } @@ -1450,14 +1477,6 @@ Internet-Draft TE Common YANG Types September 2023 description "Indicates support for TE Fast Reroute (FRR)."; reference - - - -Busi, et al. Expires 18 March 2024 [Page 26] - -Internet-Draft TE Common YANG Types September 2023 - - "RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP Tunnels"; } @@ -1487,6 +1506,14 @@ Internet-Draft TE Common YANG Types September 2023 feature named-path-constraints { description + + + +Busi, et al. Expires 20 May 2024 [Page 27] + +Internet-Draft TE Common YANG Types November 2023 + + "Indicates support for named path constraints."; } @@ -1506,14 +1533,6 @@ Internet-Draft TE Common YANG Types September 2023 // CHANGE NOTE: The base identity lsp-provisioning-error-reason // has been added in this module revision - - - -Busi, et al. Expires 18 March 2024 [Page 27] - -Internet-Draft TE Common YANG Types September 2023 - - // RFC Editor: remove the note above and this note identity lsp-provisioning-error-reason { description @@ -1543,6 +1562,14 @@ Internet-Draft TE Common YANG Types September 2023 "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } + + + +Busi, et al. Expires 20 May 2024 [Page 28] + +Internet-Draft TE Common YANG Types November 2023 + + identity local-recording-desired { base session-attributes-flags; description @@ -1562,14 +1589,6 @@ Internet-Draft TE Common YANG Types September 2023 identity node-protection-desired { base session-attributes-flags; - - - -Busi, et al. Expires 18 March 2024 [Page 28] - -Internet-Draft TE Common YANG Types September 2023 - - description "Requests FRR node protection on LSRs, if present."; reference @@ -1599,11 +1618,19 @@ Internet-Draft TE Common YANG Types September 2023 identity lsp-attributes-flags { description - "Base identity for LSP attributes flags."; - } - identity end-to-end-rerouting-desired { - base lsp-attributes-flags; + + +Busi, et al. Expires 20 May 2024 [Page 29] + +Internet-Draft TE Common YANG Types November 2023 + + + "Base identity for LSP attributes flags."; + } + + identity end-to-end-rerouting-desired { + base lsp-attributes-flags; description "Indicates end-to-end rerouting behavior for an LSP undergoing establishment. This MAY also be used to @@ -1619,13 +1646,6 @@ Internet-Draft TE Common YANG Types September 2023 Route Object (ERO)"; } - - -Busi, et al. Expires 18 March 2024 [Page 29] - -Internet-Draft TE Common YANG Types September 2023 - - identity boundary-rerouting-desired { base lsp-attributes-flags; description @@ -1654,6 +1674,14 @@ Internet-Draft TE Common YANG Types September 2023 undergoing establishment. This MAY also be used to specify segment-based LSP recovery for established LSPs."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 30] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS RSVP-TE RFC 5420: Encoding of Attributes for MPLS LSP Establishment @@ -1675,13 +1703,6 @@ Internet-Draft TE Common YANG Types September 2023 Route Object (ERO)"; } - - -Busi, et al. Expires 18 March 2024 [Page 30] - -Internet-Draft TE Common YANG Types September 2023 - - identity contiguous-lsp-desired { base lsp-attributes-flags; description @@ -1709,6 +1730,14 @@ Internet-Draft TE Common YANG Types September 2023 base lsp-attributes-flags; description "Indicates that the LSP MUST be provisioned in the + + + +Busi, et al. Expires 20 May 2024 [Page 31] + +Internet-Draft TE Common YANG Types November 2023 + + control plane only."; reference "RFC 6001: Generalized MPLS (GMPLS) Protocol Extensions for @@ -1730,14 +1759,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity oob-mapping-flag { - - - -Busi, et al. Expires 18 March 2024 [Page 31] - -Internet-Draft TE Common YANG Types September 2023 - - base lsp-attributes-flags; description "Indicates that signaling of the egress binding information is @@ -1765,6 +1786,14 @@ Internet-Draft TE Common YANG Types September 2023 "OAM Maintenance Entity Group End Point (MEP) entities desired."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 32] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 7260: GMPLS RSVP-TE Extensions for Operations, Administration, and Maintenance (OAM) Configuration"; } @@ -1786,14 +1815,6 @@ Internet-Draft TE Common YANG Types September 2023 reference "RFC 7570: Label Switched Path (LSP) Attribute in the Explicit Route Object (ERO) - - - -Busi, et al. Expires 18 March 2024 [Page 32] - -Internet-Draft TE Common YANG Types September 2023 - - RFC 8001: RSVP-TE Extensions for Collecting Shared Risk Link Group (SRLG) Information"; } @@ -1821,6 +1842,14 @@ Internet-Draft TE Common YANG Types September 2023 identity rtm-set-desired { base lsp-attributes-flags; + + + +Busi, et al. Expires 20 May 2024 [Page 33] + +Internet-Draft TE Common YANG Types November 2023 + + description "Residence Time Measurement (RTM) attribute flag requested."; reference @@ -1842,14 +1871,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity link-protection-extra-traffic { - - - -Busi, et al. Expires 18 March 2024 [Page 33] - -Internet-Draft TE Common YANG Types September 2023 - - base link-protection-type; description "Extra-Traffic protected link type."; @@ -1877,6 +1898,14 @@ Internet-Draft TE Common YANG Types September 2023 } identity link-protection-1-plus-1 { + + + +Busi, et al. Expires 20 May 2024 [Page 34] + +Internet-Draft TE Common YANG Types November 2023 + + base link-protection-type; description "One-plus-one (1+1) protected link type."; @@ -1898,14 +1927,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity association-type-recovery { - - - -Busi, et al. Expires 18 March 2024 [Page 34] - -Internet-Draft TE Common YANG Types September 2023 - - base association-type; description "Association type for recovery, used to associate LSPs of the @@ -1933,6 +1954,14 @@ Internet-Draft TE Common YANG Types September 2023 used to associate two LSPs of two tunnels that are independently configured on either endpoint."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 35] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 7551: RSVP-TE Extensions for Associated Bidirectional Label Switched Paths (LSPs)"; } @@ -1954,14 +1983,6 @@ Internet-Draft TE Common YANG Types September 2023 // been added in this module revision // RFC Editor: remove the note above and this note identity association-type-diversity { - - - -Busi, et al. Expires 18 March 2024 [Page 35] - -Internet-Draft TE Common YANG Types September 2023 - - base association-type; description "Association Type diversity used to associate LSPs whose @@ -1990,6 +2011,13 @@ Internet-Draft TE Common YANG Types September 2023 Computation Element Communication Protocol (PCEP)"; } + + +Busi, et al. Expires 20 May 2024 [Page 36] + +Internet-Draft TE Common YANG Types November 2023 + + identity of-minimize-load-path { base objective-function-type; description @@ -2010,14 +2038,6 @@ Internet-Draft TE Common YANG Types September 2023 } // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption - - - -Busi, et al. Expires 18 March 2024 [Page 36] - -Internet-Draft TE Common YANG Types September 2023 - - // below has been obsoleted in this module revision // RFC Editor: remove the note above and this note identity of-minimize-agg-bandwidth-consumption { @@ -2046,6 +2066,14 @@ Internet-Draft TE Common YANG Types September 2023 } // CHANGE NOTE: The identity of-minimize-cost-path-set + + + +Busi, et al. Expires 20 May 2024 [Page 37] + +Internet-Draft TE Common YANG Types November 2023 + + // below has been obsoleted in this module revision // RFC Editor: remove the note above and this note identity of-minimize-cost-path-set { @@ -2066,14 +2094,6 @@ Internet-Draft TE Common YANG Types September 2023 identity path-locally-computed { base path-computation-method; description - - - -Busi, et al. Expires 18 March 2024 [Page 37] - -Internet-Draft TE Common YANG Types September 2023 - - "Indicates a constrained-path LSP in which the path is computed by the local LER."; reference @@ -2102,6 +2122,14 @@ Internet-Draft TE Common YANG Types September 2023 base path-computation-method; description "Constrained-path LSP in which the path is + + + +Busi, et al. Expires 20 May 2024 [Page 38] + +Internet-Draft TE Common YANG Types November 2023 + + explicitly specified as a collection of strict and/or loose hops."; reference @@ -2122,14 +2150,6 @@ Internet-Draft TE Common YANG Types September 2023 refers is specified as a value relative to the IGP metric cost to the LSP's tail end."; reference - - - -Busi, et al. Expires 18 March 2024 [Page 38] - -Internet-Draft TE Common YANG Types September 2023 - - "RFC 4657: Path Computation Element (PCE) Communication Protocol Generic Requirements"; } @@ -2158,6 +2178,14 @@ Internet-Draft TE Common YANG Types September 2023 identity te-tunnel-type { description "Base identity from which specific tunnel types are derived."; + + + +Busi, et al. Expires 20 May 2024 [Page 39] + +Internet-Draft TE Common YANG Types November 2023 + + } identity te-tunnel-p2p { @@ -2178,14 +2206,6 @@ Internet-Draft TE Common YANG Types September 2023 Label Switched Paths (LSPs)"; } - - - -Busi, et al. Expires 18 March 2024 [Page 39] - -Internet-Draft TE Common YANG Types September 2023 - - identity tunnel-action-type { description "Base identity from which specific tunnel action types @@ -2214,6 +2234,14 @@ Internet-Draft TE Common YANG Types September 2023 } identity te-action-result { + + + +Busi, et al. Expires 20 May 2024 [Page 40] + +Internet-Draft TE Common YANG Types November 2023 + + description "Base identity from which specific TE action results are derived."; @@ -2234,14 +2262,6 @@ Internet-Draft TE Common YANG Types September 2023 identity tunnel-action-inprogress { base te-action-result; description - - - -Busi, et al. Expires 18 March 2024 [Page 40] - -Internet-Draft TE Common YANG Types September 2023 - - "TE action is in progress."; } @@ -2270,6 +2290,14 @@ Internet-Draft TE Common YANG Types September 2023 description "Tunnel administrative auto state. The administrative status in state datastore transitions to 'tunnel-admin-up' when the + + + +Busi, et al. Expires 20 May 2024 [Page 41] + +Internet-Draft TE Common YANG Types November 2023 + + tunnel used by the client layer, and to 'tunnel-admin-down' when it is not used by the client layer."; } @@ -2291,13 +2319,6 @@ Internet-Draft TE Common YANG Types September 2023 "Tunnel's state is down."; } - - -Busi, et al. Expires 18 March 2024 [Page 41] - -Internet-Draft TE Common YANG Types September 2023 - - identity lsp-state-type { description "Base identity for TE LSP states."; @@ -2325,6 +2346,14 @@ Internet-Draft TE Common YANG Types September 2023 base lsp-state-type; description "State is being set up."; + + + +Busi, et al. Expires 20 May 2024 [Page 42] + +Internet-Draft TE Common YANG Types November 2023 + + } identity lsp-state-setup-ok { @@ -2346,14 +2375,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity lsp-state-tearing-down { - - - -Busi, et al. Expires 18 March 2024 [Page 42] - -Internet-Draft TE Common YANG Types September 2023 - - base lsp-state-type; description "State is being torn down."; @@ -2381,6 +2402,14 @@ Internet-Draft TE Common YANG Types September 2023 } identity path-invalidation-action-teardown { + + + +Busi, et al. Expires 20 May 2024 [Page 43] + +Internet-Draft TE Common YANG Types November 2023 + + base path-invalidation-action-type; description "TE path invalidation action teardown."; @@ -2403,13 +2432,6 @@ Internet-Draft TE Common YANG Types September 2023 "No LSP affected by a failure is restored."; } - - -Busi, et al. Expires 18 March 2024 [Page 43] - -Internet-Draft TE Common YANG Types September 2023 - - identity lsp-restoration-restore-any { base lsp-restoration-type; description @@ -2428,6 +2450,29 @@ Internet-Draft TE Common YANG Types September 2023 "Base identity for LSP restoration schemes."; } + // CHANGE NOTE: The identity restoration-scheme-rerouting + // below has been added in this module revision + // RFC Editor: remove the note above and this note + identity restoration-scheme-rerouting { + base restoration-scheme-type; + description + "Restoration LSP is computed after the failure detection. + + + + +Busi, et al. Expires 20 May 2024 [Page 44] + +Internet-Draft TE Common YANG Types November 2023 + + + This restoration schema is also known as + 'Full LSP Re-routing.'"; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } + identity restoration-scheme-preconfigured { base restoration-scheme-type; description @@ -2458,14 +2503,6 @@ Internet-Draft TE Common YANG Types September 2023 identity lsp-protection-type { description "Base identity from which LSP protection types are derived."; - - - -Busi, et al. Expires 18 March 2024 [Page 44] - -Internet-Draft TE Common YANG Types September 2023 - - reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; @@ -2477,22 +2514,46 @@ Internet-Draft TE Common YANG Types September 2023 "'Unprotected' LSP protection type."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End + + + +Busi, et al. Expires 20 May 2024 [Page 45] + +Internet-Draft TE Common YANG Types November 2023 + + Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute-extra + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute-extra { base lsp-protection-type; + status obsolete; description - "'(Full) Rerouting' LSP protection type."; + "'(Full) Rerouting' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute { base lsp-protection-type; + status obsolete; description - "'Rerouting without Extra-Traffic' LSP protection type."; + "'Rerouting without Extra-Traffic' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; @@ -2509,19 +2570,19 @@ Internet-Draft TE Common YANG Types September 2023 identity lsp-protection-1-for-1 { base lsp-protection-type; - description - "LSP protection '1:1 Protection Type'."; - reference - "RFC 4872: RSVP-TE Extensions in Support of End-to-End - Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; -Busi, et al. Expires 18 March 2024 [Page 45] +Busi, et al. Expires 20 May 2024 [Page 46] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + description + "LSP protection '1:1 Protection Type'."; + reference + "RFC 4872: RSVP-TE Extensions in Support of End-to-End + Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } identity lsp-protection-unidir-1-plus-1 { @@ -2565,19 +2626,19 @@ Internet-Draft TE Common YANG Types September 2023 identity signal-fail-of-protection { base lsp-protection-state; description - "The protection transport entity has a signal fail condition - that is of higher priority than the forced switchover - command."; - reference - "RFC 4427: Recovery (Protection and Restoration) Terminology -Busi, et al. Expires 18 March 2024 [Page 46] +Busi, et al. Expires 20 May 2024 [Page 47] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + "The protection transport entity has a signal fail condition + that is of higher priority than the forced switchover + command."; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; } @@ -2621,19 +2682,19 @@ Internet-Draft TE Common YANG Types September 2023 identity manual-switch { base lsp-protection-state; - description - "A manual switchover command is active."; - reference - "RFC 4427: Recovery (Protection and Restoration) Terminology - for Generalized Multi-Protocol Label Switching (GMPLS)"; -Busi, et al. Expires 18 March 2024 [Page 47] +Busi, et al. Expires 20 May 2024 [Page 48] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + description + "A manual switchover command is active."; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; } identity wait-to-restore { @@ -2677,18 +2738,18 @@ Internet-Draft TE Common YANG Types September 2023 "A temporary configuration action initiated by an operator command that prevents any switchover action from being taken and, as such, freezes the current state."; - reference - "RFC 4427: Recovery (Protection and Restoration) Terminology - for Generalized Multi-Protocol Label Switching (GMPLS)"; - } - -Busi, et al. Expires 18 March 2024 [Page 48] +Busi, et al. Expires 20 May 2024 [Page 49] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } identity clear-freeze { base protection-external-commands; @@ -2733,19 +2794,19 @@ Internet-Draft TE Common YANG Types September 2023 } identity action-forced-switch { - base protection-external-commands; - description - "A switchover action initiated by an operator command to switch - the Extra-Traffic signal, the normal traffic signal, or the - null signal to the protection transport entity, unless a -Busi, et al. Expires 18 March 2024 [Page 49] +Busi, et al. Expires 20 May 2024 [Page 50] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + base protection-external-commands; + description + "A switchover action initiated by an operator command to switch + the Extra-Traffic signal, the normal traffic signal, or the + null signal to the protection transport entity, unless a switchover command of equal or higher priority is in effect."; reference "RFC 4427: Recovery (Protection and Restoration) Terminology @@ -2789,19 +2850,19 @@ Internet-Draft TE Common YANG Types September 2023 or exercise command."; reference "RFC 4427: Recovery (Protection and Restoration) Terminology - for Generalized Multi-Protocol Label Switching (GMPLS)"; - } - identity switching-capabilities { - description - -Busi, et al. Expires 18 March 2024 [Page 50] +Busi, et al. Expires 20 May 2024 [Page 51] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } + identity switching-capabilities { + description "Base identity for interface switching capabilities."; reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) @@ -2845,19 +2906,19 @@ Internet-Draft TE Common YANG Types September 2023 } identity switching-otn { - base switching-capabilities; - description - "OTN-TDM capable."; - reference - "RFC 7138: Traffic Engineering Extensions to OSPF for GMPLS -Busi, et al. Expires 18 March 2024 [Page 51] +Busi, et al. Expires 20 May 2024 [Page 52] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + base switching-capabilities; + description + "OTN-TDM capable."; + reference + "RFC 7138: Traffic Engineering Extensions to OSPF for GMPLS Control of Evolving G.709 Optical Transport Networks"; } @@ -2901,19 +2962,19 @@ Internet-Draft TE Common YANG Types September 2023 description "Packet LSP encoding."; reference - "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) - Signaling Functional Description"; - } - - identity lsp-encoding-ethernet { -Busi, et al. Expires 18 March 2024 [Page 52] +Busi, et al. Expires 20 May 2024 [Page 53] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + + "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) + Signaling Functional Description"; + } + identity lsp-encoding-ethernet { base lsp-encoding-types; description "Ethernet LSP encoding."; @@ -2958,18 +3019,17 @@ Internet-Draft TE Common YANG Types September 2023 Signaling Functional Description"; } - identity lsp-encoding-fiber { - base lsp-encoding-types; - description - "Fiber LSP encoding."; - -Busi, et al. Expires 18 March 2024 [Page 53] +Busi, et al. Expires 20 May 2024 [Page 54] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + identity lsp-encoding-fiber { + base lsp-encoding-types; + description + "Fiber LSP encoding."; reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; @@ -3014,17 +3074,18 @@ Internet-Draft TE Common YANG Types September 2023 } identity path-signaling-type { - description - "Base identity from which specific LSP path setup types - are derived."; - } -Busi, et al. Expires 18 March 2024 [Page 54] +Busi, et al. Expires 20 May 2024 [Page 55] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + + description + "Base identity from which specific LSP path setup types + are derived."; + } identity path-setup-static { base path-signaling-type; @@ -3069,19 +3130,19 @@ Internet-Draft TE Common YANG Types September 2023 } identity route-usage-type { - description - "Base identity for route usage."; - } - - identity route-include-object { -Busi, et al. Expires 18 March 2024 [Page 55] +Busi, et al. Expires 20 May 2024 [Page 56] -Internet-Draft TE Common YANG Types September 2023 +Internet-Draft TE Common YANG Types November 2023 + + description + "Base identity for route usage."; + } + identity route-include-object { base route-usage-type; description "'Include route' object."; @@ -3105,9 +3166,15 @@ Internet-Draft TE Common YANG Types September 2023 Protocol-Traffic Engineering (RSVP-TE)"; } + // CHANGE NOTE: The description of the identity path-metric-type + // has been updated in this module revision + // RFC Editor: remove the note above and this note identity path-metric-type { description - "Base identity for the path metric type."; + "Base identity for the path metric type. + + Derived identities SHOULD describe the unit and maximum value + of the path metric."; } identity path-metric-te { @@ -3119,6 +3186,14 @@ Internet-Draft TE Common YANG Types September 2023 second MPLS Traffic Engineering (TE) Metric"; } + + + +Busi, et al. Expires 20 May 2024 [Page 57] + +Internet-Draft TE Common YANG Types November 2023 + + identity path-metric-igp { base path-metric-type; description @@ -3128,20 +3203,19 @@ Internet-Draft TE Common YANG Types September 2023 second MPLS Traffic Engineering (TE) Metric"; } + // CHANGE NOTE: The reference for the identity path-metric-hop + // has been added in this module revision + // RFC Editor: remove the note above and this note identity path-metric-hop { base path-metric-type; - - - -Busi, et al. Expires 18 March 2024 [Page 56] - -Internet-Draft TE Common YANG Types September 2023 - - description "Hop path metric."; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } + identity path-metric-delay-average { base path-metric-type; description @@ -3168,6 +3242,14 @@ Internet-Draft TE Common YANG Types September 2023 "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2 RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions"; + + + +Busi, et al. Expires 20 May 2024 [Page 58] + +Internet-Draft TE Common YANG Types November 2023 + + } identity path-metric-optimize-includes { @@ -3186,14 +3268,6 @@ Internet-Draft TE Common YANG Types September 2023 identity path-tiebreaker-type { description - - - -Busi, et al. Expires 18 March 2024 [Page 57] - -Internet-Draft TE Common YANG Types September 2023 - - "Base identity for the path tiebreaker type."; } @@ -3224,6 +3298,14 @@ Internet-Draft TE Common YANG Types September 2023 identity resource-aff-include-all { base resource-affinities-type; + + + +Busi, et al. Expires 20 May 2024 [Page 59] + +Internet-Draft TE Common YANG Types November 2023 + + description "The set of attribute filters associated with a tunnel, all of which must be present for a link @@ -3242,14 +3324,6 @@ Internet-Draft TE Common YANG Types September 2023 reference "RFC 2702: Requirements for Traffic Engineering Over MPLS RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; - - - -Busi, et al. Expires 18 March 2024 [Page 58] - -Internet-Draft TE Common YANG Types September 2023 - - } identity resource-aff-exclude-any { @@ -3280,6 +3354,14 @@ Internet-Draft TE Common YANG Types September 2023 base te-optimization-criterion; description "Optimized on cost."; + + + +Busi, et al. Expires 20 May 2024 [Page 60] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; @@ -3299,13 +3381,6 @@ Internet-Draft TE Common YANG Types September 2023 "Base identity for SRLG path computation."; } - - -Busi, et al. Expires 18 March 2024 [Page 59] - -Internet-Draft TE Common YANG Types September 2023 - - identity srlg-ignore { base path-computation-srlg-type; description @@ -3335,6 +3410,14 @@ Internet-Draft TE Common YANG Types September 2023 // added in this module revision // RFC Editor: remove the note above and this note identity path-computation-error-reason { + + + +Busi, et al. Expires 20 May 2024 [Page 61] + +Internet-Draft TE Common YANG Types November 2023 + + description "Base identity for path computation error reasons."; } @@ -3345,7 +3428,8 @@ Internet-Draft TE Common YANG Types September 2023 "Path computation has failed because of an unspecified reason."; reference - "Section 7.5 of RFC5440"; + "Section 7.5 of RFC5440: Path Computation Element (PCE) + Communication Protocol (PCEP)"; } identity path-computation-error-no-topology { @@ -3355,13 +3439,6 @@ Internet-Draft TE Common YANG Types September 2023 with the provided topology-identifier."; } - - -Busi, et al. Expires 18 March 2024 [Page 60] - -Internet-Draft TE Common YANG Types September 2023 - - identity path-computation-error-no-dependent-server { base path-computation-error-reason; description @@ -3383,11 +3460,20 @@ Internet-Draft TE Common YANG Types September 2023 It corresponds to bit 31 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } + + + +Busi, et al. Expires 20 May 2024 [Page 62] + +Internet-Draft TE Common YANG Types November 2023 + + identity path-computation-error-no-inclusion-hop { base path-computation-error-reason; description @@ -3410,14 +3496,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity path-computation-error-no-resource { - - - -Busi, et al. Expires 18 March 2024 [Page 61] - -Internet-Draft TE Common YANG Types September 2023 - - base path-computation-error-reason; description "Path computation has failed because there is no @@ -3445,6 +3523,13 @@ Internet-Draft TE Common YANG Types September 2023 https://www.iana.org/assignments/pcep/pcep.xhtml"; } + + +Busi, et al. Expires 20 May 2024 [Page 63] + +Internet-Draft TE Common YANG Types November 2023 + + identity path-computation-error-destination-domain-unknown { base path-computation-error-reason; description @@ -3466,14 +3551,6 @@ Internet-Draft TE Common YANG Types September 2023 problem. It corresponds to bit 24 of the Flags field of the - - - -Busi, et al. Expires 18 March 2024 [Page 62] - -Internet-Draft TE Common YANG Types September 2023 - - NO-PATH-VECTOR TLV."; reference "RFC8306; @@ -3501,6 +3578,14 @@ Internet-Draft TE Common YANG Types September 2023 "Path computation has failed because of no GCO solution found. + + + +Busi, et al. Expires 20 May 2024 [Page 64] + +Internet-Draft TE Common YANG Types November 2023 + + It corresponds to bit 25 of the Flags field of the NO-PATH-VECTOR TLV."; reference @@ -3523,13 +3608,6 @@ Internet-Draft TE Common YANG Types September 2023 https://www.iana.org/assignments/pcep/pcep.xhtml"; } - - -Busi, et al. Expires 18 March 2024 [Page 63] - -Internet-Draft TE Common YANG Types September 2023 - - identity path-computation-error-brpc-chain-unavailable { base path-computation-error-no-dependent-server; description @@ -3553,7 +3631,16 @@ Internet-Draft TE Common YANG Types September 2023 It corresponds to bit 29 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); + + + + +Busi, et al. Expires 20 May 2024 [Page 65] + +Internet-Draft TE Common YANG Types November 2023 + https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3567,7 +3654,8 @@ Internet-Draft TE Common YANG Types September 2023 It corresponds to bit 30 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3578,15 +3666,8 @@ Internet-Draft TE Common YANG Types September 2023 "Path computation has failed because path computation server is unavailable."; reference - - - -Busi, et al. Expires 18 March 2024 [Page 64] - -Internet-Draft TE Common YANG Types September 2023 - - - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3609,10 +3690,20 @@ Internet-Draft TE Common YANG Types September 2023 identity protocol-origin-pcep { base protocol-origin-type; + + + +Busi, et al. Expires 20 May 2024 [Page 66] + +Internet-Draft TE Common YANG Types November 2023 + + description "Protocol origin is Path Computation Engine Protocol (PCEP)."; - reference "RFC5440"; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } identity protocol-origin-bgp { @@ -3634,14 +3725,6 @@ Internet-Draft TE Common YANG Types September 2023 Computation Element Communication Protocol (PCEP)."; } - - - -Busi, et al. Expires 18 March 2024 [Page 65] - -Internet-Draft TE Common YANG Types September 2023 - - identity svec-of-minimize-agg-bandwidth-consumption { base svec-objective-function-type; description @@ -3663,6 +3746,14 @@ Internet-Draft TE Common YANG Types September 2023 } identity svec-of-minimize-cost-path-set { + + + +Busi, et al. Expires 20 May 2024 [Page 67] + +Internet-Draft TE Common YANG Types November 2023 + + base svec-objective-function-type; description "Objective function for minimizing the cost on a path set @@ -3690,14 +3781,6 @@ Internet-Draft TE Common YANG Types September 2023 links (MSL)."; reference "RFC8685: Path Computation Element Communication Protocol - - - -Busi, et al. Expires 18 March 2024 [Page 66] - -Internet-Draft TE Common YANG Types September 2023 - - (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture."; } @@ -3719,6 +3802,14 @@ Internet-Draft TE Common YANG Types September 2023 "Objective function for minimizing the number of shared nodes (MSN)."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 68] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC8685: Path Computation Element Communication Protocol (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture."; @@ -3746,14 +3837,6 @@ Internet-Draft TE Common YANG Types September 2023 } identity svec-metric-cumul-igp { - - - -Busi, et al. Expires 18 March 2024 [Page 67] - -Internet-Draft TE Common YANG Types September 2023 - - base svec-metric-type; description "Cumulative IGP cost."; @@ -3775,6 +3858,14 @@ Internet-Draft TE Common YANG Types September 2023 base svec-metric-type; description "Aggregate bandwidth consumption."; + + + +Busi, et al. Expires 20 May 2024 [Page 69] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; @@ -3802,14 +3893,6 @@ Internet-Draft TE Common YANG Types September 2023 The modeling structure can be augmented later for other technologies."; container te-bandwidth { - - - -Busi, et al. Expires 18 March 2024 [Page 68] - -Internet-Draft TE Common YANG Types September 2023 - - description "Container that specifies TE bandwidth. The choices can be augmented for specific data-plane technologies."; @@ -3832,6 +3915,13 @@ Internet-Draft TE Common YANG Types September 2023 * TE label groupings **/ + + +Busi, et al. Expires 20 May 2024 [Page 70] + +Internet-Draft TE Common YANG Types November 2023 + + grouping te-label { description "This grouping defines the generic TE label. @@ -3858,14 +3948,6 @@ Internet-Draft TE Common YANG Types September 2023 type te-label-direction; default "forward"; description - - - -Busi, et al. Expires 18 March 2024 [Page 69] - -Internet-Draft TE Common YANG Types September 2023 - - "Label direction."; } } @@ -3888,6 +3970,14 @@ Internet-Draft TE Common YANG Types September 2023 leaf client-id { type te-global-id; default "0"; + + + +Busi, et al. Expires 20 May 2024 [Page 71] + +Internet-Draft TE Common YANG Types November 2023 + + description "An identifier to uniquely identify a client. If omitted, it assumes that the topology client ID @@ -3914,14 +4004,6 @@ Internet-Draft TE Common YANG Types September 2023 be applicable to links or connections. PM defined in this grouping are applicable to generic TE PM as well as packet TE PM."; - - - -Busi, et al. Expires 18 March 2024 [Page 70] - -Internet-Draft TE Common YANG Types September 2023 - - reference "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for Explicitly @@ -3944,6 +4026,14 @@ Internet-Draft TE Common YANG Types September 2023 grouping performance-metrics-two-way-delay-loss { description + + + +Busi, et al. Expires 20 May 2024 [Page 72] + +Internet-Draft TE Common YANG Types November 2023 + + "PM information in real time that can be applicable to links or connections. PM defined in this grouping are applicable to generic TE PM as well as packet TE PM."; @@ -3970,14 +4060,6 @@ Internet-Draft TE Common YANG Types September 2023 grouping performance-metrics-one-way-bandwidth { description "PM information in real time that can be applicable to links. - - - -Busi, et al. Expires 18 March 2024 [Page 71] - -Internet-Draft TE Common YANG Types September 2023 - - PM defined in this grouping are applicable to generic TE PM as well as packet TE PM."; reference @@ -4000,6 +4082,14 @@ Internet-Draft TE Common YANG Types September 2023 } leaf one-way-residual-bandwidth-normality { type te-types:performance-metrics-normality; + + + +Busi, et al. Expires 20 May 2024 [Page 73] + +Internet-Draft TE Common YANG Types November 2023 + + default "normal"; description "Residual bandwidth normality."; @@ -4026,14 +4116,6 @@ Internet-Draft TE Common YANG Types September 2023 units "bytes per second"; default "0x0p0"; description - - - -Busi, et al. Expires 18 March 2024 [Page 72] - -Internet-Draft TE Common YANG Types September 2023 - - "Bandwidth utilization that represents the actual utilization of the link (i.e., as measured in the router). For a bundled link, bandwidth utilization is defined to @@ -4056,6 +4138,14 @@ Internet-Draft TE Common YANG Types September 2023 } default "0"; description + + + +Busi, et al. Expires 20 May 2024 [Page 74] + +Internet-Draft TE Common YANG Types November 2023 + + "One-way delay or latency in microseconds."; } leaf one-way-residual-bandwidth { @@ -4082,14 +4172,6 @@ Internet-Draft TE Common YANG Types September 2023 sum of the component link available bandwidths."; } leaf one-way-utilized-bandwidth { - - - -Busi, et al. Expires 18 March 2024 [Page 73] - -Internet-Draft TE Common YANG Types September 2023 - - type rt-types:bandwidth-ieee-float32; units "bytes per second"; default "0x0p0"; @@ -4112,6 +4194,14 @@ Internet-Draft TE Common YANG Types September 2023 description "Two-way delay or latency in microseconds."; } + + + +Busi, et al. Expires 20 May 2024 [Page 75] + +Internet-Draft TE Common YANG Types November 2023 + + } grouping performance-metrics-thresholds { @@ -4138,14 +4228,6 @@ Internet-Draft TE Common YANG Types September 2023 uses performance-metrics-one-way-bandwidth; } container performance-metrics-two-way { - - - -Busi, et al. Expires 18 March 2024 [Page 74] - -Internet-Draft TE Common YANG Types September 2023 - - description "Two-way link performance information in real time."; reference @@ -4168,6 +4250,14 @@ Internet-Draft TE Common YANG Types September 2023 } description "Link performance information in real time."; + + + +Busi, et al. Expires 20 May 2024 [Page 76] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for Explicitly @@ -4194,14 +4284,6 @@ Internet-Draft TE Common YANG Types September 2023 default "0"; description "Interval, in seconds, to advertise the extended metric - - - -Busi, et al. Expires 18 March 2024 [Page 75] - -Internet-Draft TE Common YANG Types September 2023 - - values."; } leaf suppression-interval { @@ -4224,6 +4306,14 @@ Internet-Draft TE Common YANG Types September 2023 for the minimum-delay metric only) and the advertised value is not already outside that bound, an 'anomalous' announcement (anomalous bit set) will be triggered."; + + + +Busi, et al. Expires 20 May 2024 [Page 77] + +Internet-Draft TE Common YANG Types November 2023 + + } container threshold-in { uses performance-metrics-thresholds; @@ -4250,14 +4340,6 @@ Internet-Draft TE Common YANG Types September 2023 **/ grouping explicit-route-hop { - - - -Busi, et al. Expires 18 March 2024 [Page 76] - -Internet-Draft TE Common YANG Types September 2023 - - description "The explicit route entry grouping."; choice type { @@ -4280,6 +4362,14 @@ Internet-Draft TE Common YANG Types September 2023 "The identifier of a node in the TE topology."; } leaf hop-type { + + + +Busi, et al. Expires 20 May 2024 [Page 78] + +Internet-Draft TE Common YANG Types November 2023 + + type te-hop-type; default "strict"; description @@ -4306,14 +4396,6 @@ Internet-Draft TE Common YANG Types September 2023 type te-hop-type; default "strict"; description - - - -Busi, et al. Expires 18 March 2024 [Page 77] - -Internet-Draft TE Common YANG Types September 2023 - - "Strict or loose hop."; } leaf direction { @@ -4336,6 +4418,14 @@ Internet-Draft TE Common YANG Types September 2023 must "(link-tp-id-uri or link-tp-id) and " + "(node-id-uri or node-id)" { description + + + +Busi, et al. Expires 20 May 2024 [Page 79] + +Internet-Draft TE Common YANG Types November 2023 + + "At least one node identifier and at least one Link Termination Point (LTP) identifier MUST be present."; } @@ -4362,14 +4452,6 @@ Internet-Draft TE Common YANG Types September 2023 "The identifier of a node in the TE topology."; } leaf hop-type { - - - -Busi, et al. Expires 18 March 2024 [Page 78] - -Internet-Draft TE Common YANG Types September 2023 - - type te-hop-type; default "strict"; description @@ -4392,6 +4474,14 @@ Internet-Draft TE Common YANG Types September 2023 } case as-number { container as-number-hop { + + + +Busi, et al. Expires 20 May 2024 [Page 80] + +Internet-Draft TE Common YANG Types November 2023 + + leaf as-number { type inet:as-number; mandatory true; @@ -4418,14 +4508,6 @@ Internet-Draft TE Common YANG Types September 2023 "The label explicit route hop type."; } } - - - -Busi, et al. Expires 18 March 2024 [Page 79] - -Internet-Draft TE Common YANG Types September 2023 - - } grouping record-route-state { @@ -4448,6 +4530,14 @@ Internet-Draft TE Common YANG Types September 2023 "At least one node identifier MUST be present."; } description + + + +Busi, et al. Expires 20 May 2024 [Page 81] + +Internet-Draft TE Common YANG Types November 2023 + + "Numbered node route hop container."; leaf node-id-uri { type nw:node-id; @@ -4474,14 +4564,6 @@ Internet-Draft TE Common YANG Types September 2023 description "Numbered node route hop."; } - - - -Busi, et al. Expires 18 March 2024 [Page 80] - -Internet-Draft TE Common YANG Types September 2023 - - case numbered-link-hop { container numbered-link-hop { description @@ -4504,6 +4586,14 @@ Internet-Draft TE Common YANG Types September 2023 Node-Id Sub-Object"; } } + + + +Busi, et al. Expires 20 May 2024 [Page 82] + +Internet-Draft TE Common YANG Types November 2023 + + description "Numbered link route hop."; } @@ -4530,14 +4620,6 @@ Internet-Draft TE Common YANG Types September 2023 leaf node-id-uri { type nw:node-id; description - - - -Busi, et al. Expires 18 March 2024 [Page 81] - -Internet-Draft TE Common YANG Types September 2023 - - "The identifier of a node in the topology."; } leaf node-id { @@ -4560,6 +4642,14 @@ Internet-Draft TE Common YANG Types September 2023 "Unnumbered link Record Route hop."; reference "RFC 3477: Signalling Unnumbered Links in Resource + + + +Busi, et al. Expires 20 May 2024 [Page 83] + +Internet-Draft TE Common YANG Types November 2023 + + ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; } description @@ -4586,14 +4676,6 @@ Internet-Draft TE Common YANG Types September 2023 "The label Record Route entry types."; } } - - - -Busi, et al. Expires 18 March 2024 [Page 82] - -Internet-Draft TE Common YANG Types September 2023 - - } grouping label-restriction-info { @@ -4616,6 +4698,14 @@ Internet-Draft TE Common YANG Types September 2023 } leaf index { type uint32; + + + +Busi, et al. Expires 20 May 2024 [Page 84] + +Internet-Draft TE Common YANG Types November 2023 + + description "The index of the label restriction list entry."; } @@ -4642,14 +4732,6 @@ Internet-Draft TE Common YANG Types September 2023 container label-end { must "(not(../label-start/te-label/direction) and" + " not(te-label/direction))" - - - -Busi, et al. Expires 18 March 2024 [Page 83] - -Internet-Draft TE Common YANG Types September 2023 - - + " or " + "(../label-start/te-label/direction = te-label/direction)" + " or " @@ -4672,6 +4754,14 @@ Internet-Draft TE Common YANG Types September 2023 The label start/end values will have to be consistent with the sign of label step. For example, 'label-start' < 'label-end' enforces 'label-step' > 0 + + + +Busi, et al. Expires 20 May 2024 [Page 85] + +Internet-Draft TE Common YANG Types November 2023 + + 'label-start' > 'label-end' enforces 'label-step' < 0."; choice technology { default "generic"; @@ -4698,14 +4788,6 @@ Internet-Draft TE Common YANG Types September 2023 to the left in the byte sequence. Leading zero bytes in the configured value may be omitted for brevity. Each bit position in the 'range-bitmap' 'hex-string' maps - - - -Busi, et al. Expires 18 March 2024 [Page 84] - -Internet-Draft TE Common YANG Types September 2023 - - to a label in the range derived from 'label-start'. For example, assuming that 'label-start' = 16000 and @@ -4728,6 +4810,14 @@ Internet-Draft TE Common YANG Types September 2023 description "The label restrictions container."; list label-restriction { + + + +Busi, et al. Expires 20 May 2024 [Page 86] + +Internet-Draft TE Common YANG Types November 2023 + + key "index"; description "The absence of the label restrictions container implies @@ -4754,14 +4844,6 @@ Internet-Draft TE Common YANG Types September 2023 } leaf weight { type uint8; - - - -Busi, et al. Expires 18 March 2024 [Page 85] - -Internet-Draft TE Common YANG Types September 2023 - - default "1"; description "TE path metric normalization weight."; @@ -4784,6 +4866,14 @@ Internet-Draft TE Common YANG Types September 2023 grouping common-constraints { description + + + +Busi, et al. Expires 20 May 2024 [Page 87] + +Internet-Draft TE Common YANG Types November 2023 + + "Common constraints grouping that can be set on a constraint set or directly on the tunnel."; uses te-bandwidth { @@ -4810,14 +4900,6 @@ Internet-Draft TE Common YANG Types September 2023 description "TE LSP requested setup priority."; reference - - - -Busi, et al. Expires 18 March 2024 [Page 86] - -Internet-Draft TE Common YANG Types September 2023 - - "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } leaf hold-priority { @@ -4840,6 +4922,14 @@ Internet-Draft TE Common YANG Types September 2023 } } + + + +Busi, et al. Expires 20 May 2024 [Page 88] + +Internet-Draft TE Common YANG Types November 2023 + + grouping tunnel-constraints { description "Tunnel constraints grouping that can be set on @@ -4866,14 +4956,6 @@ Internet-Draft TE Common YANG Types September 2023 description "List of route objects to always exclude from the path computation."; - - - -Busi, et al. Expires 18 March 2024 [Page 87] - -Internet-Draft TE Common YANG Types September 2023 - - leaf index { type uint32; description @@ -4896,6 +4978,14 @@ Internet-Draft TE Common YANG Types September 2023 default "te-types:route-include-object"; description "Indicates whether to include or exclude the + + + +Busi, et al. Expires 20 May 2024 [Page 89] + +Internet-Draft TE Common YANG Types November 2023 + + route object. The default is to include it."; } leaf index { @@ -4922,14 +5012,6 @@ Internet-Draft TE Common YANG Types September 2023 } description "Augmentation for a generic explicit route for SRLG - - - -Busi, et al. Expires 18 March 2024 [Page 88] - -Internet-Draft TE Common YANG Types September 2023 - - exclusion."; } } @@ -4952,6 +5034,14 @@ Internet-Draft TE Common YANG Types September 2023 description "Route object entry index. The index is used to identify an entry in the list. The order of entries + + + +Busi, et al. Expires 20 May 2024 [Page 90] + +Internet-Draft TE Common YANG Types November 2023 + + is defined by the user without relying on key values."; } uses explicit-route-hop; @@ -4978,14 +5068,6 @@ Internet-Draft TE Common YANG Types September 2023 uses explicit-route-hop { augment "type" { case srlg { - - - -Busi, et al. Expires 18 March 2024 [Page 89] - -Internet-Draft TE Common YANG Types September 2023 - - container srlg { description "SRLG container."; @@ -5008,6 +5090,14 @@ Internet-Draft TE Common YANG Types September 2023 grouping generic-path-metric-bounds { description + + + +Busi, et al. Expires 20 May 2024 [Page 91] + +Internet-Draft TE Common YANG Types November 2023 + + "TE path metric bounds grouping."; container path-metric-bounds { description @@ -5028,20 +5118,16 @@ Internet-Draft TE Common YANG Types September 2023 type uint64; default "0"; description - "Upper bound on the end-to-end TE path metric. A zero - indicates an unbounded upper limit for the specific - 'metric-type'."; + "Upper bound on the end-to-end TE path metric. + + A zero indicates an unbounded upper limit for the + specific 'metric-type'. + + The unit of is interpreted in the context of the + path-metric-type."; } } } - - - -Busi, et al. Expires 18 March 2024 [Page 90] - -Internet-Draft TE Common YANG Types September 2023 - - } grouping generic-path-optimization { @@ -5060,6 +5146,14 @@ Internet-Draft TE Common YANG Types September 2023 list optimization-metric { key "metric-type"; description + + + +Busi, et al. Expires 20 May 2024 [Page 92] + +Internet-Draft TE Common YANG Types November 2023 + + "TE path metric type."; uses optimization-metric-entry; } @@ -5090,14 +5184,6 @@ Internet-Draft TE Common YANG Types September 2023 description "The objective function container that includes attributes to impose when computing a TE path."; - - - -Busi, et al. Expires 18 March 2024 [Page 91] - -Internet-Draft TE Common YANG Types September 2023 - - leaf objective-function-type { type identityref { base objective-function-type; @@ -5116,6 +5202,14 @@ Internet-Draft TE Common YANG Types September 2023 description "Path affinities grouping."; container path-affinities-values { + + + +Busi, et al. Expires 20 May 2024 [Page 93] + +Internet-Draft TE Common YANG Types November 2023 + + description "Path affinities represented as values."; list path-affinities-value { @@ -5146,14 +5240,6 @@ Internet-Draft TE Common YANG Types September 2023 description "List of named affinity constraints."; leaf usage { - - - -Busi, et al. Expires 18 March 2024 [Page 92] - -Internet-Draft TE Common YANG Types September 2023 - - type identityref { base resource-affinities-type; } @@ -5172,6 +5258,14 @@ Internet-Draft TE Common YANG Types September 2023 "List of named affinities."; } } + + + +Busi, et al. Expires 20 May 2024 [Page 94] + +Internet-Draft TE Common YANG Types November 2023 + + } } @@ -5202,14 +5296,6 @@ Internet-Draft TE Common YANG Types September 2023 } container path-srlgs-names { description - - - -Busi, et al. Expires 18 March 2024 [Page 93] - -Internet-Draft TE Common YANG Types September 2023 - - "Container for the list of named SRLGs."; list path-srlgs-name { key "usage"; @@ -5228,6 +5314,14 @@ Internet-Draft TE Common YANG Types September 2023 description "List of named SRLGs."; } + + + +Busi, et al. Expires 20 May 2024 [Page 95] + +Internet-Draft TE Common YANG Types November 2023 + + } } } @@ -5258,14 +5352,6 @@ Internet-Draft TE Common YANG Types September 2023 grouping generic-path-constraints { description "Global named path constraints configuration grouping."; - - - -Busi, et al. Expires 18 March 2024 [Page 94] - -Internet-Draft TE Common YANG Types September 2023 - - container path-constraints { description "TE named path constraints container."; @@ -5284,6 +5370,14 @@ Internet-Draft TE Common YANG Types September 2023 list path-metric { key "metric-type"; description + + + +Busi, et al. Expires 20 May 2024 [Page 96] + +Internet-Draft TE Common YANG Types November 2023 + + "TE path metric type."; leaf metric-type { type identityref { @@ -5314,14 +5408,6 @@ Internet-Draft TE Common YANG Types September 2023 type uint32; description "Route object entry index. The index is used to - - - -Busi, et al. Expires 18 March 2024 [Page 95] - -Internet-Draft TE Common YANG Types September 2023 - - identify an entry in the list. The order of entries is defined by the user without relying on key values."; @@ -5340,6 +5426,14 @@ Internet-Draft TE Common YANG Types September 2023 "Common grouping to define the LSP encoding and switching types"; leaf encoding { + + + +Busi, et al. Expires 20 May 2024 [Page 97] + +Internet-Draft TE Common YANG Types November 2023 + + type identityref { base te-types:lsp-encoding-types; } @@ -5371,13 +5465,6 @@ Internet-Draft TE Common YANG Types September 2023 CHANGE NOTE: Please focus your review only on the updates to the YANG model: see also Appendix A.1. - - -Busi, et al. Expires 18 March 2024 [Page 96] - -Internet-Draft TE Common YANG Types September 2023 - - RFC Editor: remove the CHANGE NOTE above and this note file "ietf-te-packet-types@2023-07-10.yang" @@ -5391,12 +5478,18 @@ Internet-Draft TE Common YANG Types September 2023 import ietf-te-types { prefix te-types; reference - "RFCXXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFCXXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number // and remove this note + + +Busi, et al. Expires 20 May 2024 [Page 98] + +Internet-Draft TE Common YANG Types November 2023 + + organization "IETF Traffic Engineering Architecture and Signaling (TEAS) Working Group"; @@ -5420,20 +5513,14 @@ Internet-Draft TE Common YANG Types September 2023 "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to MPLS TE. The model fully - conforms to the Network Management Datastore Architecture - (NMDA). + data type definitions specific to Packet Traffic Enginnering (TE). + + The model fully conforms to the Network Management Datastore + Architecture (NMDA). Copyright (c) 2023 IETF Trust and the persons identified as authors of the code. All rights reserved. - - -Busi, et al. Expires 18 March 2024 [Page 97] - -Internet-Draft TE Common YANG Types September 2023 - - 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 @@ -5444,18 +5531,28 @@ Internet-Draft TE Common YANG Types September 2023 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."; - - revision 2023-07-10 { + revision 2023-11-16 { description "Added common TE packet identities: - - bandwidth-profile-type. + - bandwidth-profile-type; + - path-metric-loss; + - path-metric-delay-variation. + + + + +Busi, et al. Expires 20 May 2024 [Page 99] + +Internet-Draft TE Common YANG Types November 2023 + Added common TE packet groupings: - te-packet-path-bandwidth; - - te-packet-link-bandwidth."; + - te-packet-link-bandwidth. + + Updated module description."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -5482,14 +5579,6 @@ Internet-Draft TE Common YANG Types September 2023 identity mef-10-bwp { base bandwidth-profile-type; - - - -Busi, et al. Expires 18 March 2024 [Page 98] - -Internet-Draft TE Common YANG Types September 2023 - - description "MEF 10 Bandwidth Profile"; reference @@ -5505,6 +5594,14 @@ Internet-Draft TE Common YANG Types September 2023 } identity rfc-2698-bwp { + + + +Busi, et al. Expires 20 May 2024 [Page 100] + +Internet-Draft TE Common YANG Types November 2023 + + base bandwidth-profile-type; description "RFC 2698 Bandwidth Profile"; @@ -5521,6 +5618,66 @@ Internet-Draft TE Common YANG Types September 2023 Marker with Efficient Handling of in-Profile Traffic"; } + // CHANGE NOTE: The identity path-metric-loss below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-loss { + base path-metric-type; + description + "The path loss (as a packet percentage) metric type + encodes a function of the unidirectional loss metrics of all + links traversed by a P2P path. + + The basic unit is 0.000003%, + where (2^24 - 2) or 50.331642% is the maximum value of the + path loss percentage that can be expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + + // CHANGE NOTE: The identity path-metric-delay-variation below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-delay-variation { + base path-metric-type; + description + + + +Busi, et al. Expires 20 May 2024 [Page 101] + +Internet-Draft TE Common YANG Types November 2023 + + + "The path delay variation encodes the sum of the unidirectional + delay variation metrics of all links traversed by a P2P path. + + The path delay variation metric unit is in microseconds, where + (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + maximum value of the path delay variation that can be + expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + /* * Typedefs */ @@ -5538,14 +5695,6 @@ Internet-Draft TE Common YANG Types September 2023 } description "Enumerated type for specifying whether bandwidth is - - - -Busi, et al. Expires 18 March 2024 [Page 99] - -Internet-Draft TE Common YANG Types September 2023 - - explicitly specified or automatically computed."; } @@ -5557,6 +5706,14 @@ Internet-Draft TE Common YANG Types September 2023 bandwidth constraints. Class-Type is used for the purposes of link bandwidth allocation, constraint-based routing, and admission control."; + + + +Busi, et al. Expires 20 May 2024 [Page 102] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4124: Protocol Extensions for Support of Diffserv-aware MPLS Traffic Engineering"; @@ -5594,14 +5751,6 @@ Internet-Draft TE Common YANG Types September 2023 "Bandwidth values, expressed in gigabits per second."; } - - - -Busi, et al. Expires 18 March 2024 [Page 100] - -Internet-Draft TE Common YANG Types September 2023 - - identity backup-protection-type { description "Base identity for the backup protection type."; @@ -5613,6 +5762,14 @@ Internet-Draft TE Common YANG Types September 2023 "Backup provides link protection only."; } + + + +Busi, et al. Expires 20 May 2024 [Page 103] + +Internet-Draft TE Common YANG Types November 2023 + + identity backup-protection-node-link { base backup-protection-type; description @@ -5650,14 +5807,6 @@ Internet-Draft TE Common YANG Types September 2023 base bc-model-type; description "Maximum Allocation with Reservation Bandwidth Constraints - - - -Busi, et al. Expires 18 March 2024 [Page 101] - -Internet-Draft TE Common YANG Types September 2023 - - Model type."; reference "RFC 4126: Max Allocation with Reservation Bandwidth @@ -5669,6 +5818,14 @@ Internet-Draft TE Common YANG Types September 2023 * Groupings */ + + + +Busi, et al. Expires 20 May 2024 [Page 104] + +Internet-Draft TE Common YANG Types November 2023 + + grouping performance-metrics-attributes-packet { description "Contains PM attributes."; @@ -5706,14 +5863,6 @@ Internet-Draft TE Common YANG Types September 2023 } description "One-way delay variation in microseconds."; - - - -Busi, et al. Expires 18 March 2024 [Page 102] - -Internet-Draft TE Common YANG Types September 2023 - - reference "RFC 5481: Packet Delay Variation Applicability Statement, Section 4.2"; @@ -5725,6 +5874,14 @@ Internet-Draft TE Common YANG Types September 2023 "One-way delay variation normality."; reference "RFC 7471: OSPF Traffic Engineering (TE) Metric + + + +Busi, et al. Expires 20 May 2024 [Page 105] + +Internet-Draft TE Common YANG Types November 2023 + + Extensions RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using @@ -5762,14 +5919,6 @@ Internet-Draft TE Common YANG Types September 2023 description "PM one-way packet-specific augmentation for a generic PM grouping."; - - - -Busi, et al. Expires 18 March 2024 [Page 103] - -Internet-Draft TE Common YANG Types September 2023 - - } augment "performance-metrics-two-way" { leaf two-way-min-delay { @@ -5781,6 +5930,14 @@ Internet-Draft TE Common YANG Types September 2023 "Two-way minimum delay or latency in microseconds."; } leaf two-way-min-delay-normality { + + + +Busi, et al. Expires 20 May 2024 [Page 106] + +Internet-Draft TE Common YANG Types November 2023 + + type te-types:performance-metrics-normality; default "normal"; description @@ -5818,14 +5975,6 @@ Internet-Draft TE Common YANG Types September 2023 } leaf two-way-delay-variation { type uint32 { - - - -Busi, et al. Expires 18 March 2024 [Page 104] - -Internet-Draft TE Common YANG Types September 2023 - - range "0..16777215"; } default "0"; @@ -5837,6 +5986,14 @@ Internet-Draft TE Common YANG Types September 2023 } leaf two-way-delay-variation-normality { type te-types:performance-metrics-normality; + + + +Busi, et al. Expires 20 May 2024 [Page 107] + +Internet-Draft TE Common YANG Types November 2023 + + default "normal"; description "Two-way delay variation normality."; @@ -5874,14 +6031,6 @@ Internet-Draft TE Common YANG Types September 2023 RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using TE Metric Extensions - - - -Busi, et al. Expires 18 March 2024 [Page 105] - -Internet-Draft TE Common YANG Types September 2023 - - RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; } @@ -5893,6 +6042,14 @@ Internet-Draft TE Common YANG Types September 2023 "One-way packet PM throttle grouping."; leaf one-way-min-delay { type uint32 { + + + +Busi, et al. Expires 20 May 2024 [Page 108] + +Internet-Draft TE Common YANG Types November 2023 + + range "0..16777215"; } default "0"; @@ -5930,14 +6087,6 @@ Internet-Draft TE Common YANG Types September 2023 grouping two-way-performance-metrics-packet { description - - - -Busi, et al. Expires 18 March 2024 [Page 106] - -Internet-Draft TE Common YANG Types September 2023 - - "Two-way packet PM throttle grouping."; leaf two-way-min-delay { type uint32 { @@ -5949,6 +6098,14 @@ Internet-Draft TE Common YANG Types September 2023 } leaf two-way-max-delay { type uint32 { + + + +Busi, et al. Expires 20 May 2024 [Page 109] + +Internet-Draft TE Common YANG Types November 2023 + + range "0..16777215"; } default "0"; @@ -5986,14 +6143,6 @@ Internet-Draft TE Common YANG Types September 2023 description "PM threshold-out packet augmentation for a generic grouping."; - - - -Busi, et al. Expires 18 March 2024 [Page 107] - -Internet-Draft TE Common YANG Types September 2023 - - } augment "throttle/threshold-in" { uses one-way-performance-metrics-packet; @@ -6005,6 +6154,14 @@ Internet-Draft TE Common YANG Types September 2023 augment "throttle/threshold-accelerated-advertisement" { uses one-way-performance-metrics-packet; uses two-way-performance-metrics-packet; + + + +Busi, et al. Expires 20 May 2024 [Page 110] + +Internet-Draft TE Common YANG Types November 2023 + + description "PM accelerated advertisement packet augmentation for a generic grouping."; @@ -6042,14 +6199,6 @@ Internet-Draft TE Common YANG Types September 2023 description "Committed Burst Size (CBS)."; } - - - -Busi, et al. Expires 18 March 2024 [Page 108] - -Internet-Draft TE Common YANG Types September 2023 - - leaf eir { type uint64; units "bits/second"; @@ -6061,6 +6210,14 @@ Internet-Draft TE Common YANG Types September 2023 units "bytes"; description "Excess Burst Size (EBS)."; + + + +Busi, et al. Expires 20 May 2024 [Page 111] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf pir { type uint64; @@ -6099,13 +6256,6 @@ Internet-Draft TE Common YANG Types September 2023 For the following URIs in the "IETF XML Registry" [RFC3688], IANA has updated the reference field to refer to this document: - - -Busi, et al. Expires 18 March 2024 [Page 109] - -Internet-Draft TE Common YANG Types September 2023 - - URI: urn:ietf:params:xml:ns:yang:ietf-te-types Registrant Contact: The IESG. XML: N/A, the requested URI is an XML namespace. @@ -6117,6 +6267,13 @@ Internet-Draft TE Common YANG Types September 2023 This document also adds updated YANG modules to the "YANG Module Names" registry [RFC7950]: + + +Busi, et al. Expires 20 May 2024 [Page 112] + +Internet-Draft TE Common YANG Types November 2023 + + name: ietf-te-types namespace: urn:ietf:params:xml:ns:yang:ietf-te-types prefix: te-types @@ -6154,14 +6311,6 @@ Internet-Draft TE Common YANG Types September 2023 operations (e.g., edit-config) to these data nodes without proper protection can have a negative effect on network operations. - - - -Busi, et al. Expires 18 March 2024 [Page 110] - -Internet-Draft TE Common YANG Types September 2023 - - The security considerations spelled out in the YANG 1.1 specification [RFC7950] apply for this document as well. @@ -6174,6 +6323,13 @@ Internet-Draft TE Common YANG Types September 2023 switching - Linear trail and subnetwork protection", ITU-T G.808.1 , May 2014. + + +Busi, et al. Expires 20 May 2024 [Page 113] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, @@ -6209,15 +6365,6 @@ Internet-Draft TE Common YANG Types September 2023 Concurrent Optimization", RFC 5557, DOI 10.17487/RFC5557, July 2009, . - - - - -Busi, et al. Expires 18 March 2024 [Page 111] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC6020] Bjorklund, M., Ed., "YANG - A Data Modeling Language for the Network Configuration Protocol (NETCONF)", RFC 6020, DOI 10.17487/RFC6020, October 2010, @@ -6232,6 +6379,13 @@ Internet-Draft TE Common YANG Types September 2023 Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011, . + + +Busi, et al. Expires 20 May 2024 [Page 114] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC6991] Schoenwaelder, J., Ed., "Common YANG Data Types", RFC 6991, DOI 10.17487/RFC6991, July 2013, . @@ -6265,15 +6419,6 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC8341, March 2018, . - - - - -Busi, et al. Expires 18 March 2024 [Page 112] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N., Ananthakrishnan, H., and X. Liu, "A YANG Data Model for Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March @@ -6290,6 +6435,13 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC8685, December 2019, . + + +Busi, et al. Expires 20 May 2024 [Page 115] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, "Common YANG Data Types for Traffic Engineering", RFC 8776, DOI 10.17487/RFC8776, June 2020, @@ -6312,11 +6464,25 @@ Internet-Draft TE Common YANG Types September 2023 Liu, X., Bryskin, I., Beeram, V. P., Saad, T., Shah, H. C., and O. G. de Dios, "YANG Data Model for Layer 3 TE Topologies", Work in Progress, Internet-Draft, draft-ietf- - teas-yang-l3-te-topo-14, 12 March 2023, + teas-yang-l3-te-topo-15, 21 October 2023, . + yang-l3-te-topo-15>. + [I-D.ietf-teas-yang-path-computation] + Busi, I., Belotti, S., de Dios, O. G., Sharma, A., and Y. + Shi, "A YANG Data Model for requesting path computation", + Work in Progress, Internet-Draft, draft-ietf-teas-yang- + path-computation-21, 7 July 2023, + . + [I-D.ietf-teas-yang-te] + Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. + Bryskin, "A YANG Data Model for Traffic Engineering + Tunnels, Label Switched Paths and Interfaces", Work in + Progress, Internet-Draft, draft-ietf-teas-yang-te-34, 1 + October 2023, . @@ -6325,26 +6491,12 @@ Internet-Draft TE Common YANG Types September 2023 -Busi, et al. Expires 18 March 2024 [Page 113] - -Internet-Draft TE Common YANG Types September 2023 - [I-D.ietf-teas-yang-path-computation] - Busi, I., Belotti, S., de Dios, O. G., Sharma, A., and Y. - Shi, "A YANG Data Model for requesting path computation", - Work in Progress, Internet-Draft, draft-ietf-teas-yang- - path-computation-21, 7 July 2023, - . +Busi, et al. Expires 20 May 2024 [Page 116] + +Internet-Draft TE Common YANG Types November 2023 - [I-D.ietf-teas-yang-te] - Saad, T., Gandhi, R., Liu, X., Beeram, V. P., Bryskin, I., - and O. G. de Dios, "A YANG Data Model for Traffic - Engineering Tunnels, Label Switched Paths and Interfaces", - Work in Progress, Internet-Draft, draft-ietf-teas-yang-te- - 33, 4 July 2023, . [I-D.ietf-teas-yang-te-mpls] Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. @@ -6379,13 +6531,6 @@ Internet-Draft TE Common YANG Types September 2023 Tunnels", RFC 3209, DOI 10.17487/RFC3209, December 2001, . - - -Busi, et al. Expires 18 March 2024 [Page 114] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC3272] Awduche, D., Chiu, A., Elwalid, A., Widjaja, I., and X. Xiao, "Overview and Principles of Internet Traffic Engineering", RFC 3272, DOI 10.17487/RFC3272, May 2002, @@ -6401,6 +6546,14 @@ Internet-Draft TE Common YANG Types September 2023 (RSVP-TE)", RFC 3477, DOI 10.17487/RFC3477, January 2003, . + + + +Busi, et al. Expires 20 May 2024 [Page 117] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC3630] Katz, D., Kompella, K., and D. Yeung, "Traffic Engineering (TE) Extensions to OSPF Version 2", RFC 3630, DOI 10.17487/RFC3630, September 2003, @@ -6431,17 +6584,6 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC4124, June 2005, . - - - - - - -Busi, et al. Expires 18 March 2024 [Page 115] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC4125] Le Faucheur, F. and W. Lai, "Maximum Allocation Bandwidth Constraints Model for Diffserv-aware MPLS Traffic Engineering", RFC 4125, DOI 10.17487/RFC4125, June 2005, @@ -6458,6 +6600,16 @@ Internet-Draft TE Common YANG Types September 2023 RFC 4127, DOI 10.17487/RFC4127, June 2005, . + + + + + +Busi, et al. Expires 20 May 2024 [Page 118] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC4202] Kompella, K., Ed. and Y. Rekhter, Ed., "Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 4202, DOI 10.17487/RFC4202, October 2005, @@ -6490,14 +6642,6 @@ Internet-Draft TE Common YANG Types September 2023 Requirements", RFC 4657, DOI 10.17487/RFC4657, September 2006, . - - - -Busi, et al. Expires 18 March 2024 [Page 116] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC4736] Vasseur, JP., Ed., Ikejiri, Y., and R. Zhang, "Reoptimization of Multiprotocol Label Switching (MPLS) Traffic Engineering (TE) Loosely Routed Label Switched @@ -6514,6 +6658,14 @@ Internet-Draft TE Common YANG Types September 2023 "GMPLS Segment Recovery", RFC 4873, DOI 10.17487/RFC4873, May 2007, . + + + +Busi, et al. Expires 20 May 2024 [Page 119] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. Yasukawa, Ed., "Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to- @@ -6547,13 +6699,6 @@ Internet-Draft TE Common YANG Types September 2023 Engineering", RFC 5305, DOI 10.17487/RFC5305, October 2008, . - - -Busi, et al. Expires 18 March 2024 [Page 117] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC5307] Kompella, K., Ed. and Y. Rekhter, Ed., "IS-IS Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 5307, DOI 10.17487/RFC5307, October 2008, @@ -6570,6 +6715,13 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC5712, January 2010, . + + +Busi, et al. Expires 20 May 2024 [Page 120] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol Extensions for Multi-Layer and Multi-Region Networks (MLN/ @@ -6600,16 +6752,6 @@ Internet-Draft TE Common YANG Types September 2023 Label Switched Paths", RFC 6511, DOI 10.17487/RFC6511, February 2012, . - - - - - -Busi, et al. Expires 18 March 2024 [Page 118] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC6780] Berger, L., Le Faucheur, F., and A. Narayanan, "RSVP ASSOCIATION Object Extensions", RFC 6780, DOI 10.17487/RFC6780, October 2012, @@ -6626,6 +6768,16 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC6827, January 2013, . + + + + + +Busi, et al. Expires 20 May 2024 [Page 121] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., and K. Pithewan, "GMPLS Signaling Extensions for Control of Evolving G.709 Optical Transport Networks", RFC 7139, @@ -6658,14 +6810,6 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC7570, July 2015, . - - - -Busi, et al. Expires 18 March 2024 [Page 119] - -Internet-Draft TE Common YANG Types September 2023 - - [RFC7571] Dong, J., Chen, M., Li, Z., and D. Ceccarelli, "GMPLS RSVP-TE Extensions for Lock Instruct and Loopback", RFC 7571, DOI 10.17487/RFC7571, July 2015, @@ -6683,6 +6827,13 @@ Internet-Draft TE Common YANG Types September 2023 RFC 7823, DOI 10.17487/RFC7823, May 2016, . + + +Busi, et al. Expires 20 May 2024 [Page 122] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., Hartley, M., and Z. Ali, "RSVP-TE Extensions for Collecting Shared Risk Link Group (SRLG) Information", @@ -6700,6 +6851,12 @@ Internet-Draft TE Common YANG Types September 2023 Networks", RFC 8169, DOI 10.17487/RFC8169, May 2017, . + [RFC8233] Dhody, D., Wu, Q., Manral, V., Ali, Z., and K. Kumaki, + "Extensions to the Path Computation Element Communication + Protocol (PCEP) to Compute Service-Aware Label Switched + Paths (LSPs)", RFC 8233, DOI 10.17487/RFC8233, September + 2017, . + [RFC8570] Ginsberg, L., Ed., Previdi, S., Ed., Giacalone, S., Ward, D., Drake, J., and Q. Wu, "IS-IS Traffic Engineering (TE) Metric Extensions", RFC 8570, DOI 10.17487/RFC8570, March @@ -6711,17 +6868,6 @@ Internet-Draft TE Common YANG Types September 2023 DOI 10.17487/RFC9314, September 2022, . - - - - - - -Busi, et al. Expires 18 March 2024 [Page 120] - -Internet-Draft TE Common YANG Types September 2023 - - Appendix A. Changes from RFC 8776 To be added in a future revision of this draft. @@ -6737,6 +6883,13 @@ A.1. TE Types YANG Diffs of the YANG model in Section 4 to the changes compared with the YANG model in [RFC8776]. + + +Busi, et al. Expires 20 May 2024 [Page 123] + +Internet-Draft TE Common YANG Types November 2023 + + This diff has been generated using the following UNIX commands to compare the YANG module revisions in section 3.1 of [RFC8776] and in Section 4: @@ -6770,14 +6923,6 @@ A.1. TE Types YANG Diffs > Copyright (c) 2023 IETF Trust and the persons identified as 60c70 < the license terms contained in, the Simplified BSD License set - - - -Busi, et al. Expires 18 March 2024 [Page 121] - -Internet-Draft TE Common YANG Types September 2023 - - --- > the license terms contained in, the Revised BSD License set 65,66c75,108 @@ -6793,6 +6938,14 @@ Internet-Draft TE Common YANG Types September 2023 > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; + + + +Busi, et al. Expires 20 May 2024 [Page 124] + +Internet-Draft TE Common YANG Types November 2023 + + > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; > - base identity path-computation-error-reason and @@ -6826,14 +6979,6 @@ Internet-Draft TE Common YANG Types September 2023 > type enumeration { > enum primary-path { > description - - - -Busi, et al. Expires 18 March 2024 [Page 122] - -Internet-Draft TE Common YANG Types September 2023 - - > "Indicates that the TE path is a primary path."; > } > enum secondary-path { @@ -6849,6 +6994,14 @@ Internet-Draft TE Common YANG Types September 2023 > "Indicates that the TE path is a secondary reverse path."; > } > } + + + +Busi, et al. Expires 20 May 2024 [Page 125] + +Internet-Draft TE Common YANG Types November 2023 + + > description > "The type of TE path, indicating whether a path is a primary, > or a reverse primary, or a secondary, or a reverse secondary @@ -6882,14 +7035,6 @@ Internet-Draft TE Common YANG Types September 2023 > // CHANGE NOTE: The description of the base identity > // objective-function-type has been updated > // in this module revision - - - -Busi, et al. Expires 18 March 2024 [Page 123] - -Internet-Draft TE Common YANG Types September 2023 - - > // RFC Editor: remove the note above and this note 985c1081 < "Base objective function type."; @@ -6905,6 +7050,14 @@ Internet-Draft TE Common YANG Types September 2023 < consumption."; --- > consumption."; + + + +Busi, et al. Expires 20 May 2024 [Page 126] + +Internet-Draft TE Common YANG Types November 2023 + + 1023c1123 < Computation Element Communication Protocol (PCEP)"; --- @@ -6938,14 +7091,6 @@ Internet-Draft TE Common YANG Types September 2023 > description > "Tunnel administrative auto state. The administrative status > in state datastore transitions to 'tunnel-admin-up' when the - - - -Busi, et al. Expires 18 March 2024 [Page 124] - -Internet-Draft TE Common YANG Types September 2023 - - > tunnel used by the client layer, and to 'tunnel-admin-down' > when it is not used by the client layer."; > } @@ -6961,6 +7106,14 @@ Internet-Draft TE Common YANG Types September 2023 > } > 1628a1758,1761 + + + +Busi, et al. Expires 20 May 2024 [Page 127] + +Internet-Draft TE Common YANG Types November 2023 + + > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision @@ -6994,14 +7147,6 @@ Internet-Draft TE Common YANG Types September 2023 > "Path computation has failed because of an unspecified > reason."; > reference - - - -Busi, et al. Expires 18 March 2024 [Page 125] - -Internet-Draft TE Common YANG Types September 2023 - - > "Section 7.5 of RFC5440"; > } > @@ -7017,6 +7162,14 @@ Internet-Draft TE Common YANG Types September 2023 > description > "Path computation has failed because one or more dependent > path computation servers are unavailable. + + + +Busi, et al. Expires 20 May 2024 [Page 128] + +Internet-Draft TE Common YANG Types November 2023 + + > > The dependent path computation server could be > a Backward-Recursive Path Computation (BRPC) downstream @@ -7050,14 +7203,6 @@ Internet-Draft TE Common YANG Types September 2023 > description > "Path computation has failed because the destination node is > unknown in indicated destination domain. - - - -Busi, et al. Expires 18 March 2024 [Page 126] - -Internet-Draft TE Common YANG Types September 2023 - - > > It corresponds to bit 19 of the Flags field of the > NO-PATH-VECTOR TLV."; @@ -7073,6 +7218,14 @@ Internet-Draft TE Common YANG Types September 2023 > "Path computation has failed because there is no > available resource in one or more domains. > + + + +Busi, et al. Expires 20 May 2024 [Page 129] + +Internet-Draft TE Common YANG Types November 2023 + + > It corresponds to bit 20 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference @@ -7106,14 +7259,6 @@ Internet-Draft TE Common YANG Types September 2023 > reference > "RFC8685; > - - - -Busi, et al. Expires 18 March 2024 [Page 127] - -Internet-Draft TE Common YANG Types September 2023 - - > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } > @@ -7129,6 +7274,14 @@ Internet-Draft TE Common YANG Types September 2023 > "RFC8306; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; + + + +Busi, et al. Expires 20 May 2024 [Page 130] + +Internet-Draft TE Common YANG Types November 2023 + + > } > > identity path-computation-error-no-gco-migration { @@ -7162,14 +7315,6 @@ Internet-Draft TE Common YANG Types September 2023 > identity path-computation-error-pks-expansion { > base path-computation-error-reason; > description - - - -Busi, et al. Expires 18 March 2024 [Page 128] - -Internet-Draft TE Common YANG Types September 2023 - - > "Path computation has failed because of Path-Key Subobject > (PKS) expansion failure. > @@ -7185,6 +7330,14 @@ Internet-Draft TE Common YANG Types September 2023 > base path-computation-error-no-dependent-server; > description > "Path computation has failed because PCE BRPC chain + + + +Busi, et al. Expires 20 May 2024 [Page 131] + +Internet-Draft TE Common YANG Types November 2023 + + > unavailable. > > It corresponds to bit 28 of the Flags field of the @@ -7218,14 +7371,6 @@ Internet-Draft TE Common YANG Types September 2023 > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - - - -Busi, et al. Expires 18 March 2024 [Page 129] - -Internet-Draft TE Common YANG Types September 2023 - - > "RFC5440; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; @@ -7241,6 +7386,14 @@ Internet-Draft TE Common YANG Types September 2023 > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } + + + +Busi, et al. Expires 20 May 2024 [Page 132] + +Internet-Draft TE Common YANG Types November 2023 + + > > // CHANGE NOTE: The base identity protocol-origin-type and > // its derived identities below have been @@ -7274,14 +7427,6 @@ Internet-Draft TE Common YANG Types September 2023 > } > > // CHANGE NOTE: The base identity svec-objective-function-type - - - -Busi, et al. Expires 18 March 2024 [Page 130] - -Internet-Draft TE Common YANG Types September 2023 - - > // and its derived identities below have been > // added in this module revision > // RFC Editor: remove the note above and this note @@ -7297,6 +7442,14 @@ Internet-Draft TE Common YANG Types September 2023 > base svec-objective-function-type; > description > "Objective function for minimizing aggregate bandwidth + + + +Busi, et al. Expires 20 May 2024 [Page 133] + +Internet-Draft TE Common YANG Types November 2023 + + > consumption (MBC)."; > reference > "RFC5541: Encoding of Objective Functions in the Path @@ -7330,14 +7483,6 @@ Internet-Draft TE Common YANG Types September 2023 > transit domains (MCTD)."; > reference > "RFC8685: Path Computation Element Communication Protocol - - - -Busi, et al. Expires 18 March 2024 [Page 131] - -Internet-Draft TE Common YANG Types September 2023 - - > (PCEP) Extensions for the Hierarchical Path Computation > Element (H-PCE) Architecture."; > } @@ -7353,6 +7498,14 @@ Internet-Draft TE Common YANG Types September 2023 > Element (H-PCE) Architecture."; > } > + + + +Busi, et al. Expires 20 May 2024 [Page 134] + +Internet-Draft TE Common YANG Types November 2023 + + > identity svec-of-minimize-shared-srlg { > base svec-objective-function-type; > description @@ -7386,14 +7539,6 @@ Internet-Draft TE Common YANG Types September 2023 > "RFC5541: Encoding of Objective Functions in the Path > Computation Element Communication Protocol (PCEP)."; > } - - - -Busi, et al. Expires 18 March 2024 [Page 132] - -Internet-Draft TE Common YANG Types September 2023 - - > > identity svec-metric-cumul-te { > base svec-metric-type; @@ -7409,6 +7554,14 @@ Internet-Draft TE Common YANG Types September 2023 > description > "Cumulative IGP cost."; > reference + + + +Busi, et al. Expires 20 May 2024 [Page 135] + +Internet-Draft TE Common YANG Types November 2023 + + > "RFC5541: Encoding of Objective Functions in the Path > Computation Element Communication Protocol (PCEP)."; > } @@ -7442,14 +7595,6 @@ Internet-Draft TE Common YANG Types September 2023 > 2514a3046,3054 > must "node-id-uri or node-id" { - - - -Busi, et al. Expires 18 March 2024 [Page 133] - -Internet-Draft TE Common YANG Types September 2023 - - > description > "At least one node identifier MUST be present."; > } @@ -7465,6 +7610,14 @@ Internet-Draft TE Common YANG Types September 2023 > "(node-id-uri or node-id)" { > description > "At least one node identifier and at least one Link + + + +Busi, et al. Expires 20 May 2024 [Page 136] + +Internet-Draft TE Common YANG Types November 2023 + + > Termination Point (LTP) identifier MUST be present."; > } > leaf link-tp-id-uri { @@ -7498,14 +7651,6 @@ Internet-Draft TE Common YANG Types September 2023 2696a3258,3268 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { - - - -Busi, et al. Expires 18 March 2024 [Page 134] - -Internet-Draft TE Common YANG Types September 2023 - - > description > "At least one node identifier and at least one Link > Termination Point (LTP) identifier MUST be present."; @@ -7521,6 +7666,14 @@ Internet-Draft TE Common YANG Types September 2023 > leaf node-id-uri { > type nw:node-id; > description + + + +Busi, et al. Expires 20 May 2024 [Page 137] + +Internet-Draft TE Common YANG Types November 2023 + + > "The identifier of a node in the topology."; > } 2968a3545,3549 @@ -7554,14 +7707,6 @@ Internet-Draft TE Common YANG Types September 2023 > type identityref { > base te-types:switching-capabilities; > } - - - -Busi, et al. Expires 18 March 2024 [Page 135] - -Internet-Draft TE Common YANG Types September 2023 - - > description > "LSP switching type."; > reference @@ -7577,6 +7722,14 @@ A.2. Packet TE Types YANG Diffs This section provides the diff between the YANG module in section 3.2 of [RFC8776] and the YANG model revision in Section 5. + + + +Busi, et al. Expires 20 May 2024 [Page 138] + +Internet-Draft TE Common YANG Types November 2023 + + The intention of this appendix is to facilitate focusing the review of the YANG model in Section 5 to the changes compared with the YANG model in [RFC8776]. @@ -7610,14 +7763,6 @@ A.2. Packet TE Types YANG Diffs --- > Copyright (c) 2023 IETF Trust and the persons identified as 46c49 - - - -Busi, et al. Expires 18 March 2024 [Page 136] - -Internet-Draft TE Common YANG Types September 2023 - - < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set @@ -7633,6 +7778,14 @@ Internet-Draft TE Common YANG Types September 2023 > description > "Added common TE packet identities: > - bandwidth-profile-type. + + + +Busi, et al. Expires 20 May 2024 [Page 139] + +Internet-Draft TE Common YANG Types November 2023 + + > > Added common TE packet groupings: > - te-packet-path-bandwidth; @@ -7666,14 +7819,6 @@ Internet-Draft TE Common YANG Types September 2023 > reference > "MEF 10.3: Ethernet Services Attributes Phase 3"; > } - - - -Busi, et al. Expires 18 March 2024 [Page 137] - -Internet-Draft TE Common YANG Types September 2023 - - > > identity rfc-2697-bwp { > base bandwidth-profile-type; @@ -7689,6 +7834,14 @@ Internet-Draft TE Common YANG Types September 2023 > "RFC 2698 Bandwidth Profile"; > reference > "RFC2698: A Two Rate Three Color Marker"; + + + +Busi, et al. Expires 20 May 2024 [Page 140] + +Internet-Draft TE Common YANG Types November 2023 + + > } > > identity rfc-4115-bwp { @@ -7722,14 +7875,6 @@ Internet-Draft TE Common YANG Types September 2023 > } > leaf bandwidth-profile-type { > type identityref { - - - -Busi, et al. Expires 18 March 2024 [Page 138] - -Internet-Draft TE Common YANG Types September 2023 - - > base bandwidth-profile-type; > } > description "Type of Bandwidth Profile."; @@ -7745,6 +7890,14 @@ Internet-Draft TE Common YANG Types September 2023 > type uint64; > units "bits/second"; > mandatory true; + + + +Busi, et al. Expires 20 May 2024 [Page 141] + +Internet-Draft TE Common YANG Types November 2023 + + > description > "Committed Burst Size (CBS)."; > } @@ -7778,14 +7931,6 @@ Internet-Draft TE Common YANG Types September 2023 > // added in this module revision > // RFC Editor: remove the note above and this note > grouping te-packet-link-bandwidth { - - - -Busi, et al. Expires 18 March 2024 [Page 139] - -Internet-Draft TE Common YANG Types September 2023 - - > description > "Link Bandwidth for Packet. "; > leaf packet-bandwidth { @@ -7802,6 +7947,13 @@ Appendix B. Option Considered for updating RFC8776 published in [RFC8776] without delaying too much the progress of the mature WG documents. + + +Busi, et al. Expires 20 May 2024 [Page 142] + +Internet-Draft TE Common YANG Types November 2023 + + Three possible options have been identified to address this concern. One option is to keep these definitions in the YANG modules where @@ -7835,13 +7987,6 @@ Appendix B. Option Considered for updating RFC8776 YANG model to focus the review only to the updates to the ietf-te- types YANG module proposed by this document. - - -Busi, et al. Expires 18 March 2024 [Page 140] - -Internet-Draft TE Common YANG Types September 2023 - - Based on the feedbacks from IETF 114 discussion, this version has been restructured to become an RFC8776-bis, with some notes, to be removed before publication, to focus the review only to the updates @@ -7856,6 +8001,15 @@ Internet-Draft TE Common YANG Types September 2023 Future updates of this document could align with the proposed approach. + + + + +Busi, et al. Expires 20 May 2024 [Page 143] + +Internet-Draft TE Common YANG Types November 2023 + + Acknowledgements The authors would like to thank Robert Wilton, Lou Berger, Mahesh @@ -7889,15 +8043,6 @@ Authors' Addresses Email: aihuaguo.ietf@gmail.com - - - - -Busi, et al. Expires 18 March 2024 [Page 141] - -Internet-Draft TE Common YANG Types September 2023 - - Xufeng Liu Alef Edge Email: xufeng.liu.ietf@gmail.com @@ -7916,37 +8061,4 @@ Internet-Draft TE Common YANG Types September 2023 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -Busi, et al. Expires 18 March 2024 [Page 142] +Busi, et al. Expires 20 May 2024 [Page 144] diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml index 5f28d91..9a94658 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml @@ -48,7 +48,7 @@ - + TEAS Working Group @@ -401,11 +401,11 @@ appear in all capitals, as shown here. A base YANG identity for supported interface switching capabilities as defined in . -resource-affinities-type: +resource-affinities-type: +exx +> A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in and . -
  • - A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in and . -
+CHANGE NOTE: The description of the path-metric-type has been updated path-metric-type: @@ -413,6 +413,14 @@ appear in all capitals, as shown here. A base YANG identity for supported path metric types as defined in and . +
  • + Since the unit of path metric bound is interpreted in the context of the metric-type, derived identities SHOULD describe the unit and maximum value of the path metric. +
+ +
  • + For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in for OSPF, and for IS-IS. +
+ explicit-route-hop:
  • @@ -550,6 +558,18 @@ appear in all capitals, as shown here. A base YANG identity for various bandwidth profiles specified in , , and that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs).
+path-metric-loss: + +
  • + A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path loss metric type, defined in . +
+ +path-metric-delay-variation: + +
  • + A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path delay variation metric type, defined in . +
+ te-packet-path-bandwidth
  • @@ -682,14 +702,14 @@ module ietf-te-types { 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."; - - revision 2023-06-27 { + revision 2023-11-17 { description "Added: - base identity lsp-provisioning-error-reason; - identity association-type-diversity; - identity tunnel-admin-state-auto; - identity lsp-restoration-restore-none; + - identity restoration-scheme-rerouting; - base identity path-computation-error-reason and its derived identities; - base identity protocol-origin-type and @@ -704,12 +724,13 @@ module ietf-te-types { - description and reference of identity action-exercise. Obsoleted: - - identity of-minimize-agg-bandwidth-consumption - - identity of-minimize-load-most-loaded-link - - identity of-minimize-cost-path-set"; + - identity of-minimize-agg-bandwidth-consumption; + - identity of-minimize-load-most-loaded-link; + - identity of-minimize-cost-path-set; + - identity lsp-protection-reroute-extra; + - identity lsp-protection-reroute."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -2073,6 +2094,21 @@ module ietf-te-types { "Base identity for LSP restoration schemes."; } + // CHANGE NOTE: The identity restoration-scheme-rerouting + // below has been added in this module revision + // RFC Editor: remove the note above and this note + identity restoration-scheme-rerouting { + base restoration-scheme-type; + description + "Restoration LSP is computed after the failure detection. + + This restoration schema is also known as + 'Full LSP Re-routing.'"; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } + identity restoration-scheme-preconfigured { base restoration-scheme-type; description @@ -2117,19 +2153,35 @@ module ietf-te-types { Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute-extra + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute-extra { base lsp-protection-type; + status obsolete; description - "'(Full) Rerouting' LSP protection type."; + "'(Full) Rerouting' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + // CHANGE NOTE: The identity lsp-protection-reroute + // below has been obsoleted in this module revision + // RFC Editor: remove the note above and this note identity lsp-protection-reroute { base lsp-protection-type; + status obsolete; description - "'Rerouting without Extra-Traffic' LSP protection type."; + "'Rerouting without Extra-Traffic' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; @@ -2655,9 +2707,15 @@ module ietf-te-types { Protocol-Traffic Engineering (RSVP-TE)"; } + // CHANGE NOTE: The description of the identity path-metric-type + // has been updated in this module revision + // RFC Editor: remove the note above and this note identity path-metric-type { description - "Base identity for the path metric type."; + "Base identity for the path metric type. + + Derived identities SHOULD describe the unit and maximum value + of the path metric."; } identity path-metric-te { @@ -2678,12 +2736,19 @@ module ietf-te-types { second MPLS Traffic Engineering (TE) Metric"; } + // CHANGE NOTE: The reference for the identity path-metric-hop + // has been added in this module revision + // RFC Editor: remove the note above and this note identity path-metric-hop { base path-metric-type; description "Hop path metric."; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } + identity path-metric-delay-average { base path-metric-type; description @@ -2864,7 +2929,8 @@ module ietf-te-types { "Path computation has failed because of an unspecified reason."; reference - "Section 7.5 of RFC5440"; + "Section 7.5 of RFC5440: Path Computation Element (PCE) + Communication Protocol (PCEP)"; } identity path-computation-error-no-topology { @@ -2895,7 +2961,8 @@ module ietf-te-types { It corresponds to bit 31 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3042,7 +3109,8 @@ module ietf-te-types { It corresponds to bit 29 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3056,7 +3124,8 @@ module ietf-te-types { It corresponds to bit 30 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3067,7 +3136,8 @@ module ietf-te-types { "Path computation has failed because path computation server is unavailable."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3093,7 +3163,9 @@ module ietf-te-types { description "Protocol origin is Path Computation Engine Protocol (PCEP)."; - reference "RFC5440"; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } identity protocol-origin-bgp { @@ -4309,9 +4381,13 @@ module ietf-te-types { type uint64; default "0"; description - "Upper bound on the end-to-end TE path metric. A zero - indicates an unbounded upper limit for the specific - 'metric-type'."; + "Upper bound on the end-to-end TE path metric. + + A zero indicates an unbounded upper limit for the + specific 'metric-type'. + + The unit of is interpreted in the context of the + path-metric-type."; } } } @@ -4614,8 +4690,7 @@ module ietf-te-packet-types { import ietf-te-types { prefix te-types; reference - "RFCXXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFCXXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number // and remove this note @@ -4643,9 +4718,10 @@ module ietf-te-packet-types { "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to MPLS TE. The model fully - conforms to the Network Management Datastore Architecture - (NMDA). + data type definitions specific to Packet Traffic Enginnering (TE). + + The model fully conforms to the Network Management Datastore + Architecture (NMDA). Copyright (c) 2023 IETF Trust and the persons identified as authors of the code. All rights reserved. @@ -4660,18 +4736,20 @@ module ietf-te-packet-types { 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."; - - revision 2023-07-10 { + revision 2023-11-16 { description "Added common TE packet identities: - - bandwidth-profile-type. + - bandwidth-profile-type; + - path-metric-loss; + - path-metric-delay-variation. Added common TE packet groupings: - te-packet-path-bandwidth; - - te-packet-link-bandwidth."; + - te-packet-link-bandwidth. + + Updated module description."; reference - "RFC XXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -4729,6 +4807,58 @@ module ietf-te-packet-types { Marker with Efficient Handling of in-Profile Traffic"; } + // CHANGE NOTE: The identity path-metric-loss below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-loss { + base path-metric-type; + description + "The path loss (as a packet percentage) metric type + encodes a function of the unidirectional loss metrics of all + links traversed by a P2P path. + + The basic unit is 0.000003%, + where (2^24 - 2) or 50.331642% is the maximum value of the + path loss percentage that can be expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + + // CHANGE NOTE: The identity path-metric-delay-variation below has + // been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-delay-variation { + base path-metric-type; + description + "The path delay variation encodes the sum of the unidirectional + delay variation metrics of all links traversed by a P2P path. + + The path delay variation metric unit is in microseconds, where + (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + maximum value of the path delay variation that can be + expressed. + + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + } + /* * Typedefs */ @@ -5675,7 +5805,7 @@ Names" registry : - + A YANG Data Model for Traffic Engineering Tunnels, Label Switched Paths and Interfaces @@ -5693,10 +5823,7 @@ Names" registry : Individual - - Telefonica - - + This document defines a YANG data model for the provisioning and management of Traffic Engineering (TE) tunnels, Label Switched Paths @@ -5710,7 +5837,7 @@ Names" registry : - + @@ -5761,11 +5888,11 @@ Names" registry : - + YANG Data Model for Layer 3 TE Topologies - IBM Corporation + Alef Edge Individual @@ -5782,7 +5909,7 @@ Names" registry : Telefonica - + This document defines a YANG data model for layer 3 traffic engineering topologies. @@ -5790,7 +5917,7 @@ Names" registry : - + @@ -6490,6 +6617,24 @@ Names" registry : + + + Extensions to the Path Computation Element Communication Protocol (PCEP) to Compute Service-Aware Label Switched Paths (LSPs) + + + + + + + + In certain networks, such as, but not limited to, financial information networks (e.g., stock market data providers), network performance criteria (e.g., latency) are becoming as critical to data path selection as other metrics and constraints. These metrics are associated with the Service Level Agreement (SLA) between customers and service providers. The link bandwidth utilization (the total bandwidth of a link in actual use for the forwarding) is another important factor to consider during path computation. + IGP Traffic Engineering (TE) Metric Extensions describe mechanisms with which network performance information is distributed via OSPF and IS-IS, respectively. The Path Computation Element Communication Protocol (PCEP) provides mechanisms for Path Computation Elements (PCEs) to perform path computations in response to Path Computation Client (PCC) requests. This document describes the extension to PCEP to carry latency, delay variation, packet loss, and link bandwidth utilization as constraints for end-to-end path computation. + + + + + + @@ -7713,750 +7858,770 @@ about the process to follow to provide tiny updates to a YANG module already pub diff --git a/ietf-te-mpls.yang b/ietf-te-mpls.yang index c651796..41255c5 100644 --- a/ietf-te-mpls.yang +++ b/ietf-te-mpls.yang @@ -89,7 +89,7 @@ module ietf-te-mpls { // RFC Ed.: update the date below with the date of RFC publication // and remove this note. - revision "2023-05-25" { + revision "2023-11-16" { description "Latest update to MPLS TE YANG module."; reference "RFCXXXX: A YANG Data Model for MPLS-TE Tunnels and LSP(s)"; @@ -101,17 +101,6 @@ module ietf-te-mpls { description "Resetup tunnel action type"; } - identity path-metric-loss { - base te-types:path-metric-type; - description - "The path loss metric type (as a packet percentage) that - encodes a function of the unidirectional loss metrics of all - links traversed by a P2P path. The basic unit is 0.000003%, - where (2^24 - 2) or 50.331642% is the highest packet-loss - percentage that can be expressed."; - reference "RFC8233, RFC4710, and RFC8570"; - } - /* MPLS TE tunnel properties*/ grouping tunnel-igp-shortcut-config { description "TE tunnel IGP shortcut configs"; diff --git a/ietf-te-packet-types.yang b/ietf-te-packet-types.yang index 243894d..6e3abef 100644 --- a/ietf-te-packet-types.yang +++ b/ietf-te-packet-types.yang @@ -8,8 +8,7 @@ module ietf-te-packet-types { import ietf-te-types { prefix te-types; reference - "RFCXXXX: Updated Common YANG Data Types for Traffic - Engineering"; + "RFCXXXX: Common YANG Data Types for Traffic Engineering"; } // RFC Editor: replace XXXX with actual RFC number // and remove this note @@ -60,7 +59,7 @@ module ietf-te-packet-types { "Added common TE packet identities: - bandwidth-profile-type; - path-metric-loss; - - path-metric-delay-varation. + - path-metric-delay-variation. Added common TE packet groupings: - te-packet-path-bandwidth; @@ -152,10 +151,10 @@ module ietf-te-packet-types { RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; } - // CHANGE NOTE: The identity path-metric-delay-varation below has + // CHANGE NOTE: The identity path-metric-delay-variation below has // been added in this module revision // RFC Editor: remove the note above and this note - identity path-metric-delay-varation { + identity path-metric-delay-variation { base path-metric-type; description "The path delay variation encodes the sum of the unidirectional diff --git a/ietf-te-types.yang b/ietf-te-types.yang index a7515d4..5181dfd 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -2080,9 +2080,15 @@ module ietf-te-types { Protocol-Traffic Engineering (RSVP-TE)"; } + // CHANGE NOTE: The description of the identity path-metric-type + // has been updated in this module revision + // RFC Editor: remove the note above and this note identity path-metric-type { description - "Base identity for the path metric type."; + "Base identity for the path metric type. + + Derived identities SHOULD describe the unit and maximum value + of the path metric."; } identity path-metric-te { @@ -2103,12 +2109,19 @@ module ietf-te-types { second MPLS Traffic Engineering (TE) Metric"; } + // CHANGE NOTE: The reference for the identity path-metric-hop + // has been added in this module revision + // RFC Editor: remove the note above and this note identity path-metric-hop { base path-metric-type; description "Hop path metric."; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } + identity path-metric-delay-average { base path-metric-type; description @@ -2289,7 +2302,8 @@ module ietf-te-types { "Path computation has failed because of an unspecified reason."; reference - "Section 7.5 of RFC5440"; + "Section 7.5 of RFC5440: Path Computation Element (PCE) + Communication Protocol (PCEP)"; } identity path-computation-error-no-topology { @@ -2320,7 +2334,8 @@ module ietf-te-types { It corresponds to bit 31 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -2467,7 +2482,8 @@ module ietf-te-types { It corresponds to bit 29 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -2481,7 +2497,8 @@ module ietf-te-types { It corresponds to bit 30 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -2492,7 +2509,8 @@ module ietf-te-types { "Path computation has failed because path computation server is unavailable."; reference - "RFC5440; + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -2518,7 +2536,9 @@ module ietf-te-types { description "Protocol origin is Path Computation Engine Protocol (PCEP)."; - reference "RFC5440"; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP)"; } identity protocol-origin-bgp { From ac38fcc7809640dca47a86ac21e6a8532de0c447 Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 17 Nov 2023 09:15:31 +0100 Subject: [PATCH 05/10] Few editorial updates --- .../draft-ietf-teas-rfc8776-update.md | 14 +- .../draft-ietf-teas-rfc8776-update.txt | 1950 ++++++++--------- .../draft-ietf-teas-rfc8776-update.xml | 1423 ++++++------ ietf-te-types.yang | 2 +- 4 files changed, 1684 insertions(+), 1705 deletions(-) diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md index a373b7f..e1c565e 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md @@ -312,11 +312,11 @@ CHANGE NOTE: The description of the path-metric-type has been updated path-metric-type: -> A base YANG identity for supported path metric types as defined in {{?RFC3785}} and {{?RFC7471}}. +> A base YANG identity for supported path metric types as defined in {{?RFC3630}} {{?RFC3785}}, {{!RFC5440}}, {{?RFC7471}}, {{?RFC8233}} and {{?RFC8570}}. -> Since the unit of path metric bound is interpreted in the context of the metric-type, derived identities SHOULD describe the unit and maximum value of the path metric. +> Since the unit of the path metric value is interpreted in the context of the path metric type, derived identities SHOULD describe the unit and maximum value of the path metric types they define. -> For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in {{?RFC7471}} for OSPF, and {{?RFC8570}} for IS-IS. +> For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in {{?RFC7471}} and {{?RFC8570}}. explicit-route-hop: @@ -422,14 +422,6 @@ bandwidth-profile-type: > A base YANG identity for various bandwidth profiles specified in {{MEF_10.3}}, {{?RFC2697}}, {{?RFC2698}} and {{?RFC4115}} that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs). -path-metric-loss: - -> A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path loss metric type, defined in {{?RFC8233}}. - -path-metric-delay-variation: - -> A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path delay variation metric type, defined in {{?RFC8233}}. - te-packet-path-bandwidth > A YANG grouping that defines the path bandwidth information and could be used in any Packet TE model (e.g., MPLS-TE topology model) for the path bandwidth representation (e.g., the bandwidth of an MPLS-TE LSP). diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt index 4753e44..61bee84 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt @@ -487,17 +487,17 @@ Internet-Draft TE Common YANG Types November 2023 path-metric-type: A base YANG identity for supported path metric types as defined in - [RFC3785] and [RFC7471]. + [RFC3630] [RFC3785], [RFC5440], [RFC7471], [RFC8233] and + [RFC8570]. - Since the unit of path metric bound is interpreted in the context - of the metric-type, derived identities SHOULD describe the unit - and maximum value of the path metric. + Since the unit of the path metric value is interpreted in the + context of the path metric type, derived identities SHOULD + describe the unit and maximum value of the path metric types they + define. For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit - 0.000003% as described in [RFC7471] for OSPF, and [RFC8570] for - IS-IS. - + 0.000003% as described in [RFC7471] and [RFC8570]. @@ -658,13 +658,13 @@ Internet-Draft TE Common YANG Types November 2023 [MEF_10.3], [RFC2697], [RFC2698] and [RFC4115] that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs). - path-metric-loss: + te-packet-path-bandwidth - A YANG identity, derived from the 'path-metric-type' base - identity, defined in 'ietf-te-types', that represents the path - loss metric type, defined in [RFC8233]. + A YANG grouping that defines the path bandwidth information and + could be used in any Packet TE model (e.g., MPLS-TE topology + model) for the path bandwidth representation (e.g., the bandwidth + of an MPLS-TE LSP). - path-metric-delay-variation: @@ -674,17 +674,6 @@ Busi, et al. Expires 20 May 2024 [Page 12] Internet-Draft TE Common YANG Types November 2023 - A YANG identity, derived from the 'path-metric-type' base - identity, defined in 'ietf-te-types', that represents the path - delay variation metric type, defined in [RFC8233]. - - te-packet-path-bandwidth - - A YANG grouping that defines the path bandwidth information and - could be used in any Packet TE model (e.g., MPLS-TE topology - model) for the path bandwidth representation (e.g., the bandwidth - of an MPLS-TE LSP). - All the path and LSP bandwidth related sections in the "ietf-te- types" generic module, Section 4, need to be augmented with this grouping for the usage of Packet TE technologies. @@ -722,14 +711,6 @@ Internet-Draft TE Common YANG Types November 2023 * "ietf-routing-types" as defined in [RFC8294] - - - -Busi, et al. Expires 20 May 2024 [Page 13] - -Internet-Draft TE Common YANG Types November 2023 - - In addition to [RFC6991] and [RFC8294], this module references the following documents in defining the types and YANG groupings: [RFC3272], [RFC4090], [RFC4202], [RFC4328], [RFC4561], [RFC4657], @@ -741,6 +722,14 @@ Internet-Draft TE Common YANG Types November 2023 RFC Editor: remove the CHANGE NOTE above and this note + + + +Busi, et al. Expires 20 May 2024 [Page 13] + +Internet-Draft TE Common YANG Types November 2023 + + file "ietf-te-types@2023-06-27.yang" module ietf-te-types { yang-version 1.1; @@ -778,14 +767,6 @@ Internet-Draft TE Common YANG Types November 2023 Working Group"; contact "WG Web: - - - -Busi, et al. Expires 20 May 2024 [Page 14] - -Internet-Draft TE Common YANG Types November 2023 - - WG List: Editor: Tarek Saad @@ -797,6 +778,14 @@ Internet-Draft TE Common YANG Types November 2023 Editor: Vishnu Pavan Beeram + + + +Busi, et al. Expires 20 May 2024 [Page 14] + +Internet-Draft TE Common YANG Types November 2023 + + Editor: Xufeng Liu @@ -834,14 +823,6 @@ Internet-Draft TE Common YANG Types November 2023 - identity association-type-diversity; - identity tunnel-admin-state-auto; - identity lsp-restoration-restore-none; - - - -Busi, et al. Expires 20 May 2024 [Page 15] - -Internet-Draft TE Common YANG Types November 2023 - - - identity restoration-scheme-rerouting; - base identity path-computation-error-reason and its derived identities; @@ -853,6 +834,14 @@ Internet-Draft TE Common YANG Types November 2023 - grouping encoding-and-switching-type. Updated: + + + +Busi, et al. Expires 20 May 2024 [Page 15] + +Internet-Draft TE Common YANG Types November 2023 + + - description of the base identity objective-function-type; - description and reference of identity action-exercise. @@ -890,14 +879,6 @@ Internet-Draft TE Common YANG Types November 2023 The most significant byte in the hex-string is the farthest to the left in the byte sequence. Leading zero bytes in the configured value may be omitted for brevity."; - - - -Busi, et al. Expires 20 May 2024 [Page 16] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2 @@ -909,6 +890,14 @@ Internet-Draft TE Common YANG Types November 2023 typedef admin-groups { type union { type admin-group; + + + +Busi, et al. Expires 20 May 2024 [Page 16] + +Internet-Draft TE Common YANG Types November 2023 + + type extended-admin-group; } description @@ -946,14 +935,6 @@ Internet-Draft TE Common YANG Types November 2023 enum unknown { value 0; description - - - -Busi, et al. Expires 20 May 2024 [Page 17] - -Internet-Draft TE Common YANG Types November 2023 - - "Unknown."; } enum normal { @@ -965,6 +946,14 @@ Internet-Draft TE Common YANG Types November 2023 value 2; description "Abnormal. Indicates that the anomalous bit is set."; + + + +Busi, et al. Expires 20 May 2024 [Page 17] + +Internet-Draft TE Common YANG Types November 2023 + + } } description @@ -1002,14 +991,6 @@ Internet-Draft TE Common YANG Types November 2023 enum testing { description "In some test mode."; - - - -Busi, et al. Expires 20 May 2024 [Page 18] - -Internet-Draft TE Common YANG Types November 2023 - - } enum preparing-maintenance { description @@ -1021,6 +1002,14 @@ Internet-Draft TE Common YANG Types November 2023 } enum maintenance { description + + + +Busi, et al. Expires 20 May 2024 [Page 18] + +Internet-Draft TE Common YANG Types November 2023 + + "The resource is disabled in the data plane for maintenance purposes."; } @@ -1058,14 +1047,6 @@ Internet-Draft TE Common YANG Types November 2023 (e.g., 0x1p10), where the units are in bytes per second. For the Optical Transport Network (OTN) switching type, - - - -Busi, et al. Expires 20 May 2024 [Page 19] - -Internet-Draft TE Common YANG Types November 2023 - - a list of integers can be used, such as '0,2,3,1', indicating two ODU0s and one ODU3. ('ODU' stands for 'Optical Data Unit'.) For Dense Wavelength Division Multiplexing (DWDM), @@ -1077,6 +1058,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 8294: Common YANG Data Types for the Routing Area ITU-T Recommendation G.709: Interfaces for the + + + +Busi, et al. Expires 20 May 2024 [Page 19] + +Internet-Draft TE Common YANG Types November 2023 + + optical transport network"; } @@ -1114,14 +1103,6 @@ Internet-Draft TE Common YANG Types November 2023 enum strict { description "A strict hop in an explicit path."; - - - -Busi, et al. Expires 20 May 2024 [Page 20] - -Internet-Draft TE Common YANG Types November 2023 - - } } description @@ -1133,6 +1114,14 @@ Internet-Draft TE Common YANG Types November 2023 typedef te-link-access-type { type enumeration { + + + +Busi, et al. Expires 20 May 2024 [Page 20] + +Internet-Draft TE Common YANG Types November 2023 + + enum point-to-point { description "The link is point-to-point."; @@ -1170,14 +1159,6 @@ Internet-Draft TE Common YANG Types November 2023 enum incoming { description "The explicit route represents an incoming link on - - - -Busi, et al. Expires 20 May 2024 [Page 21] - -Internet-Draft TE Common YANG Types November 2023 - - a node."; } enum outgoing { @@ -1189,6 +1170,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Enumerated type for specifying the direction of a link on a node."; + + + +Busi, et al. Expires 20 May 2024 [Page 21] + +Internet-Draft TE Common YANG Types November 2023 + + } typedef te-metric { @@ -1226,14 +1215,6 @@ Internet-Draft TE Common YANG Types November 2023 typedef te-oper-status { type te-common-status; - - - -Busi, et al. Expires 20 May 2024 [Page 22] - -Internet-Draft TE Common YANG Types November 2023 - - description "Defines a type representing the operational status of a TE resource."; @@ -1246,6 +1227,13 @@ Internet-Draft TE Common YANG Types November 2023 a TE resource."; } + + +Busi, et al. Expires 20 May 2024 [Page 22] + +Internet-Draft TE Common YANG Types November 2023 + + typedef te-path-disjointness { type bits { bit node { @@ -1282,14 +1270,6 @@ Internet-Draft TE Common YANG Types November 2023 } enum recovery-started { description - - - -Busi, et al. Expires 20 May 2024 [Page 23] - -Internet-Draft TE Common YANG Types November 2023 - - "The recovery action has been started but not completed."; } enum recovery-succeeded { @@ -1302,6 +1282,14 @@ Internet-Draft TE Common YANG Types November 2023 description "The recovery action has failed."; } + + + +Busi, et al. Expires 20 May 2024 [Page 23] + +Internet-Draft TE Common YANG Types November 2023 + + enum reversion-started { description "The reversion has started."; @@ -1338,14 +1326,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS) RFC 6378: MPLS Transport Profile (MPLS-TP) Linear Protection"; - - - -Busi, et al. Expires 20 May 2024 [Page 24] - -Internet-Draft TE Common YANG Types November 2023 - - } typedef te-template-name { @@ -1358,6 +1338,14 @@ Internet-Draft TE Common YANG Types November 2023 } typedef te-topology-event-type { + + + +Busi, et al. Expires 20 May 2024 [Page 24] + +Internet-Draft TE Common YANG Types November 2023 + + type enumeration { enum add { value 0; @@ -1394,14 +1382,6 @@ Internet-Draft TE Common YANG Types November 2023 "An identifier for a topology. It is optional to have one or more prefixes at the beginning, separated by colons. The prefixes can be 'network-types' as - - - -Busi, et al. Expires 20 May 2024 [Page 25] - -Internet-Draft TE Common YANG Types November 2023 - - defined in the 'ietf-network' module in RFC 8345, to help the user better understand the topology before further inquiry is made."; @@ -1414,6 +1394,14 @@ Internet-Draft TE Common YANG Types November 2023 type uint32; // Unnumbered type inet:ip-address; + + + +Busi, et al. Expires 20 May 2024 [Page 25] + +Internet-Draft TE Common YANG Types November 2023 + + // IPv4 or IPv6 address } description @@ -1450,14 +1438,6 @@ Internet-Draft TE Common YANG Types November 2023 } description "The type of TE path, indicating whether a path is a primary, - - - -Busi, et al. Expires 20 May 2024 [Page 26] - -Internet-Draft TE Common YANG Types November 2023 - - or a reverse primary, or a secondary, or a reverse secondary path."; } @@ -1470,6 +1450,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 4875: Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE + + + +Busi, et al. Expires 20 May 2024 [Page 26] + +Internet-Draft TE Common YANG Types November 2023 + + Label Switched Paths (LSPs)"; } @@ -1506,14 +1494,6 @@ Internet-Draft TE Common YANG Types November 2023 feature named-path-constraints { description - - - -Busi, et al. Expires 20 May 2024 [Page 27] - -Internet-Draft TE Common YANG Types November 2023 - - "Indicates support for named path constraints."; } @@ -1527,6 +1507,13 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates support for path optimization objective functions."; } + + +Busi, et al. Expires 20 May 2024 [Page 27] + +Internet-Draft TE Common YANG Types November 2023 + + /* * Identities */ @@ -1562,14 +1549,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } - - - -Busi, et al. Expires 20 May 2024 [Page 28] - -Internet-Draft TE Common YANG Types November 2023 - - identity local-recording-desired { base session-attributes-flags; description @@ -1583,6 +1562,14 @@ Internet-Draft TE Common YANG Types November 2023 base session-attributes-flags; description "Requests FRR bandwidth protection on LSRs, if present."; + + + +Busi, et al. Expires 20 May 2024 [Page 28] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP Tunnels"; } @@ -1618,14 +1605,6 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-attributes-flags { description - - - -Busi, et al. Expires 20 May 2024 [Page 29] - -Internet-Draft TE Common YANG Types November 2023 - - "Base identity for LSP attributes flags."; } @@ -1639,6 +1618,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS RSVP-TE + + + +Busi, et al. Expires 20 May 2024 [Page 29] + +Internet-Draft TE Common YANG Types November 2023 + + RFC 5420: Encoding of Attributes for MPLS LSP Establishment Using Resource Reservation Protocol Traffic Engineering (RSVP-TE) @@ -1674,14 +1661,6 @@ Internet-Draft TE Common YANG Types November 2023 undergoing establishment. This MAY also be used to specify segment-based LSP recovery for established LSPs."; reference - - - -Busi, et al. Expires 20 May 2024 [Page 30] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS RSVP-TE RFC 5420: Encoding of Attributes for MPLS LSP Establishment @@ -1695,6 +1674,14 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-attributes-flags; description "Indicates that LSP integrity is required."; + + + +Busi, et al. Expires 20 May 2024 [Page 30] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4875: Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE @@ -1730,14 +1717,6 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-attributes-flags; description "Indicates that the LSP MUST be provisioned in the - - - -Busi, et al. Expires 20 May 2024 [Page 31] - -Internet-Draft TE Common YANG Types November 2023 - - control plane only."; reference "RFC 6001: Generalized MPLS (GMPLS) Protocol Extensions for @@ -1751,6 +1730,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Indicates that non-PHP (non-Penultimate Hop Popping) behavior for the LSP is desired."; + + + +Busi, et al. Expires 20 May 2024 [Page 31] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 6511: Non-Penultimate Hop Popping Behavior and Out-of-Band Mapping for RSVP-TE Label Switched Paths @@ -1786,14 +1773,6 @@ Internet-Draft TE Common YANG Types November 2023 "OAM Maintenance Entity Group End Point (MEP) entities desired."; reference - - - -Busi, et al. Expires 20 May 2024 [Page 32] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 7260: GMPLS RSVP-TE Extensions for Operations, Administration, and Maintenance (OAM) Configuration"; } @@ -1808,6 +1787,13 @@ Internet-Draft TE Common YANG Types November 2023 Administration, and Maintenance (OAM) Configuration"; } + + +Busi, et al. Expires 20 May 2024 [Page 32] + +Internet-Draft TE Common YANG Types November 2023 + + identity srlg-collection-desired { base lsp-attributes-flags; description @@ -1842,14 +1828,6 @@ Internet-Draft TE Common YANG Types November 2023 identity rtm-set-desired { base lsp-attributes-flags; - - - -Busi, et al. Expires 20 May 2024 [Page 33] - -Internet-Draft TE Common YANG Types November 2023 - - description "Residence Time Measurement (RTM) attribute flag requested."; reference @@ -1864,6 +1842,14 @@ Internet-Draft TE Common YANG Types November 2023 identity link-protection-unprotected { base link-protection-type; description + + + +Busi, et al. Expires 20 May 2024 [Page 33] + +Internet-Draft TE Common YANG Types November 2023 + + "Unprotected link type."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End @@ -1898,14 +1884,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity link-protection-1-plus-1 { - - - -Busi, et al. Expires 20 May 2024 [Page 34] - -Internet-Draft TE Common YANG Types November 2023 - - base link-protection-type; description "One-plus-one (1+1) protected link type."; @@ -1921,6 +1899,13 @@ Internet-Draft TE Common YANG Types November 2023 TE tunnel protection configuration supporting the TE link."; } + + +Busi, et al. Expires 20 May 2024 [Page 34] + +Internet-Draft TE Common YANG Types November 2023 + + identity association-type { description "Base identity for the tunnel association."; @@ -1954,14 +1939,6 @@ Internet-Draft TE Common YANG Types November 2023 used to associate two LSPs of two tunnels that are independently configured on either endpoint."; reference - - - -Busi, et al. Expires 20 May 2024 [Page 35] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 7551: RSVP-TE Extensions for Associated Bidirectional Label Switched Paths (LSPs)"; } @@ -1977,6 +1954,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 6780: RSVP ASSOCIATION Object Extensions RFC 7551: RSVP-TE Extensions for Associated Bidirectional Label Switched Paths (LSPs)"; + + + +Busi, et al. Expires 20 May 2024 [Page 35] + +Internet-Draft TE Common YANG Types November 2023 + + } // CHANGE NOTE: The identity association-type-diversity below has @@ -2011,13 +1996,6 @@ Internet-Draft TE Common YANG Types November 2023 Computation Element Communication Protocol (PCEP)"; } - - -Busi, et al. Expires 20 May 2024 [Page 36] - -Internet-Draft TE Common YANG Types November 2023 - - identity of-minimize-load-path { base objective-function-type; description @@ -2032,6 +2010,14 @@ Internet-Draft TE Common YANG Types November 2023 base objective-function-type; description "Objective function for maximizing residual bandwidth."; + + + +Busi, et al. Expires 20 May 2024 [Page 36] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; @@ -2066,14 +2052,6 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The identity of-minimize-cost-path-set - - - -Busi, et al. Expires 20 May 2024 [Page 37] - -Internet-Draft TE Common YANG Types November 2023 - - // below has been obsoleted in this module revision // RFC Editor: remove the note above and this note identity of-minimize-cost-path-set { @@ -2088,6 +2066,14 @@ Internet-Draft TE Common YANG Types November 2023 identity path-computation-method { description + + + +Busi, et al. Expires 20 May 2024 [Page 37] + +Internet-Draft TE Common YANG Types November 2023 + + "Base identity for supported path computation mechanisms."; } @@ -2122,14 +2108,6 @@ Internet-Draft TE Common YANG Types November 2023 base path-computation-method; description "Constrained-path LSP in which the path is - - - -Busi, et al. Expires 20 May 2024 [Page 38] - -Internet-Draft TE Common YANG Types November 2023 - - explicitly specified as a collection of strict and/or loose hops."; reference @@ -2144,6 +2122,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-metric-relative { + + + +Busi, et al. Expires 20 May 2024 [Page 38] + +Internet-Draft TE Common YANG Types November 2023 + + base lsp-metric-type; description "The metric specified for the LSPs to which this identity @@ -2178,14 +2164,6 @@ Internet-Draft TE Common YANG Types November 2023 identity te-tunnel-type { description "Base identity from which specific tunnel types are derived."; - - - -Busi, et al. Expires 20 May 2024 [Page 39] - -Internet-Draft TE Common YANG Types November 2023 - - } identity te-tunnel-p2p { @@ -2200,6 +2178,14 @@ Internet-Draft TE Common YANG Types November 2023 base te-tunnel-type; description "TE P2MP tunnel type."; + + + +Busi, et al. Expires 20 May 2024 [Page 39] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4875: Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE @@ -2234,14 +2220,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity te-action-result { - - - -Busi, et al. Expires 20 May 2024 [Page 40] - -Internet-Draft TE Common YANG Types November 2023 - - description "Base identity from which specific TE action results are derived."; @@ -2256,6 +2234,14 @@ Internet-Draft TE Common YANG Types November 2023 identity te-action-fail { base te-action-result; description + + + +Busi, et al. Expires 20 May 2024 [Page 40] + +Internet-Draft TE Common YANG Types November 2023 + + "TE action failed."; } @@ -2290,14 +2276,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Tunnel administrative auto state. The administrative status in state datastore transitions to 'tunnel-admin-up' when the - - - -Busi, et al. Expires 20 May 2024 [Page 41] - -Internet-Draft TE Common YANG Types November 2023 - - tunnel used by the client layer, and to 'tunnel-admin-down' when it is not used by the client layer."; } @@ -2313,6 +2291,13 @@ Internet-Draft TE Common YANG Types November 2023 "Tunnel's state is up."; } + + +Busi, et al. Expires 20 May 2024 [Page 41] + +Internet-Draft TE Common YANG Types November 2023 + + identity tunnel-state-down { base tunnel-state-type; description @@ -2346,14 +2331,6 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-state-type; description "State is being set up."; - - - -Busi, et al. Expires 20 May 2024 [Page 42] - -Internet-Draft TE Common YANG Types November 2023 - - } identity lsp-state-setup-ok { @@ -2369,6 +2346,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-state-up { + + + +Busi, et al. Expires 20 May 2024 [Page 42] + +Internet-Draft TE Common YANG Types November 2023 + + base lsp-state-type; description "State is up."; @@ -2402,14 +2387,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-invalidation-action-teardown { - - - -Busi, et al. Expires 20 May 2024 [Page 43] - -Internet-Draft TE Common YANG Types November 2023 - - base path-invalidation-action-type; description "TE path invalidation action teardown."; @@ -2425,6 +2402,14 @@ Internet-Draft TE Common YANG Types November 2023 // CHANGE NOTE: The identity lsp-restoration-restore-none // below has been added in this module revision + + + +Busi, et al. Expires 20 May 2024 [Page 43] + +Internet-Draft TE Common YANG Types November 2023 + + // RFC Editor: remove the note above and this note identity lsp-restoration-restore-none { base lsp-restoration-type; @@ -2458,14 +2443,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Restoration LSP is computed after the failure detection. - - - -Busi, et al. Expires 20 May 2024 [Page 44] - -Internet-Draft TE Common YANG Types November 2023 - - This restoration schema is also known as 'Full LSP Re-routing.'"; reference @@ -2482,6 +2459,13 @@ Internet-Draft TE Common YANG Types November 2023 for Generalized Multi-Protocol Label Switching (GMPLS)"; } + + +Busi, et al. Expires 20 May 2024 [Page 44] + +Internet-Draft TE Common YANG Types November 2023 + + identity restoration-scheme-precomputed { base restoration-scheme-type; description @@ -2514,14 +2498,6 @@ Internet-Draft TE Common YANG Types November 2023 "'Unprotected' LSP protection type."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End - - - -Busi, et al. Expires 20 May 2024 [Page 45] - -Internet-Draft TE Common YANG Types November 2023 - - Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } @@ -2538,6 +2514,14 @@ Internet-Draft TE Common YANG Types November 2023 'restoration-scheme-rerouting' identity SHOULD be used instead."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 45] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } @@ -2570,14 +2554,6 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-protection-1-for-1 { base lsp-protection-type; - - - -Busi, et al. Expires 20 May 2024 [Page 46] - -Internet-Draft TE Common YANG Types November 2023 - - description "LSP protection '1:1 Protection Type'."; reference @@ -2594,6 +2570,14 @@ Internet-Draft TE Common YANG Types November 2023 Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + + + +Busi, et al. Expires 20 May 2024 [Page 46] + +Internet-Draft TE Common YANG Types November 2023 + + identity lsp-protection-bidir-1-plus-1 { base lsp-protection-type; description @@ -2626,14 +2610,6 @@ Internet-Draft TE Common YANG Types November 2023 identity signal-fail-of-protection { base lsp-protection-state; description - - - -Busi, et al. Expires 20 May 2024 [Page 47] - -Internet-Draft TE Common YANG Types November 2023 - - "The protection transport entity has a signal fail condition that is of higher priority than the forced switchover command."; @@ -2651,6 +2627,13 @@ Internet-Draft TE Common YANG Types November 2023 for Generalized Multi-Protocol Label Switching (GMPLS)"; } + + +Busi, et al. Expires 20 May 2024 [Page 47] + +Internet-Draft TE Common YANG Types November 2023 + + identity forced-switch { base lsp-protection-state; description @@ -2682,14 +2665,6 @@ Internet-Draft TE Common YANG Types November 2023 identity manual-switch { base lsp-protection-state; - - - -Busi, et al. Expires 20 May 2024 [Page 48] - -Internet-Draft TE Common YANG Types November 2023 - - description "A manual switchover command is active."; reference @@ -2707,6 +2682,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity do-not-revert { + + + +Busi, et al. Expires 20 May 2024 [Page 48] + +Internet-Draft TE Common YANG Types November 2023 + + base lsp-protection-state; description "A Do Not Revert (DNR) condition is active because of @@ -2738,14 +2721,6 @@ Internet-Draft TE Common YANG Types November 2023 "A temporary configuration action initiated by an operator command that prevents any switchover action from being taken and, as such, freezes the current state."; - - - -Busi, et al. Expires 20 May 2024 [Page 49] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -2763,6 +2738,14 @@ Internet-Draft TE Common YANG Types November 2023 identity action-lockout-of-normal { base protection-external-commands; description + + + +Busi, et al. Expires 20 May 2024 [Page 49] + +Internet-Draft TE Common YANG Types November 2023 + + "A temporary configuration action initiated by an operator command to ensure that the normal traffic is not allowed to use the protection transport entity."; @@ -2794,14 +2777,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity action-forced-switch { - - - -Busi, et al. Expires 20 May 2024 [Page 50] - -Internet-Draft TE Common YANG Types November 2023 - - base protection-external-commands; description "A switchover action initiated by an operator command to switch @@ -2819,6 +2794,14 @@ Internet-Draft TE Common YANG Types November 2023 "A switchover action initiated by an operator command to switch the Extra-Traffic signal, the normal traffic signal, or the null signal to the protection transport entity, unless + + + +Busi, et al. Expires 20 May 2024 [Page 50] + +Internet-Draft TE Common YANG Types November 2023 + + a fault condition exists on other transport entities or a switchover command of equal or higher priority is in effect."; reference @@ -2850,14 +2833,6 @@ Internet-Draft TE Common YANG Types November 2023 or exercise command."; reference "RFC 4427: Recovery (Protection and Restoration) Terminology - - - -Busi, et al. Expires 20 May 2024 [Page 51] - -Internet-Draft TE Common YANG Types November 2023 - - for Generalized Multi-Protocol Label Switching (GMPLS)"; } @@ -2875,6 +2850,14 @@ Internet-Draft TE Common YANG Types November 2023 "Packet-Switch Capable-1 (PSC-1)."; reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) + + + +Busi, et al. Expires 20 May 2024 [Page 51] + +Internet-Draft TE Common YANG Types November 2023 + + Signaling Functional Description"; } @@ -2906,14 +2889,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity switching-otn { - - - -Busi, et al. Expires 20 May 2024 [Page 52] - -Internet-Draft TE Common YANG Types November 2023 - - base switching-capabilities; description "OTN-TDM capable."; @@ -2931,6 +2906,14 @@ Internet-Draft TE Common YANG Types November 2023 Switching Capable (DCSC) and Channel Set Label Extensions"; } + + + +Busi, et al. Expires 20 May 2024 [Page 52] + +Internet-Draft TE Common YANG Types November 2023 + + identity switching-lsc { base switching-capabilities; description @@ -2962,14 +2945,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Packet LSP encoding."; reference - - - -Busi, et al. Expires 20 May 2024 [Page 53] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; } @@ -2987,6 +2962,14 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-encoding-types; description "ANSI/ETSI PDH LSP encoding."; + + + +Busi, et al. Expires 20 May 2024 [Page 53] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; @@ -3019,13 +3002,6 @@ Internet-Draft TE Common YANG Types November 2023 Signaling Functional Description"; } - - -Busi, et al. Expires 20 May 2024 [Page 54] - -Internet-Draft TE Common YANG Types November 2023 - - identity lsp-encoding-fiber { base lsp-encoding-types; description @@ -3042,6 +3018,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; + + + +Busi, et al. Expires 20 May 2024 [Page 54] + +Internet-Draft TE Common YANG Types November 2023 + + } identity lsp-encoding-oduk { @@ -3074,14 +3058,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-signaling-type { - - - -Busi, et al. Expires 20 May 2024 [Page 55] - -Internet-Draft TE Common YANG Types November 2023 - - description "Base identity from which specific LSP path setup types are derived."; @@ -3098,6 +3074,14 @@ Internet-Draft TE Common YANG Types November 2023 description "RSVP-TE signaling path setup."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 55] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } @@ -3130,14 +3114,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity route-usage-type { - - - -Busi, et al. Expires 20 May 2024 [Page 56] - -Internet-Draft TE Common YANG Types November 2023 - - description "Base identity for route usage."; } @@ -3154,6 +3130,14 @@ Internet-Draft TE Common YANG Types November 2023 "'Exclude route' object."; reference "RFC 4874: Exclude Routes - Extension to Resource ReserVation + + + +Busi, et al. Expires 20 May 2024 [Page 56] + +Internet-Draft TE Common YANG Types November 2023 + + Protocol-Traffic Engineering (RSVP-TE)"; } @@ -3174,7 +3158,7 @@ Internet-Draft TE Common YANG Types November 2023 "Base identity for the path metric type. Derived identities SHOULD describe the unit and maximum value - of the path metric."; + of the path metric types they define."; } identity path-metric-te { @@ -3186,14 +3170,6 @@ Internet-Draft TE Common YANG Types November 2023 second MPLS Traffic Engineering (TE) Metric"; } - - - -Busi, et al. Expires 20 May 2024 [Page 57] - -Internet-Draft TE Common YANG Types November 2023 - - identity path-metric-igp { base path-metric-type; description @@ -3210,6 +3186,14 @@ Internet-Draft TE Common YANG Types November 2023 base path-metric-type; description "Hop path metric."; + + + +Busi, et al. Expires 20 May 2024 [Page 57] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -3242,14 +3226,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2 RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions"; - - - -Busi, et al. Expires 20 May 2024 [Page 58] - -Internet-Draft TE Common YANG Types November 2023 - - } identity path-metric-optimize-includes { @@ -3266,6 +3242,14 @@ Internet-Draft TE Common YANG Types November 2023 resources specified in a set."; } + + + +Busi, et al. Expires 20 May 2024 [Page 58] + +Internet-Draft TE Common YANG Types November 2023 + + identity path-tiebreaker-type { description "Base identity for the path tiebreaker type."; @@ -3298,14 +3282,6 @@ Internet-Draft TE Common YANG Types November 2023 identity resource-aff-include-all { base resource-affinities-type; - - - -Busi, et al. Expires 20 May 2024 [Page 59] - -Internet-Draft TE Common YANG Types November 2023 - - description "The set of attribute filters associated with a tunnel, all of which must be present for a link @@ -3322,6 +3298,14 @@ Internet-Draft TE Common YANG Types November 2023 tunnel, any of which must be present for a link to be acceptable."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 59] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 2702: Requirements for Traffic Engineering Over MPLS RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } @@ -3354,14 +3338,6 @@ Internet-Draft TE Common YANG Types November 2023 base te-optimization-criterion; description "Optimized on cost."; - - - -Busi, et al. Expires 20 May 2024 [Page 60] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; @@ -3378,10 +3354,18 @@ Internet-Draft TE Common YANG Types November 2023 identity path-computation-srlg-type { description - "Base identity for SRLG path computation."; - } - identity srlg-ignore { + + +Busi, et al. Expires 20 May 2024 [Page 60] + +Internet-Draft TE Common YANG Types November 2023 + + + "Base identity for SRLG path computation."; + } + + identity srlg-ignore { base path-computation-srlg-type; description "Ignores SRLGs in the path computation."; @@ -3410,14 +3394,6 @@ Internet-Draft TE Common YANG Types November 2023 // added in this module revision // RFC Editor: remove the note above and this note identity path-computation-error-reason { - - - -Busi, et al. Expires 20 May 2024 [Page 61] - -Internet-Draft TE Common YANG Types November 2023 - - description "Base identity for path computation error reasons."; } @@ -3434,6 +3410,14 @@ Internet-Draft TE Common YANG Types November 2023 identity path-computation-error-no-topology { base path-computation-error-reason; + + + +Busi, et al. Expires 20 May 2024 [Page 61] + +Internet-Draft TE Common YANG Types November 2023 + + description "Path computation has failed because there is no topology with the provided topology-identifier."; @@ -3466,14 +3450,6 @@ Internet-Draft TE Common YANG Types November 2023 https://www.iana.org/assignments/pcep/pcep.xhtml"; } - - - -Busi, et al. Expires 20 May 2024 [Page 62] - -Internet-Draft TE Common YANG Types November 2023 - - identity path-computation-error-no-inclusion-hop { base path-computation-error-reason; description @@ -3490,6 +3466,14 @@ Internet-Draft TE Common YANG Types November 2023 It corresponds to bit 19 of the Flags field of the NO-PATH-VECTOR TLV."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 62] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC8685; https://www.iana.org/assignments/pcep/pcep.xhtml"; @@ -3523,13 +3507,6 @@ Internet-Draft TE Common YANG Types November 2023 https://www.iana.org/assignments/pcep/pcep.xhtml"; } - - -Busi, et al. Expires 20 May 2024 [Page 63] - -Internet-Draft TE Common YANG Types November 2023 - - identity path-computation-error-destination-domain-unknown { base path-computation-error-reason; description @@ -3545,6 +3522,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-computation-error-p2mp { + + + +Busi, et al. Expires 20 May 2024 [Page 63] + +Internet-Draft TE Common YANG Types November 2023 + + base path-computation-error-reason; description "Path computation has failed because of P2MP reachability @@ -3578,14 +3563,6 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because of no GCO solution found. - - - -Busi, et al. Expires 20 May 2024 [Page 64] - -Internet-Draft TE Common YANG Types November 2023 - - It corresponds to bit 25 of the Flags field of the NO-PATH-VECTOR TLV."; reference @@ -3601,6 +3578,14 @@ Internet-Draft TE Common YANG Types November 2023 (PKS) expansion failure. It corresponds to bit 27 of the Flags field of the + + + +Busi, et al. Expires 20 May 2024 [Page 64] + +Internet-Draft TE Common YANG Types November 2023 + + NO-PATH-VECTOR TLV."; reference "RFC5520; @@ -3634,14 +3619,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC5440: Path Computation Element (PCE) Communication Protocol (PCEP); - - - -Busi, et al. Expires 20 May 2024 [Page 65] - -Internet-Draft TE Common YANG Types November 2023 - - https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3657,6 +3634,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC5440: Path Computation Element (PCE) Communication Protocol (PCEP); + + + +Busi, et al. Expires 20 May 2024 [Page 65] + +Internet-Draft TE Common YANG Types November 2023 + + https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3690,14 +3675,6 @@ Internet-Draft TE Common YANG Types November 2023 identity protocol-origin-pcep { base protocol-origin-type; - - - -Busi, et al. Expires 20 May 2024 [Page 66] - -Internet-Draft TE Common YANG Types November 2023 - - description "Protocol origin is Path Computation Engine Protocol (PCEP)."; @@ -3713,6 +3690,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC9012"; } + + + +Busi, et al. Expires 20 May 2024 [Page 66] + +Internet-Draft TE Common YANG Types November 2023 + + // CHANGE NOTE: The base identity svec-objective-function-type // and its derived identities below have been // added in this module revision @@ -3746,14 +3731,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity svec-of-minimize-cost-path-set { - - - -Busi, et al. Expires 20 May 2024 [Page 67] - -Internet-Draft TE Common YANG Types November 2023 - - base svec-objective-function-type; description "Objective function for minimizing the cost on a path set @@ -3769,6 +3746,14 @@ Internet-Draft TE Common YANG Types November 2023 "Objective function for minimizing the number of common transit domains (MCTD)."; reference + + + +Busi, et al. Expires 20 May 2024 [Page 67] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC8685: Path Computation Element Communication Protocol (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture."; @@ -3802,14 +3787,6 @@ Internet-Draft TE Common YANG Types November 2023 "Objective function for minimizing the number of shared nodes (MSN)."; reference - - - -Busi, et al. Expires 20 May 2024 [Page 68] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC8685: Path Computation Element Communication Protocol (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture."; @@ -3825,6 +3802,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; + + + +Busi, et al. Expires 20 May 2024 [Page 68] + +Internet-Draft TE Common YANG Types November 2023 + + } identity svec-metric-cumul-te { @@ -3858,14 +3843,6 @@ Internet-Draft TE Common YANG Types November 2023 base svec-metric-type; description "Aggregate bandwidth consumption."; - - - -Busi, et al. Expires 20 May 2024 [Page 69] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; @@ -3881,6 +3858,14 @@ Internet-Draft TE Common YANG Types November 2023 } /** + + + +Busi, et al. Expires 20 May 2024 [Page 69] + +Internet-Draft TE Common YANG Types November 2023 + + * TE bandwidth groupings **/ @@ -3915,13 +3900,6 @@ Internet-Draft TE Common YANG Types November 2023 * TE label groupings **/ - - -Busi, et al. Expires 20 May 2024 [Page 70] - -Internet-Draft TE Common YANG Types November 2023 - - grouping te-label { description "This grouping defines the generic TE label. @@ -3936,6 +3914,14 @@ Internet-Draft TE Common YANG Types November 2023 default "generic"; description "Data-plane technology type."; + + + +Busi, et al. Expires 20 May 2024 [Page 70] + +Internet-Draft TE Common YANG Types November 2023 + + case generic { leaf generic { type rt-types:generalized-label; @@ -3970,14 +3956,6 @@ Internet-Draft TE Common YANG Types November 2023 leaf client-id { type te-global-id; default "0"; - - - -Busi, et al. Expires 20 May 2024 [Page 71] - -Internet-Draft TE Common YANG Types November 2023 - - description "An identifier to uniquely identify a client. If omitted, it assumes that the topology client ID @@ -3992,6 +3970,14 @@ Internet-Draft TE Common YANG Types November 2023 the default (empty) string for this leaf is assumed."; } } + + + +Busi, et al. Expires 20 May 2024 [Page 71] + +Internet-Draft TE Common YANG Types November 2023 + + } /** @@ -4026,14 +4012,6 @@ Internet-Draft TE Common YANG Types November 2023 grouping performance-metrics-two-way-delay-loss { description - - - -Busi, et al. Expires 20 May 2024 [Page 72] - -Internet-Draft TE Common YANG Types November 2023 - - "PM information in real time that can be applicable to links or connections. PM defined in this grouping are applicable to generic TE PM as well as packet TE PM."; @@ -4048,6 +4026,14 @@ Internet-Draft TE Common YANG Types November 2023 range "0..16777215"; } description + + + +Busi, et al. Expires 20 May 2024 [Page 72] + +Internet-Draft TE Common YANG Types November 2023 + + "Two-way delay or latency in microseconds."; } leaf two-way-delay-normality { @@ -4082,14 +4068,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf one-way-residual-bandwidth-normality { type te-types:performance-metrics-normality; - - - -Busi, et al. Expires 20 May 2024 [Page 73] - -Internet-Draft TE Common YANG Types November 2023 - - default "normal"; description "Residual bandwidth normality."; @@ -4104,6 +4082,14 @@ Internet-Draft TE Common YANG Types November 2023 actual forwarding of non-RSVP-TE LSP packets. For a bundled link, available bandwidth is defined to be the sum of the component link available bandwidths."; + + + +Busi, et al. Expires 20 May 2024 [Page 73] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf one-way-available-bandwidth-normality { type te-types:performance-metrics-normality; @@ -4138,14 +4124,6 @@ Internet-Draft TE Common YANG Types November 2023 } default "0"; description - - - -Busi, et al. Expires 20 May 2024 [Page 74] - -Internet-Draft TE Common YANG Types November 2023 - - "One-way delay or latency in microseconds."; } leaf one-way-residual-bandwidth { @@ -4160,6 +4138,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2"; } + + + +Busi, et al. Expires 20 May 2024 [Page 74] + +Internet-Draft TE Common YANG Types November 2023 + + leaf one-way-available-bandwidth { type rt-types:bandwidth-ieee-float32; units "bytes per second"; @@ -4194,14 +4180,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Two-way delay or latency in microseconds."; } - - - -Busi, et al. Expires 20 May 2024 [Page 75] - -Internet-Draft TE Common YANG Types November 2023 - - } grouping performance-metrics-thresholds { @@ -4216,6 +4194,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Contains PM attributes."; container performance-metrics-one-way { + + + +Busi, et al. Expires 20 May 2024 [Page 75] + +Internet-Draft TE Common YANG Types November 2023 + + description "One-way link performance information in real time."; reference @@ -4250,14 +4236,6 @@ Internet-Draft TE Common YANG Types November 2023 } description "Link performance information in real time."; - - - -Busi, et al. Expires 20 May 2024 [Page 76] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for Explicitly @@ -4272,6 +4250,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Offset value to be added to the measured delay value."; } + + + +Busi, et al. Expires 20 May 2024 [Page 76] + +Internet-Draft TE Common YANG Types November 2023 + + leaf measure-interval { type uint32; default "30"; @@ -4306,14 +4292,6 @@ Internet-Draft TE Common YANG Types November 2023 for the minimum-delay metric only) and the advertised value is not already outside that bound, an 'anomalous' announcement (anomalous bit set) will be triggered."; - - - -Busi, et al. Expires 20 May 2024 [Page 77] - -Internet-Draft TE Common YANG Types November 2023 - - } container threshold-in { uses performance-metrics-thresholds; @@ -4328,6 +4306,14 @@ Internet-Draft TE Common YANG Types November 2023 description "When the difference between the last advertised value and the current measured value exceeds this threshold, an + + + +Busi, et al. Expires 20 May 2024 [Page 77] + +Internet-Draft TE Common YANG Types November 2023 + + 'anomalous' announcement (anomalous bit set) will be triggered."; uses performance-metrics-thresholds; @@ -4362,14 +4348,6 @@ Internet-Draft TE Common YANG Types November 2023 "The identifier of a node in the TE topology."; } leaf hop-type { - - - -Busi, et al. Expires 20 May 2024 [Page 78] - -Internet-Draft TE Common YANG Types November 2023 - - type te-hop-type; default "strict"; description @@ -4384,6 +4362,14 @@ Internet-Draft TE Common YANG Types November 2023 ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; } } + + + +Busi, et al. Expires 20 May 2024 [Page 78] + +Internet-Draft TE Common YANG Types November 2023 + + case numbered-link-hop { container numbered-link-hop { leaf link-tp-id { @@ -4418,14 +4404,6 @@ Internet-Draft TE Common YANG Types November 2023 must "(link-tp-id-uri or link-tp-id) and " + "(node-id-uri or node-id)" { description - - - -Busi, et al. Expires 20 May 2024 [Page 79] - -Internet-Draft TE Common YANG Types November 2023 - - "At least one node identifier and at least one Link Termination Point (LTP) identifier MUST be present."; } @@ -4440,6 +4418,14 @@ Internet-Draft TE Common YANG Types November 2023 "TE LTP identifier. The combination of the TE link ID and the TE node ID is used to identify an unnumbered TE link."; + + + +Busi, et al. Expires 20 May 2024 [Page 79] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf node-id-uri { type nw:node-id; @@ -4474,14 +4460,6 @@ Internet-Draft TE Common YANG Types November 2023 } case as-number { container as-number-hop { - - - -Busi, et al. Expires 20 May 2024 [Page 80] - -Internet-Draft TE Common YANG Types November 2023 - - leaf as-number { type inet:as-number; mandatory true; @@ -4496,6 +4474,14 @@ Internet-Draft TE Common YANG Types November 2023 } description "AS explicit route hop."; + + + +Busi, et al. Expires 20 May 2024 [Page 80] + +Internet-Draft TE Common YANG Types November 2023 + + } } case label { @@ -4530,14 +4516,6 @@ Internet-Draft TE Common YANG Types November 2023 "At least one node identifier MUST be present."; } description - - - -Busi, et al. Expires 20 May 2024 [Page 81] - -Internet-Draft TE Common YANG Types November 2023 - - "Numbered node route hop container."; leaf node-id-uri { type nw:node-id; @@ -4552,6 +4530,14 @@ Internet-Draft TE Common YANG Types November 2023 leaf-list flags { type path-attribute-flags; description + + + +Busi, et al. Expires 20 May 2024 [Page 81] + +Internet-Draft TE Common YANG Types November 2023 + + "Path attributes flags."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels @@ -4586,14 +4572,6 @@ Internet-Draft TE Common YANG Types November 2023 Node-Id Sub-Object"; } } - - - -Busi, et al. Expires 20 May 2024 [Page 82] - -Internet-Draft TE Common YANG Types November 2023 - - description "Numbered link route hop."; } @@ -4608,6 +4586,14 @@ Internet-Draft TE Common YANG Types November 2023 leaf link-tp-id-uri { type nt:tp-id; description + + + +Busi, et al. Expires 20 May 2024 [Page 82] + +Internet-Draft TE Common YANG Types November 2023 + + "Link Termination Point (LTP) identifier."; } leaf link-tp-id { @@ -4642,14 +4628,6 @@ Internet-Draft TE Common YANG Types November 2023 "Unnumbered link Record Route hop."; reference "RFC 3477: Signalling Unnumbered Links in Resource - - - -Busi, et al. Expires 20 May 2024 [Page 83] - -Internet-Draft TE Common YANG Types November 2023 - - ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; } description @@ -4664,6 +4642,14 @@ Internet-Draft TE Common YANG Types November 2023 type path-attribute-flags; description "Path attributes flags."; + + + +Busi, et al. Expires 20 May 2024 [Page 83] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP @@ -4698,14 +4684,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf index { type uint32; - - - -Busi, et al. Expires 20 May 2024 [Page 84] - -Internet-Draft TE Common YANG Types November 2023 - - description "The index of the label restriction list entry."; } @@ -4720,6 +4698,14 @@ Internet-Draft TE Common YANG Types November 2023 + " or " + "(not(../label-end/te-label/direction) and" + " (te-label/direction = 'forward'))" { + + + +Busi, et al. Expires 20 May 2024 [Page 84] + +Internet-Draft TE Common YANG Types November 2023 + + error-message "'label-start' and 'label-end' must have the " + "same direction."; } @@ -4754,14 +4740,6 @@ Internet-Draft TE Common YANG Types November 2023 The label start/end values will have to be consistent with the sign of label step. For example, 'label-start' < 'label-end' enforces 'label-step' > 0 - - - -Busi, et al. Expires 20 May 2024 [Page 85] - -Internet-Draft TE Common YANG Types November 2023 - - 'label-start' > 'label-end' enforces 'label-step' < 0."; choice technology { default "generic"; @@ -4776,6 +4754,14 @@ Internet-Draft TE Common YANG Types November 2023 } } } + + + +Busi, et al. Expires 20 May 2024 [Page 85] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf range-bitmap { type yang:hex-string; @@ -4810,14 +4796,6 @@ Internet-Draft TE Common YANG Types November 2023 description "The label restrictions container."; list label-restriction { - - - -Busi, et al. Expires 20 May 2024 [Page 86] - -Internet-Draft TE Common YANG Types November 2023 - - key "index"; description "The absence of the label restrictions container implies @@ -4832,6 +4810,14 @@ Internet-Draft TE Common YANG Types November 2023 } grouping optimization-metric-entry { + + + +Busi, et al. Expires 20 May 2024 [Page 86] + +Internet-Draft TE Common YANG Types November 2023 + + description "Optimization metrics configuration grouping."; leaf metric-type { @@ -4866,14 +4852,6 @@ Internet-Draft TE Common YANG Types November 2023 grouping common-constraints { description - - - -Busi, et al. Expires 20 May 2024 [Page 87] - -Internet-Draft TE Common YANG Types November 2023 - - "Common constraints grouping that can be set on a constraint set or directly on the tunnel."; uses te-bandwidth { @@ -4888,6 +4866,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Link protection type required for the links included in the computed path."; + + + +Busi, et al. Expires 20 May 2024 [Page 87] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4202: Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -4922,14 +4908,6 @@ Internet-Draft TE Common YANG Types November 2023 } } - - - -Busi, et al. Expires 20 May 2024 [Page 88] - -Internet-Draft TE Common YANG Types November 2023 - - grouping tunnel-constraints { description "Tunnel constraints grouping that can be set on @@ -4944,6 +4922,14 @@ Internet-Draft TE Common YANG Types November 2023 } grouping path-constraints-route-objects { + + + +Busi, et al. Expires 20 May 2024 [Page 88] + +Internet-Draft TE Common YANG Types November 2023 + + description "List of route entries to be included or excluded when performing the path computation."; @@ -4978,14 +4964,6 @@ Internet-Draft TE Common YANG Types November 2023 default "te-types:route-include-object"; description "Indicates whether to include or exclude the - - - -Busi, et al. Expires 20 May 2024 [Page 89] - -Internet-Draft TE Common YANG Types November 2023 - - route object. The default is to include it."; } leaf index { @@ -5000,6 +4978,14 @@ Internet-Draft TE Common YANG Types November 2023 case srlg { container srlg { description + + + +Busi, et al. Expires 20 May 2024 [Page 89] + +Internet-Draft TE Common YANG Types November 2023 + + "SRLG container."; leaf srlg { type uint32; @@ -5034,14 +5020,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Route object entry index. The index is used to identify an entry in the list. The order of entries - - - -Busi, et al. Expires 20 May 2024 [Page 90] - -Internet-Draft TE Common YANG Types November 2023 - - is defined by the user without relying on key values."; } uses explicit-route-hop; @@ -5056,6 +5034,14 @@ Internet-Draft TE Common YANG Types November 2023 key "index"; ordered-by user; description + + + +Busi, et al. Expires 20 May 2024 [Page 90] + +Internet-Draft TE Common YANG Types November 2023 + + "List of Explicit Route Objects to be excluded in the path computation."; leaf index { @@ -5090,14 +5076,6 @@ Internet-Draft TE Common YANG Types November 2023 grouping generic-path-metric-bounds { description - - - -Busi, et al. Expires 20 May 2024 [Page 91] - -Internet-Draft TE Common YANG Types November 2023 - - "TE path metric bounds grouping."; container path-metric-bounds { description @@ -5112,6 +5090,14 @@ Internet-Draft TE Common YANG Types November 2023 } description "Identifies an entry in the list of 'metric-type' items + + + +Busi, et al. Expires 20 May 2024 [Page 91] + +Internet-Draft TE Common YANG Types November 2023 + + bound for the TE path."; } leaf upper-bound { @@ -5146,14 +5132,6 @@ Internet-Draft TE Common YANG Types November 2023 list optimization-metric { key "metric-type"; description - - - -Busi, et al. Expires 20 May 2024 [Page 92] - -Internet-Draft TE Common YANG Types November 2023 - - "TE path metric type."; uses optimization-metric-entry; } @@ -5168,6 +5146,14 @@ Internet-Draft TE Common YANG Types November 2023 equally favored set of paths, in order to pick the best."; leaf tiebreaker-type { + + + +Busi, et al. Expires 20 May 2024 [Page 92] + +Internet-Draft TE Common YANG Types November 2023 + + type identityref { base path-metric-type; } @@ -5202,14 +5188,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Path affinities grouping."; container path-affinities-values { - - - -Busi, et al. Expires 20 May 2024 [Page 93] - -Internet-Draft TE Common YANG Types November 2023 - - description "Path affinities represented as values."; list path-affinities-value { @@ -5224,6 +5202,14 @@ Internet-Draft TE Common YANG Types November 2023 "Identifies an entry in the list of value affinity constraints."; } + + + +Busi, et al. Expires 20 May 2024 [Page 93] + +Internet-Draft TE Common YANG Types November 2023 + + leaf value { type admin-groups; default ""; @@ -5258,14 +5244,6 @@ Internet-Draft TE Common YANG Types November 2023 "List of named affinities."; } } - - - -Busi, et al. Expires 20 May 2024 [Page 94] - -Internet-Draft TE Common YANG Types November 2023 - - } } @@ -5280,6 +5258,14 @@ Internet-Draft TE Common YANG Types November 2023 description "List of SRLG values to be included or excluded."; leaf usage { + + + +Busi, et al. Expires 20 May 2024 [Page 94] + +Internet-Draft TE Common YANG Types November 2023 + + type identityref { base route-usage-type; } @@ -5314,14 +5300,6 @@ Internet-Draft TE Common YANG Types November 2023 description "List of named SRLGs."; } - - - -Busi, et al. Expires 20 May 2024 [Page 95] - -Internet-Draft TE Common YANG Types November 2023 - - } } } @@ -5336,6 +5314,14 @@ Internet-Draft TE Common YANG Types November 2023 When configured for a primary path, the disjointness level applies to all secondary LSPs. When configured for a secondary path, the disjointness level overrides the level + + + +Busi, et al. Expires 20 May 2024 [Page 95] + +Internet-Draft TE Common YANG Types November 2023 + + configured for the primary path."; } } @@ -5370,14 +5356,6 @@ Internet-Draft TE Common YANG Types November 2023 list path-metric { key "metric-type"; description - - - -Busi, et al. Expires 20 May 2024 [Page 96] - -Internet-Draft TE Common YANG Types November 2023 - - "TE path metric type."; leaf metric-type { type identityref { @@ -5392,6 +5370,14 @@ Internet-Draft TE Common YANG Types November 2023 "TE path metric accumulative value."; } } + + + +Busi, et al. Expires 20 May 2024 [Page 96] + +Internet-Draft TE Common YANG Types November 2023 + + uses generic-path-affinities; uses generic-path-srlgs; container path-route-objects { @@ -5426,14 +5412,6 @@ Internet-Draft TE Common YANG Types November 2023 "Common grouping to define the LSP encoding and switching types"; leaf encoding { - - - -Busi, et al. Expires 20 May 2024 [Page 97] - -Internet-Draft TE Common YANG Types November 2023 - - type identityref { base te-types:lsp-encoding-types; } @@ -5448,6 +5426,14 @@ Internet-Draft TE Common YANG Types November 2023 } description "LSP switching type."; + + + +Busi, et al. Expires 20 May 2024 [Page 97] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC3945"; } @@ -5483,13 +5469,6 @@ Internet-Draft TE Common YANG Types November 2023 // RFC Editor: replace XXXX with actual RFC number // and remove this note - - -Busi, et al. Expires 20 May 2024 [Page 98] - -Internet-Draft TE Common YANG Types November 2023 - - organization "IETF Traffic Engineering Architecture and Signaling (TEAS) Working Group"; @@ -5503,6 +5482,14 @@ Internet-Draft TE Common YANG Types November 2023 Editor: Rakesh Gandhi + + + +Busi, et al. Expires 20 May 2024 [Page 98] + +Internet-Draft TE Common YANG Types November 2023 + + Editor: Vishnu Pavan Beeram @@ -5538,14 +5525,6 @@ Internet-Draft TE Common YANG Types November 2023 - path-metric-loss; - path-metric-delay-variation. - - - -Busi, et al. Expires 20 May 2024 [Page 99] - -Internet-Draft TE Common YANG Types November 2023 - - Added common TE packet groupings: - te-packet-path-bandwidth; - te-packet-link-bandwidth. @@ -5559,6 +5538,14 @@ Internet-Draft TE Common YANG Types November 2023 revision 2020-06-10 { description + + + +Busi, et al. Expires 20 May 2024 [Page 99] + +Internet-Draft TE Common YANG Types November 2023 + + "Latest revision of TE MPLS types."; reference "RFC 8776: Common YANG Data Types for Traffic Engineering"; @@ -5594,14 +5581,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity rfc-2698-bwp { - - - -Busi, et al. Expires 20 May 2024 [Page 100] - -Internet-Draft TE Common YANG Types November 2023 - - base bandwidth-profile-type; description "RFC 2698 Bandwidth Profile"; @@ -5615,6 +5594,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 4115 Bandwidth Profile"; reference "RFC4115: A Differentiated Service Two-Rate, Three-Color + + + +Busi, et al. Expires 20 May 2024 [Page 100] + +Internet-Draft TE Common YANG Types November 2023 + + Marker with Efficient Handling of in-Profile Traffic"; } @@ -5650,14 +5637,6 @@ Internet-Draft TE Common YANG Types November 2023 identity path-metric-delay-variation { base path-metric-type; description - - - -Busi, et al. Expires 20 May 2024 [Page 101] - -Internet-Draft TE Common YANG Types November 2023 - - "The path delay variation encodes the sum of the unidirectional delay variation metrics of all links traversed by a P2P path. @@ -5671,6 +5650,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC8233: Extensions to the Path Computation Element Communication Protocol (PCEP) to Compute Service-Aware Label + + + +Busi, et al. Expires 20 May 2024 [Page 101] + +Internet-Draft TE Common YANG Types November 2023 + + Switched Paths (LSPs); RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; @@ -5706,14 +5693,6 @@ Internet-Draft TE Common YANG Types November 2023 bandwidth constraints. Class-Type is used for the purposes of link bandwidth allocation, constraint-based routing, and admission control."; - - - -Busi, et al. Expires 20 May 2024 [Page 102] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 4124: Protocol Extensions for Support of Diffserv-aware MPLS Traffic Engineering"; @@ -5727,6 +5706,14 @@ Internet-Draft TE Common YANG Types November 2023 "Diffserv-TE bandwidth constraints as defined in RFC 4124."; reference "RFC 4124: Protocol Extensions for Support of Diffserv-aware + + + +Busi, et al. Expires 20 May 2024 [Page 102] + +Internet-Draft TE Common YANG Types November 2023 + + MPLS Traffic Engineering"; } @@ -5762,14 +5749,6 @@ Internet-Draft TE Common YANG Types November 2023 "Backup provides link protection only."; } - - - -Busi, et al. Expires 20 May 2024 [Page 103] - -Internet-Draft TE Common YANG Types November 2023 - - identity backup-protection-node-link { base backup-protection-type; description @@ -5783,6 +5762,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 4124: Protocol Extensions for Support of Diffserv-aware MPLS Traffic Engineering"; + + + +Busi, et al. Expires 20 May 2024 [Page 103] + +Internet-Draft TE Common YANG Types November 2023 + + } identity bc-model-rdm { @@ -5818,14 +5805,6 @@ Internet-Draft TE Common YANG Types November 2023 * Groupings */ - - - -Busi, et al. Expires 20 May 2024 [Page 104] - -Internet-Draft TE Common YANG Types November 2023 - - grouping performance-metrics-attributes-packet { description "Contains PM attributes."; @@ -5839,6 +5818,14 @@ Internet-Draft TE Common YANG Types November 2023 "One-way minimum delay or latency in microseconds."; } leaf one-way-min-delay-normality { + + + +Busi, et al. Expires 20 May 2024 [Page 104] + +Internet-Draft TE Common YANG Types November 2023 + + type te-types:performance-metrics-normality; default "normal"; description @@ -5874,14 +5861,6 @@ Internet-Draft TE Common YANG Types November 2023 "One-way delay variation normality."; reference "RFC 7471: OSPF Traffic Engineering (TE) Metric - - - -Busi, et al. Expires 20 May 2024 [Page 105] - -Internet-Draft TE Common YANG Types November 2023 - - Extensions RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using @@ -5895,6 +5874,14 @@ Internet-Draft TE Common YANG Types November 2023 range "0..50.331642"; } description + + + +Busi, et al. Expires 20 May 2024 [Page 105] + +Internet-Draft TE Common YANG Types November 2023 + + "One-way packet loss as a percentage of the total traffic sent over a configurable interval. The finest precision is 0.000003%, where the maximum is 50.331642%."; @@ -5930,14 +5917,6 @@ Internet-Draft TE Common YANG Types November 2023 "Two-way minimum delay or latency in microseconds."; } leaf two-way-min-delay-normality { - - - -Busi, et al. Expires 20 May 2024 [Page 106] - -Internet-Draft TE Common YANG Types November 2023 - - type te-types:performance-metrics-normality; default "normal"; description @@ -5951,6 +5930,14 @@ Internet-Draft TE Common YANG Types November 2023 RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; } + + + +Busi, et al. Expires 20 May 2024 [Page 106] + +Internet-Draft TE Common YANG Types November 2023 + + leaf two-way-max-delay { type uint32 { range "0..16777215"; @@ -5986,14 +5973,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf two-way-delay-variation-normality { type te-types:performance-metrics-normality; - - - -Busi, et al. Expires 20 May 2024 [Page 107] - -Internet-Draft TE Common YANG Types November 2023 - - default "normal"; description "Two-way delay variation normality."; @@ -6007,6 +5986,14 @@ Internet-Draft TE Common YANG Types November 2023 Extensions"; } leaf two-way-packet-loss { + + + +Busi, et al. Expires 20 May 2024 [Page 107] + +Internet-Draft TE Common YANG Types November 2023 + + type decimal64 { fraction-digits 6; range "0..50.331642"; @@ -6042,14 +6029,6 @@ Internet-Draft TE Common YANG Types November 2023 "One-way packet PM throttle grouping."; leaf one-way-min-delay { type uint32 { - - - -Busi, et al. Expires 20 May 2024 [Page 108] - -Internet-Draft TE Common YANG Types November 2023 - - range "0..16777215"; } default "0"; @@ -6063,6 +6042,14 @@ Internet-Draft TE Common YANG Types November 2023 default "0"; description "One-way maximum delay or latency in microseconds."; + + + +Busi, et al. Expires 20 May 2024 [Page 108] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf one-way-delay-variation { type uint32 { @@ -6098,14 +6085,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf two-way-max-delay { type uint32 { - - - -Busi, et al. Expires 20 May 2024 [Page 109] - -Internet-Draft TE Common YANG Types November 2023 - - range "0..16777215"; } default "0"; @@ -6119,6 +6098,14 @@ Internet-Draft TE Common YANG Types November 2023 default "0"; description "Two-way delay variation in microseconds."; + + + +Busi, et al. Expires 20 May 2024 [Page 109] + +Internet-Draft TE Common YANG Types November 2023 + + } leaf two-way-packet-loss { type decimal64 { @@ -6154,14 +6141,6 @@ Internet-Draft TE Common YANG Types November 2023 augment "throttle/threshold-accelerated-advertisement" { uses one-way-performance-metrics-packet; uses two-way-performance-metrics-packet; - - - -Busi, et al. Expires 20 May 2024 [Page 110] - -Internet-Draft TE Common YANG Types November 2023 - - description "PM accelerated advertisement packet augmentation for a generic grouping."; @@ -6175,6 +6154,14 @@ Internet-Draft TE Common YANG Types November 2023 grouping te-packet-path-bandwidth { description "Path bandwidth for Packet. "; + + + +Busi, et al. Expires 20 May 2024 [Page 110] + +Internet-Draft TE Common YANG Types November 2023 + + leaf bandwidth-profile-name { type string; description "Name of Bandwidth Profile."; @@ -6210,14 +6197,6 @@ Internet-Draft TE Common YANG Types November 2023 units "bytes"; description "Excess Burst Size (EBS)."; - - - -Busi, et al. Expires 20 May 2024 [Page 111] - -Internet-Draft TE Common YANG Types November 2023 - - } leaf pir { type uint64; @@ -6231,6 +6210,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Peak Burst Size (PBS)."; } + + + +Busi, et al. Expires 20 May 2024 [Page 111] + +Internet-Draft TE Common YANG Types November 2023 + + } // CHANGE NOTE: The te-packet-path-bandwidth below has been @@ -6267,13 +6254,6 @@ Internet-Draft TE Common YANG Types November 2023 This document also adds updated YANG modules to the "YANG Module Names" registry [RFC7950]: - - -Busi, et al. Expires 20 May 2024 [Page 112] - -Internet-Draft TE Common YANG Types November 2023 - - name: ietf-te-types namespace: urn:ietf:params:xml:ns:yang:ietf-te-types prefix: te-types @@ -6287,6 +6267,13 @@ Internet-Draft TE Common YANG Types November 2023 RFC Editor: Please replace XXXX with the RFC number assigned to this document. + + +Busi, et al. Expires 20 May 2024 [Page 112] + +Internet-Draft TE Common YANG Types November 2023 + + 7. Security Considerations The YANG module specified in this document defines a schema for data @@ -6323,13 +6310,6 @@ Internet-Draft TE Common YANG Types November 2023 switching - Linear trail and subnetwork protection", ITU-T G.808.1 , May 2014. - - -Busi, et al. Expires 20 May 2024 [Page 113] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, @@ -6340,6 +6320,16 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC5440, March 2009, . + + + + + +Busi, et al. Expires 20 May 2024 [Page 113] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC5441] Vasseur, JP., Ed., Zhang, R., Bitar, N., and JL. Le Roux, "A Backward-Recursive PCE-Based Computation (BRPC) Procedure to Compute Shortest Constrained Inter-Domain @@ -6379,13 +6369,6 @@ Internet-Draft TE Common YANG Types November 2023 Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011, . - - -Busi, et al. Expires 20 May 2024 [Page 114] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC6991] Schoenwaelder, J., Ed., "Common YANG Data Types", RFC 6991, DOI 10.17487/RFC6991, July 2013, . @@ -6394,6 +6377,15 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7950, DOI 10.17487/RFC7950, August 2016, . + + + + +Busi, et al. Expires 20 May 2024 [Page 114] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017, . @@ -6435,6 +6427,14 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC8685, December 2019, . + [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, + "Common YANG Data Types for Traffic Engineering", + RFC 8776, DOI 10.17487/RFC8776, June 2020, + . + + + + Busi, et al. Expires 20 May 2024 [Page 115] @@ -6442,11 +6442,6 @@ Busi, et al. Expires 20 May 2024 [Page 115] Internet-Draft TE Common YANG Types November 2023 - [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, - "Common YANG Data Types for Traffic Engineering", - RFC 8776, DOI 10.17487/RFC8776, June 2020, - . - [RFC8800] Litkowski, S., Sivabalan, S., Barth, C., and M. Negi, "Path Computation Element Communication Protocol (PCEP) Extension for Label Switched Path (LSP) Diversity @@ -6484,20 +6479,6 @@ Internet-Draft TE Common YANG Types November 2023 October 2023, . - - - - - - - - - -Busi, et al. Expires 20 May 2024 [Page 116] - -Internet-Draft TE Common YANG Types November 2023 - - [I-D.ietf-teas-yang-te-mpls] Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. Bryskin, "A YANG Data Model for MPLS Traffic Engineering @@ -6510,6 +6491,13 @@ Internet-Draft TE Common YANG Types November 2023 International Telecommunication Union, "Interfaces for the optical transport network", ITU-T G.709 , June 2020. + + +Busi, et al. Expires 20 May 2024 [Page 116] + +Internet-Draft TE Common YANG Types November 2023 + + [MEF_10.3] MEF, "Ethernet Services Attributes Phase 3", MEF 10.3 , October 2013. @@ -6546,14 +6534,6 @@ Internet-Draft TE Common YANG Types November 2023 (RSVP-TE)", RFC 3477, DOI 10.17487/RFC3477, January 2003, . - - - -Busi, et al. Expires 20 May 2024 [Page 117] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC3630] Katz, D., Kompella, K., and D. Yeung, "Traffic Engineering (TE) Extensions to OSPF Version 2", RFC 3630, DOI 10.17487/RFC3630, September 2003, @@ -6563,6 +6543,17 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC3688, January 2004, . + + + + + + +Busi, et al. Expires 20 May 2024 [Page 117] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC3785] Le Faucheur, F., Uppili, R., Vedrenne, A., Merckx, P., and T. Telkamp, "Use of Interior Gateway Protocol (IGP) Metric as a second MPLS Traffic Engineering (TE) Metric", BCP 87, @@ -6600,16 +6591,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 4127, DOI 10.17487/RFC4127, June 2005, . - - - - - -Busi, et al. Expires 20 May 2024 [Page 118] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC4202] Kompella, K., Ed. and Y. Rekhter, Ed., "Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 4202, DOI 10.17487/RFC4202, October 2005, @@ -6620,6 +6601,15 @@ Internet-Draft TE Common YANG Types November 2023 (GMPLS)", RFC 4203, DOI 10.17487/RFC4203, October 2005, . + + + + +Busi, et al. Expires 20 May 2024 [Page 118] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC4328] Papadimitriou, D., Ed., "Generalized Multi-Protocol Label Switching (GMPLS) Signaling Extensions for G.709 Optical Transport Networks Control", RFC 4328, @@ -6658,6 +6648,16 @@ Internet-Draft TE Common YANG Types November 2023 "GMPLS Segment Recovery", RFC 4873, DOI 10.17487/RFC4873, May 2007, . + [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. + Yasukawa, Ed., "Extensions to Resource Reservation + Protocol - Traffic Engineering (RSVP-TE) for Point-to- + Multipoint TE Label Switched Paths (LSPs)", RFC 4875, + DOI 10.17487/RFC4875, May 2007, + . + + + + @@ -6666,13 +6666,6 @@ Busi, et al. Expires 20 May 2024 [Page 119] Internet-Draft TE Common YANG Types November 2023 - [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. - Yasukawa, Ed., "Extensions to Resource Reservation - Protocol - Traffic Engineering (RSVP-TE) for Point-to- - Multipoint TE Label Switched Paths (LSPs)", RFC 4875, - DOI 10.17487/RFC4875, May 2007, - . - [RFC4920] Farrel, A., Ed., Satyanarayana, A., Iwata, A., Fujita, N., and G. Ash, "Crankback Signaling Extensions for MPLS and GMPLS RSVP-TE", RFC 4920, DOI 10.17487/RFC4920, July 2007, @@ -6715,6 +6708,13 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC5712, January 2010, . + [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, + D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol + Extensions for Multi-Layer and Multi-Region Networks (MLN/ + MRN)", RFC 6001, DOI 10.17487/RFC6001, October 2010, + . + + Busi, et al. Expires 20 May 2024 [Page 120] @@ -6722,12 +6722,6 @@ Busi, et al. Expires 20 May 2024 [Page 120] Internet-Draft TE Common YANG Types November 2023 - [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, - D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol - Extensions for Multi-Layer and Multi-Region Networks (MLN/ - MRN)", RFC 6001, DOI 10.17487/RFC6001, October 2010, - . - [RFC6004] Berger, L. and D. Fedyk, "Generalized MPLS (GMPLS) Support for Metro Ethernet Forum and G.8011 Ethernet Service Switching", RFC 6004, DOI 10.17487/RFC6004, October 2010, @@ -6768,6 +6762,12 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC6827, January 2013, . + [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., + and K. Pithewan, "GMPLS Signaling Extensions for Control + of Evolving G.709 Optical Transport Networks", RFC 7139, + DOI 10.17487/RFC7139, March 2014, + . + @@ -6778,12 +6778,6 @@ Busi, et al. Expires 20 May 2024 [Page 121] Internet-Draft TE Common YANG Types November 2023 - [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., - and K. Pithewan, "GMPLS Signaling Extensions for Control - of Evolving G.709 Optical Transport Networks", RFC 7139, - DOI 10.17487/RFC7139, March 2014, - . - [RFC7260] Takacs, A., Fedyk, D., and J. He, "GMPLS RSVP-TE Extensions for Operations, Administration, and Maintenance (OAM) Configuration", RFC 7260, DOI 10.17487/RFC7260, June @@ -6827,6 +6821,12 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7823, DOI 10.17487/RFC7823, May 2016, . + [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., + Hartley, M., and Z. Ali, "RSVP-TE Extensions for + Collecting Shared Risk Link Group (SRLG) Information", + RFC 8001, DOI 10.17487/RFC8001, January 2017, + . + Busi, et al. Expires 20 May 2024 [Page 122] @@ -6834,12 +6834,6 @@ Busi, et al. Expires 20 May 2024 [Page 122] Internet-Draft TE Common YANG Types November 2023 - [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., - Hartley, M., and Z. Ali, "RSVP-TE Extensions for - Collecting Shared Risk Link Group (SRLG) Information", - RFC 8001, DOI 10.17487/RFC8001, January 2017, - . - [RFC8149] Saad, T., Ed., Gandhi, R., Ed., Ali, Z., Venator, R., and Y. Kamite, "RSVP Extensions for Reoptimization of Loosely Routed Point-to-Multipoint Traffic Engineering Label @@ -6883,6 +6877,12 @@ A.1. TE Types YANG Diffs of the YANG model in Section 4 to the changes compared with the YANG model in [RFC8776]. + This diff has been generated using the following UNIX commands to + compare the YANG module revisions in section 3.1 of [RFC8776] and in + Section 4: + + + Busi, et al. Expires 20 May 2024 [Page 123] @@ -6890,10 +6890,6 @@ Busi, et al. Expires 20 May 2024 [Page 123] Internet-Draft TE Common YANG Types November 2023 - This diff has been generated using the following UNIX commands to - compare the YANG module revisions in section 3.1 of [RFC8776] and in - Section 4: - diff ietf-te-types@2020-06-10.yang ietf-te-types.yang > model-diff.txt sed 's/^/ /' model-diff.txt > model-diff-spaces.txt @@ -6938,6 +6934,10 @@ Internet-Draft TE Common YANG Types November 2023 > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; + > - identity tunnel-admin-state-auto; + > - identity lsp-restoration-restore-none; + > - base identity path-computation-error-reason and + > its derived identities; @@ -6946,10 +6946,6 @@ Busi, et al. Expires 20 May 2024 [Page 124] Internet-Draft TE Common YANG Types November 2023 - > - identity tunnel-admin-state-auto; - > - identity lsp-restoration-restore-none; - > - base identity path-computation-error-reason and - > its derived identities; > - base identity protocol-origin-type and > its derived identities; > - base identity svec-objective-function-type and its derived @@ -6994,6 +6990,10 @@ Internet-Draft TE Common YANG Types November 2023 > "Indicates that the TE path is a secondary reverse path."; > } > } + > description + > "The type of TE path, indicating whether a path is a primary, + > or a reverse primary, or a secondary, or a reverse secondary + > path."; @@ -7002,10 +7002,6 @@ Busi, et al. Expires 20 May 2024 [Page 125] Internet-Draft TE Common YANG Types November 2023 - > description - > "The type of TE path, indicating whether a path is a primary, - > or a reverse primary, or a secondary, or a reverse secondary - > path."; > } > 606a677,684 @@ -7050,6 +7046,10 @@ Internet-Draft TE Common YANG Types November 2023 < consumption."; --- > consumption."; + 1023c1123 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; @@ -7058,10 +7058,6 @@ Busi, et al. Expires 20 May 2024 [Page 126] Internet-Draft TE Common YANG Types November 2023 - 1023c1123 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; 1025a1126,1128 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision @@ -7106,6 +7102,10 @@ Internet-Draft TE Common YANG Types November 2023 > } > 1628a1758,1761 + > // cCHANGE NOTE: The description and reference of the + > // identity action-exercise have been updated in this module + > // revision + > // RFC Editor: remove the note above and this note @@ -7114,10 +7114,6 @@ Busi, et al. Expires 20 May 2024 [Page 127] Internet-Draft TE Common YANG Types November 2023 - > // cCHANGE NOTE: The description and reference of the - > // identity action-exercise have been updated in this module - > // revision - > // RFC Editor: remove the note above and this note 1632,1633c1765,1767 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any @@ -7162,6 +7158,10 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Path computation has failed because one or more dependent > path computation servers are unavailable. + > + > The dependent path computation server could be + > a Backward-Recursive Path Computation (BRPC) downstream + > PCE or a child PCE."; @@ -7170,10 +7170,6 @@ Busi, et al. Expires 20 May 2024 [Page 128] Internet-Draft TE Common YANG Types November 2023 - > - > The dependent path computation server could be - > a Backward-Recursive Path Computation (BRPC) downstream - > PCE or a child PCE."; > reference > "RFC5441, RFC8685"; > } @@ -7218,6 +7214,10 @@ Internet-Draft TE Common YANG Types November 2023 > "Path computation has failed because there is no > available resource in one or more domains. > + > It corresponds to bit 20 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; @@ -7226,10 +7226,6 @@ Busi, et al. Expires 20 May 2024 [Page 129] Internet-Draft TE Common YANG Types November 2023 - > It corresponds to bit 20 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7274,6 +7270,10 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC8306; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-gco-migration { + > base path-computation-error-reason; @@ -7282,10 +7282,6 @@ Busi, et al. Expires 20 May 2024 [Page 130] Internet-Draft TE Common YANG Types November 2023 - > } - > - > identity path-computation-error-no-gco-migration { - > base path-computation-error-reason; > description > "Path computation has failed because of no Global Concurrent > Optimization (GCO) migration path found. @@ -7330,6 +7326,10 @@ Internet-Draft TE Common YANG Types November 2023 > base path-computation-error-no-dependent-server; > description > "Path computation has failed because PCE BRPC chain + > unavailable. + > + > It corresponds to bit 28 of the Flags field of the + > NO-PATH-VECTOR TLV."; @@ -7338,10 +7338,6 @@ Busi, et al. Expires 20 May 2024 [Page 131] Internet-Draft TE Common YANG Types November 2023 - > unavailable. - > - > It corresponds to bit 28 of the Flags field of the - > NO-PATH-VECTOR TLV."; > reference > "RFC5441; > @@ -7386,6 +7382,10 @@ Internet-Draft TE Common YANG Types November 2023 > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } + > + > // CHANGE NOTE: The base identity protocol-origin-type and + > // its derived identities below have been + > // added in this module revision @@ -7394,10 +7394,6 @@ Busi, et al. Expires 20 May 2024 [Page 132] Internet-Draft TE Common YANG Types November 2023 - > - > // CHANGE NOTE: The base identity protocol-origin-type and - > // its derived identities below have been - > // added in this module revision > // RFC Editor: remove the note above and this note > identity protocol-origin-type { > description @@ -7442,6 +7438,10 @@ Internet-Draft TE Common YANG Types November 2023 > base svec-objective-function-type; > description > "Objective function for minimizing aggregate bandwidth + > consumption (MBC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; @@ -7450,10 +7450,6 @@ Busi, et al. Expires 20 May 2024 [Page 133] Internet-Draft TE Common YANG Types November 2023 - > consumption (MBC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; > } > > identity svec-of-minimize-load-most-loaded-link { @@ -7498,6 +7494,10 @@ Internet-Draft TE Common YANG Types November 2023 > Element (H-PCE) Architecture."; > } > + > identity svec-of-minimize-shared-srlg { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared @@ -7506,10 +7506,6 @@ Busi, et al. Expires 20 May 2024 [Page 134] Internet-Draft TE Common YANG Types November 2023 - > identity svec-of-minimize-shared-srlg { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared > Shared Risk Link Groups (SRLG) (MSS)."; > reference > "RFC8685: Path Computation Element Communication Protocol @@ -7554,6 +7550,10 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Cumulative IGP cost."; > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > @@ -7562,10 +7562,6 @@ Busi, et al. Expires 20 May 2024 [Page 135] Internet-Draft TE Common YANG Types November 2023 - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > > identity svec-metric-cumul-hop { > base svec-metric-type; > description @@ -7610,6 +7606,10 @@ Internet-Draft TE Common YANG Types November 2023 > "(node-id-uri or node-id)" { > description > "At least one node identifier and at least one Link + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; @@ -7618,10 +7618,6 @@ Busi, et al. Expires 20 May 2024 [Page 136] Internet-Draft TE Common YANG Types November 2023 - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; > description > "Link Termination Point (LTP) identifier."; > } @@ -7666,6 +7662,10 @@ Internet-Draft TE Common YANG Types November 2023 > leaf node-id-uri { > type nw:node-id; > description + > "The identifier of a node in the topology."; + > } + 2968a3545,3549 + > leaf network-id { @@ -7674,10 +7674,6 @@ Busi, et al. Expires 20 May 2024 [Page 137] Internet-Draft TE Common YANG Types November 2023 - > "The identifier of a node in the topology."; - > } - 2968a3545,3549 - > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; @@ -7722,6 +7718,10 @@ A.2. Packet TE Types YANG Diffs This section provides the diff between the YANG module in section 3.2 of [RFC8776] and the YANG model revision in Section 5. + The intention of this appendix is to facilitate focusing the review + of the YANG model in Section 5 to the changes compared with the YANG + model in [RFC8776]. + @@ -7730,10 +7730,6 @@ Busi, et al. Expires 20 May 2024 [Page 138] Internet-Draft TE Common YANG Types November 2023 - The intention of this appendix is to facilitate focusing the review - of the YANG model in Section 5 to the changes compared with the YANG - model in [RFC8776]. - This diff has been generated using the following UNIX commands to compare the YANG module revisions in section 3.2 of [RFC8776] and in Section 5: @@ -7778,6 +7774,10 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Added common TE packet identities: > - bandwidth-profile-type. + > + > Added common TE packet groupings: + > - te-packet-path-bandwidth; + > - te-packet-link-bandwidth."; @@ -7786,10 +7786,6 @@ Busi, et al. Expires 20 May 2024 [Page 139] Internet-Draft TE Common YANG Types November 2023 - > - > Added common TE packet groupings: - > - te-packet-path-bandwidth; - > - te-packet-link-bandwidth."; > reference > "RFC XXXX: Updated Common YANG Data Types for Traffic > Engineering"; @@ -7834,6 +7830,10 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC 2698 Bandwidth Profile"; > reference > "RFC2698: A Two Rate Three Color Marker"; + > } + > + > identity rfc-4115-bwp { + > base bandwidth-profile-type; @@ -7842,10 +7842,6 @@ Busi, et al. Expires 20 May 2024 [Page 140] Internet-Draft TE Common YANG Types November 2023 - > } - > - > identity rfc-4115-bwp { - > base bandwidth-profile-type; > description > "RFC 4115 Bandwidth Profile"; > reference @@ -7890,6 +7886,10 @@ Internet-Draft TE Common YANG Types November 2023 > type uint64; > units "bits/second"; > mandatory true; + > description + > "Committed Burst Size (CBS)."; + > } + > leaf eir { @@ -7898,10 +7898,6 @@ Busi, et al. Expires 20 May 2024 [Page 141] Internet-Draft TE Common YANG Types November 2023 - > description - > "Committed Burst Size (CBS)."; - > } - > leaf eir { > type uint64; > units "bits/second"; > description @@ -7947,6 +7943,10 @@ Appendix B. Option Considered for updating RFC8776 published in [RFC8776] without delaying too much the progress of the mature WG documents. + Three possible options have been identified to address this concern. + + + Busi, et al. Expires 20 May 2024 [Page 142] @@ -7954,8 +7954,6 @@ Busi, et al. Expires 20 May 2024 [Page 142] Internet-Draft TE Common YANG Types November 2023 - Three possible options have been identified to address this concern. - One option is to keep these definitions in the YANG modules where they have initially been defined: other YANG modules can still import them. The drawback of this approach is that it defeating the value @@ -8005,6 +8003,8 @@ Internet-Draft TE Common YANG Types November 2023 + + Busi, et al. Expires 20 May 2024 [Page 143] Internet-Draft TE Common YANG Types November 2023 diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml index 9a94658..60beaba 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml @@ -410,15 +410,15 @@ exx path-metric-type:
    • - A base YANG identity for supported path metric types as defined in and . + A base YANG identity for supported path metric types as defined in , , , and .
    • - Since the unit of path metric bound is interpreted in the context of the metric-type, derived identities SHOULD describe the unit and maximum value of the path metric. + Since the unit of the path metric value is interpreted in the context of the path metric type, derived identities SHOULD describe the unit and maximum value of the path metric types they define.
    • - For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in for OSPF, and for IS-IS. + For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in and .
    explicit-route-hop: @@ -558,18 +558,6 @@ exx A base YANG identity for various bandwidth profiles specified in , , and that may be used to limit bandwidth utilization of packet flows (e.g., MPLS-TE LSPs).
-path-metric-loss: - -
  • - A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path loss metric type, defined in . -
- -path-metric-delay-variation: - -
  • - A YANG identity, derived from the 'path-metric-type' base identity, defined in 'ietf-te-types', that represents the path delay variation metric type, defined in . -
- te-packet-path-bandwidth
  • @@ -2715,7 +2703,7 @@ module ietf-te-types { "Base identity for the path metric type. Derived identities SHOULD describe the unit and maximum value - of the path metric."; + of the path metric types they define."; } identity path-metric-te { @@ -5601,6 +5589,20 @@ Names" registry : + + + Path Computation Element (PCE) Communication Protocol (PCEP) + + + + + This document specifies the Path Computation Element (PCE) Communication Protocol (PCEP) for communications between a Path Computation Client (PCC) and a PCE, or between two PCEs. Such interactions include path computation requests and path computation replies as well as notifications of specific states related to the use of a PCE in the context of Multiprotocol Label Switching (MPLS) and Generalized MPLS (GMPLS) Traffic Engineering. PCEP is designed to be flexible and extensible so as to easily allow for the addition of further messages and objects, should further requirements be expressed in the future. [STANDARDS-TRACK] + + + + + + Path Computation Element Communication Protocol (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture @@ -5619,20 +5621,6 @@ Names" registry : - - - Path Computation Element (PCE) Communication Protocol (PCEP) - - - - - This document specifies the Path Computation Element (PCE) Communication Protocol (PCEP) for communications between a Path Computation Client (PCC) and a PCE, or between two PCEs. Such interactions include path computation requests and path computation replies as well as notifications of specific states related to the use of a PCE in the context of Multiprotocol Label Switching (MPLS) and Generalized MPLS (GMPLS) Traffic Engineering. PCEP is designed to be flexible and extensible so as to easily allow for the addition of further messages and objects, should further requirements be expressed in the future. [STANDARDS-TRACK] - - - - - - A Backward-Recursive PCE-Based Computation (BRPC) Procedure to Compute Shortest Constrained Inter-Domain Traffic Engineering Label Switched Paths @@ -6521,6 +6509,24 @@ Names" registry : + + + Extensions to the Path Computation Element Communication Protocol (PCEP) to Compute Service-Aware Label Switched Paths (LSPs) + + + + + + + + In certain networks, such as, but not limited to, financial information networks (e.g., stock market data providers), network performance criteria (e.g., latency) are becoming as critical to data path selection as other metrics and constraints. These metrics are associated with the Service Level Agreement (SLA) between customers and service providers. The link bandwidth utilization (the total bandwidth of a link in actual use for the forwarding) is another important factor to consider during path computation. + IGP Traffic Engineering (TE) Metric Extensions describe mechanisms with which network performance information is distributed via OSPF and IS-IS, respectively. The Path Computation Element Communication Protocol (PCEP) provides mechanisms for Path Computation Elements (PCEs) to perform path computations in response to Path Computation Client (PCC) requests. This document describes the extension to PCEP to carry latency, delay variation, packet loss, and link bandwidth utilization as constraints for end-to-end path computation. + + + + + + Signalling Unnumbered Links in Resource ReSerVation Protocol - Traffic Engineering (RSVP-TE) @@ -6617,24 +6623,6 @@ Names" registry : - - - Extensions to the Path Computation Element Communication Protocol (PCEP) to Compute Service-Aware Label Switched Paths (LSPs) - - - - - - - - In certain networks, such as, but not limited to, financial information networks (e.g., stock market data providers), network performance criteria (e.g., latency) are becoming as critical to data path selection as other metrics and constraints. These metrics are associated with the Service Level Agreement (SLA) between customers and service providers. The link bandwidth utilization (the total bandwidth of a link in actual use for the forwarding) is another important factor to consider during path computation. - IGP Traffic Engineering (TE) Metric Extensions describe mechanisms with which network performance information is distributed via OSPF and IS-IS, respectively. The Path Computation Element Communication Protocol (PCEP) provides mechanisms for Path Computation Elements (PCEs) to perform path computations in response to Path Computation Client (PCC) requests. This document describes the extension to PCEP to carry latency, delay variation, packet loss, and link bandwidth utilization as constraints for end-to-end path computation. - - - - - - @@ -7952,676 +7940,675 @@ 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 -vZL2FS7Ih0nhp5f+K7PE/3EwVq3ppG/Ptfl8pdVK0wt/xCgueqFyZbyJpCl5 -HEGXIiUx6lrukZ4/xtnDC+hjloWqbqKAAIiDWTX7+dXbk9VpIQC//rUMUR2N -70RNh0Ewllm4C/JUEXSuY+Bp6NPIvosObzyUiyT2QwGHKKJjEt7wibpSvvzx -JCEY+aNw7POfi9jfP+wfA8voIpKHPBAFY2BGH9uooLAPYSLWrbOA2EJD7W7s -AH14T3ZkEVICr0yVNW6TzPgQmX5loroCuK9iH3Uq7B3Uu2OJatGjUY1s0FE4 -xOpYTD7c8I5O9GanWoc/D/pRRIluFLYIAlKEidF7rCUhHkDQLEneI+OnhsYH -Al28BdA5u/q0pnJ3vRWc3iowgto86q5+0zH6EBZB0cbbsKyIBpM4yESqQmJY -GQp/depGVyCysEKPi/kKhwt69ITDRTtpbMcLl+uXL1PtVbm9WoVRahe5N4Xb -36UA9wjjhSbkSdS73zsxao1ZziGPfpGFfDfovIqckfAi7NFDoKU7RwF9Wih9 -b0tcuJfnWb3Ksy/h1LSdjgTHwajREHCEQeqmVcUIG/ssglHheI1gQQGdR6PQ -Ow6DfJJxC8CV03PQSDpwnthZX8hOI+MOkrEeutzF7ZrKFZnEIkfGFb0ZHN4+ -LoiCJo1L+Gpzg9oBJ4n4o0xmB2INZP5ogCFs2lRk/+qJ/rVUoT5RvswDvQdd -DgmQFI45aPRVsiDbESnnbeke1BEb26+KdXo+0Nzv3YcsH5KQgGBi2Eqv31v9 -tVFoHE/y+5OIoDCNfvtro1GYXKPVfC/p2qcqGHjT6dwgPNnIkJLMudQ1fBQH -WnsYdVv0uwPThJdBxrK4j129sTzLclfM2Xc6gY4BqOVQqpKLRdHyU03U1I/q -ZFkJdE0ZpRIiGbyyTa0iaI5J12IO5vtPkVGto8rO7l5XWI37Z2cfDo72sfew -PNrUNHVpWgy+/aA9xEjoXdCiiKsVAVwvTkh9TIwziP2gN5zQP6PgU+hz3qp/ -kYXBtGKksDyb8gxxxre/j0LFYTqB6fhogg79i2gYZQulowneI/CsAYKYeFsf -/au8j1XoFf/D78zy8ohoFNSG02M4xtSTpIjvzLZpgIiIEJGpr1MPctv1h2k5 -PwD8ypyIPsm1zNSqXwy8E3/AxTDBL2YxZHV62EHVy0I1RXlpKXCXxaHXVR6y -zPOmsBrH+8O7JBiJGnsDkCGj7ks6y7K2FRlLzh6HF1wJMC0aQBuZxwLKo6S/ -NCC0AD6lSnAaYs1ueHuN9bwlAKrmbbSq59dDtke4awlySjOD7O11gT/IK3eg -G1Z7hzGfwrFdwiQR5Sz09YiEsHJygJ5mxSHs76n1+L1WE5QADlQemY7Mmcok -BjHd3Z3Fi3VtrcsVP+TzD8c8dZjMZL9xDlol7azJW+Hs+Wzxa3MjbOfRoYoB -dZ/icXD/FxmCU11p29tbPTuOSsN+I5PqpHMY2UipmBlYlVl0Onmoj/ajkIf9 -rYHaGETtEjW5NlX6nwTpgs9Mugy9eJMgrjbgWjANeUCcsBxSJw49UYI1bnKt -GsCrTc6stwFEFY3lH1JrtUFvhqWWxcwE6vcSokC0GAk1B8i3DeQeiikeiSdI -J2FDZvoNo5NETbGvzw9O1L4SL5gKVbnz8agkYdBFWJap4vzX0RX2rKaXnjmL -qF0dL3yeBmtYKH1FlkA8uN4TbetmA+SntUfYyZcDDQtrJlynw9nMROFR1JUa -NGqqGH5ddhohQCnO8Z1ApORDrUGxVbxPoMtGiHoUItJbdNwyPX2yAI9C4kJe -VGPO/LvDaWknmxvo8vtwg93Owlvi3JMsSgbYcy9XnS+SsGgqXaIL0293thoo -huU/soSI9s8JvHlvmh1Mo5OiT3pR0GNmQVLEgXQd9ZZi1Dx21ek2iIEHjOhh -7DQcEdWrR6IzL6LNzqZExzdydTORpa+m7IkpaxdKVICpdsdxB1ShL9AuA1UE -QDdJy70V0cnMyH7i0rEl7OlIHA1Nnl6VtfsCqgZA1VoVlCwsJlmimacMDrEU -gRSqwB4xmIJgSo/YXYYh9s97DPazfDJbO9u7DQd1VCurts5Rryvd81a0TD3l -OeOLTWngoWp+7svFfyS2VqhrFES4CspWwKpEhSNhSxBucAZ0Xk8z7numYFyn -U2sdzVxFwVqahSx2fYYAl7uZ88IHcRaVdwQBB9ozWlvwRI+ahTGXMirHkBhY -NcY5haXhw6GJGxFYLj/29hUoGCJ8iR1P4avS+nPVV4WeUBhHb+V0DRHmvH0x -4jI2YYxi9J9Ou5Z4VIkzaBqgBTQpnhzNwZSSmBH1nyr9ogQUeVSJyJmHgC3I -psml0MdqE5p0Woe99LIANxlKtqWG7ug9xz6kEmMFQl0qI0e38KU9LrExKo8U -4axaCWfFNJTaSN55kD4ib7a4V6/RTXro8cbYWmAbqab1PdQheCJg+mTjZNXE -5HGKCZlzGd1jMhvHJzMg/1SzJGtoxFQI5vKa17NboH3nWm5bcJ+FDdbnKSal -havg27x4JXwoYSwMMqxfc5sYMRuwb8kiOGbG9Up0iQVtVrl7TYF15gtaUYxt -ldnHWPIYDBNdJGvatEQga7jomWnI3N5gHAcDVlClQA/xLmC8kq+2QpobUlQc -+AtAmiELjNViiIJlEzooGREqSu1XS7yacq85CDuG3IujAWuBLkObiZ8VJtSc -RXcBk0rIwrOZdAKJW9npJc8vJ/HUcbE3x/0HtVq+NDNKhKG2nDd272EjcgdJ -eFOGV73hwjlseYM1q/3fag15x9A16qqEXNPspQS4EKG+OOP22JCSe2B8cIxS -ac4m76oDg2BCTo84vRVvP1rRzTpkFkGyMsEIML3fIYo4Gw1KGFEiCIyd0rjf -DbXREh4dgLRs4TUZL2O8jJXuLBiagh2Eh2YQR7gbxJiRLFp4lSHhcqq+FASS -jWk0uutANTPk/WWyjRA2id9sjN5a0pplbM5Bq+JUqmcwNzG5XEEDJakErfY6 -lQMf7eEbJnVGc6m4x1tp8xIOosTwp4Ui0moLdSJit01bCDKNW6sGDpYw1SAq -MfiMo6tWW3h1VMve1qiT8T3JzzZ8a5qbA9+f3Dx4Sxrfm7YtKIqHD6pGUtYa -864k7A1JO6WxgCEbxiFZiZKbII6GLCzznSlZV4lCpBqadaKcFYVhltpL24hs -AyE+jlGPmWiJADm7heyamQwANkkQGRGg9PIaVUXFUqnjYPApLGRPHGp1aryM -NAfkx49RqHijsz3r0gIzV7hqXto2rroY6CsSAYUl0/ls87tKRClWCWiaZ26K -OV1GS/R39BMMfVPvl0IWpprV8xrWDfSyEPtFkknpoTJpX8onnP1slt6nXBX2 -8pJzqrApvervSRXNaDQtNdOWU6KHIlnWkTW4uZtk3c2EWGu04vheaEl0yNEu -Cr0THoApZrcjfCMjSB2GjbjJiyz9FNZpfxOXfHAdjuaxUcuSwYDymeTBgYiu -rfg15aERMVseaog5RSSMZFsZU6CiO3iREVvJitztFp7VwQme/o2KG1SWIqCW -TRh28ClBrW/2jV5+M2EW8k5hYjytzvKSwrmisBeUQXyvFOJWfDzGLDiVbWIK -YfM61aT7l9fIBj/OsJyRuE4Va/WMcrDryOeIdFoc8QTwXyXpuCTXA5FOAX/m -pBOtc+YsUmFbZqUsZJdh9qTSYFtRpLaKRpVwDUy0bFTRWHYR68nTZ6olbRBD -tK/gWhvi5a8Q+duEVcu1bB/4u7yCu/iqaHQC5HQvs3xe/ntuxWtUydM3vdLL -TYbQsgZz9uOHj+9ey0rW8m3RR+TXyGlPjccWz12Krai8LZaNtOrPfGO2Bat9 -rvVS9fnNoPJ7/feesbVTWeIWi/a8Kda7B8VK1AAC9kwCYiLy8rMlzyTBjPSa -CjkzMtZve97HxCoUoMn062Kqi4US7dV/BM0aKpzNRDK7wNkcFHq6xxy+MW59 -zkkvzanzPbCoRyMrJI0n2TjNa69XEqzfWXVDllFqWI33DIGDINyD8JmUbv6w -mrOB8j3GpQwWY90xkoKY27AiAjE0nX8xk2oYWQ42kfyCdKT8xoxPzRQOcB1w -KCGQE4ticUQbcox6e5CORsH0kPinxG3p4FPKJbUXswj73rs0J/oZ01p5l56s -SuqQe5HyAZ8RnXjNRXzk/ehTYZ9nTRhDku8pu3xzUiOgRikmFEEsZiqLZKhp -iSwDg4+N6NFnRMtheJUFw8aT2ezklECnUFTNi+ukPHeKglhhSY1FiC2D+rWI -7W0QUX6BuCC8H2l+Pj/1imgEJMH7pEmC3cifES2GqZ+kBZACUKmWxZ6JEq9T -bKAL6BOoldfvsUOhkjjFKN5FOAgm1HdBzSghnwy+xw9wz4tnREZxoyBNCQJw -D2KWrHgRmyoVvyYgdQ4WwwkUDHtMkP4ZkdE+HlGmtS80zSwNdfV9h+Xzi0X+ -uEjhloDVTCj2l/L1Miq8mF+nqXVqaJEOIXMSsjAsJb80za1RrjAjB1YguysV -fpUZBJgDH8hADNjaqDVEWjHM2bwfo5hhhwqMAjH0ucyCQNKJqLvgU6jPBgBg -zeMAx+s1j6fH+Swyp8g88jwHXhvEYZAtcqESK+eHwDOFhN4TQz03OgmONg5L -jlPy12durC2Lpf91xzSBpvSwCCUaxHF6a9eJEBlYTefnZ7RezNcPs1zTWFyM -Ws7FS6pOkedAySrn17gJniL3NzmDjERziUEU37F43IAZgTWaKVZCvRgoMeIj -lXp/RRyjxBID9S1/5LQGaE9wueu9HXMvc3WfrVtZc0X5Lb1S1N/I9PXyUqy5 -lJ38ig+xWhAxgk0cikUsTAOfrHmTJMYsx0ABcJwAQdbDf0547ctuQ86HCSk0 -8/lxQv0B+llygvX+fJygzUE4bmDasT7fhZ+jHMxK9K2wX8UGgd3PsIvhfwYn -ra97g8aiw4iIwl5GJIs3y2wYfg6zQZSHXAnLKjtcCpgQABZZs7qEwuKNCDAK -Mqw3AKtCYRPXIbFPmtF2tD8pUuyoNtCRu8ZyGouwf3LGTnZdMA9vMrhNnoqL -pi0z45IpHc87ktcdaBKWbzvggKReYpYWnc2yFlcdR+cf/XPvbWevu9fpeTdb -na630t1e3+j2tlb7qkyKeVulpuIrXN9FCRhYKElRTGuUTy4SbmZlvNpgBT6K -zYc4+iG2ONHGnxZzPepa1fm/VnUsrpFDjSitM1eA5IoDn981k1pa3f4UtWF7 -dwbggl0cs8sAO2WoQU1o07KGtnbLTZ5bTUjRQ5VWV2UsYdVea9SnzXycD+yw -ADdRGvjwhJLIfEbRO8CX4tDvwdKeHfi9aXbmVydAeDOO70eAQ9RBWALupygr -JhQYEd1QYf8IOzAd/nTybmq74W53q6HXt4yHQIY7Doss9eSYigxv0mwyIhFC -3dbrqSe8M6xdB/ypSDiNIvFGPrgfRajruL/h2TzhrbzbODt48gxRDEf3mz32 -O/RfR7zVi1pJcfhZk+H89fGTp0JaJPejwofz9z5MlJVhPLXXaG9zr+8sQWUn -Un44O3nDewBOV832IMU+0TEFDN2k8Q2++Laz233hfQCssKzsubJ6m7tO6nkO -B/cVg9dBEXgHYLIk1lIpPnh9MF0cQDNsNGgGcwi99jVDkXpQ+IBqYCaa1lzJ -0Az3Vwyji2HgV/TCM1ALl/ed+5voApRieepvnuzU8WYsFAWzfc5Hmckyku9a -afNPeY4iG758O2jTYKohRIF+8p1nMOtQ2glzz1tZGs9s5uNhNfii9aT3358d -rR+enx15J69/fG4zz+8z8zOYrzxF73Z3vXXv7MP7w3MPKeKd9zq97vZzo8cw -uooKOHXfZlgJI5ufNq8ZkPezAPTM6BDT9jz/9Hl791bG14BzEg1WnxsBLnGP -nn/+tMU/yzn7A2EW3m/u0rh8ZiRIh5NqmanWMxcHjdcfP4GdLRQAFr+difu3 -Njf2FkSGUlPHaeeg8iGqDb0Y2P2ZxsZtDu55VmSLo6Qa09heuZI3Kexcdda8 -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 +7gxiAXYygx2q+JJ6swmrgPc/nZmjGTosAwA= --> diff --git a/ietf-te-types.yang b/ietf-te-types.yang index 5181dfd..2614b2e 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -2088,7 +2088,7 @@ module ietf-te-types { "Base identity for the path metric type. Derived identities SHOULD describe the unit and maximum value - of the path metric."; + of the path metric types they define."; } identity path-metric-te { From c0c66369eedb66b4a66bb27627f37a8aa5576953 Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 24 Nov 2023 20:01:45 +0100 Subject: [PATCH 06/10] Addressing some PR review comments from Tarek --- .../diffs/te-types/model-diff-spaces.txt\r" | 700 +++++++ .../diffs/te-types/model-diff.txt\r" | 785 +++++++ .../diffs/te-types/model-updates.txt\r" | 700 +++++++ .../draft-ietf-teas-rfc8776-update.md | 8 +- .../draft-ietf-teas-rfc8776-update.txt | 1832 ++++++++--------- .../draft-ietf-teas-rfc8776-update.xml | 1362 ++++++------ ietf-te-types.yang | 4 +- 7 files changed, 3791 insertions(+), 1600 deletions(-) create mode 100644 "drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" create mode 100644 "drafts/te-types-update/diffs/te-types/model-diff.txt\r" create mode 100644 "drafts/te-types-update/diffs/te-types/model-updates.txt\r" diff --git "a/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" "b/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" new file mode 100644 index 0000000..df17eab --- /dev/null +++ "b/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" @@ -0,0 +1,700 @@ + 21a22,31 + > import ietf-network { + > prefix "nw"; + > reference "RFC 8345: A YANG Data Model for Network Topologies"; + > } + > + > import ietf-network-topology { + > prefix "nt"; + > reference "RFC 8345: A YANG Data Model for Network Topologies"; + > } + > + 30c40 + < + --- + > + 55c65 + < Copyright (c) 2020 IETF Trust and the persons identified as + --- + > Copyright (c) 2023 IETF Trust and the persons identified as + 60c70 + < the license terms contained in, the Simplified BSD License set + --- + > the license terms contained in, the Revised BSD License set + 65,66c75,108 + < This version of this YANG module is part of RFC 8776; see the + < RFC itself for full legal notices."; + --- + > 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."; + > + > revision 2023-06-27 { + > description + > "Added: + > - base identity lsp-provisioning-error-reason; + > - identity association-type-diversity; + > - identity tunnel-admin-state-auto; + > - identity lsp-restoration-restore-none; + > - base identity path-computation-error-reason and + > its derived identities; + > - base identity protocol-origin-type and + > its derived identities; + > - base identity svec-objective-function-type and its derived + > identities; + > - base identity svec-metric-type and its derived identities; + > - grouping encoding-and-switching-type. + > + > Updated: + > - description of the base identity objective-function-type; + > - description and reference of identity action-exercise. + > + > Obsoleted: + > - identity of-minimize-agg-bandwidth-consumption + > - identity of-minimize-load-most-loaded-link + > - identity of-minimize-cost-path-set"; + > reference + > "RFC XXXX: Updated Common YANG Data Types for Traffic + > Engineering"; + > } + > // RFC Editor: replace XXXX with actual RFC number, update date + > // information and remove this note + 545a588,615 + > // CHANGE NOTE: The typedef path-type below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > typedef path-type { + > type enumeration { + > enum primary-path { + > description + > "Indicates that the TE path is a primary path."; + > } + > enum secondary-path { + > description + > "Indicates that the TE path is a secondary path."; + > } + > enum primary-reverse-path { + > description + > "Indicates that the TE path is a primary reverse path."; + > } + > enum secondary-reverse-path { + > description + > "Indicates that the TE path is a secondary reverse path."; + > } + > } + > description + > "The type of TE path, indicating whether a path is a primary, + > or a reverse primary, or a secondary, or a reverse secondary + > path."; + > } + > + 606a677,684 + > // CHANGE NOTE: The base identity lsp-provisioning-error-reason + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity lsp-provisioning-error-reason { + > description + > "Base identity for LSP provisioning errors."; + > } + > + 982a1061,1078 + > // CHANGE NOTE: The identity association-type-diversity below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity association-type-diversity { + > base association-type; + > description + > "Association Type diversity used to associate LSPs whose + > paths are to be diverse from each other."; + > reference + > "RFC8800: Path Computation Element Communication Protocol + > (PCEP) Extension for Label Switched Path (LSP) Diversity + > Constraint Signaling"; + > } + > + > // CHANGE NOTE: The description of the base identity + > // objective-function-type has been updated + > // in this module revision + > // RFC Editor: remove the note above and this note + 985c1081 + < "Base objective function type."; + --- + > "Base identity for path objective function type."; + 1015a1112,1114 + > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1017a1117 + > status obsolete; + 1020c1120 + < consumption."; + --- + > consumption."; + 1023c1123 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; + 1025a1126,1128 + > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1027a1131 + > status obsolete; + 1030c1134 + < is carrying the highest load."; + --- + > is carrying the highest load."; + 1033c1137 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; + 1035a1140,1142 + > // CHANGE NOTE: The identity of-minimize-cost-path-set + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1037a1145 + > status obsolete; + 1216a1325,1336 + > // CHANGE NOTE: The identity tunnel-admin-state-auto below + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity tunnel-admin-state-auto { + > base tunnel-admin-state-type; + > description + > "Tunnel administrative auto state. The administrative status + > in state datastore transitions to 'tunnel-admin-up' when the + > tunnel used by the client layer, and to 'tunnel-admin-down' + > when it is not used by the client layer."; + > } + > + 1321a1442,1450 + > // CHANGE NOTE: The identity lsp-restoration-restore-none + > // below has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity lsp-restoration-restore-none { + > base lsp-restoration-type; + > description + > "No LSP affected by a failure is restored."; + > } + > + 1628a1758,1761 + > // cCHANGE NOTE: The description and reference of the + > // identity action-exercise have been updated in this module + > // revision + > // RFC Editor: remove the note above and this note + 1632,1633c1765,1767 + < "An action that starts testing whether or not APS communication + < is operating correctly. It is of lower priority than any + --- + > "An action that starts testing whether or not Automatic + > Protection Switching (APS) communication is operating + > correctly. It is of lower priority than any + 1636,1637c1770,1771 + < "RFC 4427: Recovery (Protection and Restoration) Terminology + < for Generalized Multi-Protocol Label Switching (GMPLS)"; + --- + > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - + > Linear trail and subnetwork protection"; + 2110a2245,2641 + > // CHANGE NOTE: The base identity path-computation-error-reason + > // and its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-computation-error-reason { + > description + > "Base identity for path computation error reasons."; + > } + > + > identity path-computation-error-path-not-found { + > base path-computation-error-reason; + > description + > "Path computation has failed because of an unspecified + > reason."; + > reference + > "Section 7.5 of RFC5440"; + > } + > + > identity path-computation-error-no-topology { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no topology + > with the provided topology-identifier."; + > } + > + > identity path-computation-error-no-dependent-server { + > base path-computation-error-reason; + > description + > "Path computation has failed because one or more dependent + > path computation servers are unavailable. + > + > The dependent path computation server could be + > a Backward-Recursive Path Computation (BRPC) downstream + > PCE or a child PCE."; + > reference + > "RFC5441, RFC8685"; + > } + > + > identity path-computation-error-pce-unavailable { + > base path-computation-error-reason; + > description + > "Path computation has failed because PCE is not available. + > + > It corresponds to bit 31 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-inclusion-hop { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no + > node or link provided by one or more inclusion hops."; + > } + > + > identity path-computation-error-destination-unknown-in-domain { + > base path-computation-error-reason; + > description + > "Path computation has failed because the destination node is + > unknown in indicated destination domain. + > + > It corresponds to bit 19 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-resource { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no + > available resource in one or more domains. + > + > It corresponds to bit 20 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-child-pce-unresponsive { + > base path-computation-error-no-dependent-server; + > description + > "Path computation has failed because child PCE is not + > responsive. + > + > It corresponds to bit 21 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-destination-domain-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because the destination domain + > was unknown. + > + > It corresponds to bit 22 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-p2mp { + > base path-computation-error-reason; + > description + > "Path computation has failed because of P2MP reachability + > problem. + > + > It corresponds to bit 24 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8306; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-gco-migration { + > base path-computation-error-reason; + > description + > "Path computation has failed because of no Global Concurrent + > Optimization (GCO) migration path found. + > + > It corresponds to bit 26 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5557; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-gco-solution { + > base path-computation-error-reason; + > description + > "Path computation has failed because of no GCO solution + > found. + > + > It corresponds to bit 25 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5557; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-pks-expansion { + > base path-computation-error-reason; + > description + > "Path computation has failed because of Path-Key Subobject + > (PKS) expansion failure. + > + > It corresponds to bit 27 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5520; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-brpc-chain-unavailable { + > base path-computation-error-no-dependent-server; + > description + > "Path computation has failed because PCE BRPC chain + > unavailable. + > + > It corresponds to bit 28 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5441; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-source-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because source node is + > unknown. + > + > It corresponds to bit 29 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-destination-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because destination node is + > unknown. + > + > It corresponds to bit 30 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-server { + > base path-computation-error-reason; + > description + > "Path computation has failed because path computation + > server is unavailable."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > // CHANGE NOTE: The base identity protocol-origin-type and + > // its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity protocol-origin-type { + > description + > "Base identity for protocol origin type."; + > } + > + > identity protocol-origin-api { + > base protocol-origin-type; + > description + > "Protocol origin is via Application Programmable Interface + > (API)."; + > } + > + > identity protocol-origin-pcep { + > base protocol-origin-type; + > description + > "Protocol origin is Path Computation Engine Protocol + > (PCEP)."; + > reference "RFC5440"; + > } + > + > identity protocol-origin-bgp { + > base protocol-origin-type; + > description + > "Protocol origin is Border Gateway Protocol (BGP)."; + > reference "RFC9012"; + > } + > + > // CHANGE NOTE: The base identity svec-objective-function-type + > // and its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity svec-objective-function-type { + > description + > "Base identity for SVEC objective function type."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-agg-bandwidth-consumption { + > base svec-objective-function-type; + > description + > "Objective function for minimizing aggregate bandwidth + > consumption (MBC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-load-most-loaded-link { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the load on the link that + > is carrying the highest load (MLL)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-cost-path-set { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the cost on a path set + > (MCC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-common-transit-domain { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of common + > transit domains (MCTD)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-link { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > links (MSL)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-srlg { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > Shared Risk Link Groups (SRLG) (MSS)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-nodes { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > nodes (MSN)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > // CHANGE NOTE: The base identity svec-metric-type and + > // its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity svec-metric-type { + > description + > "Base identity for SVEC metric type."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-te { + > base svec-metric-type; + > description + > "Cumulative TE cost."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-igp { + > base svec-metric-type; + > description + > "Cumulative IGP cost."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-hop { + > base svec-metric-type; + > description + > "Cumulative Hop path metric."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-aggregate-bandwidth-consumption { + > base svec-metric-type; + > description + > "Aggregate bandwidth consumption."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-load-of-the-most-loaded-link { + > base svec-metric-type; + > description + > "Load of the most loaded link."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + 2514a3046,3054 + > must "node-id-uri or node-id" { + > description + > "At least one node identifier MUST be present."; + > } + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2517d3056 + < mandatory true; + 2566a3106,3116 + > must "(link-tp-id-uri or link-tp-id) and " + + > "(node-id-uri or node-id)" { + > description + > "At least one node identifier and at least one Link + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; + > description + > "Link Termination Point (LTP) identifier."; + > } + 2569d3118 + < mandatory true; + 2574a3124,3128 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2577d3130 + < mandatory true; + 2646a3200,3203 + > must "node-id-uri or node-id" { + > description + > "At least one node identifier MUST be present."; + > } + 2648a3206,3210 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2651d3212 + < mandatory true; + 2696a3258,3268 + > must "(link-tp-id-uri or link-tp-id) and " + + > "(node-id-uri or node-id)" { + > description + > "At least one node identifier and at least one Link + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; + > description + > "Link Termination Point (LTP) identifier."; + > } + 2699d3270 + < mandatory true; + 2704a3276,3280 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2968a3545,3549 + > leaf network-id { + > type nw:network-id; + > description + > "The network topology identifier."; + > } + 3379c3960,3987 + < } + \ No newline at end of file + --- + > + > // NOTE: The grouping encoding-and-switching-type below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > grouping encoding-and-switching-type { + > description + > "Common grouping to define the LSP encoding and + > switching types"; + > leaf encoding { + > type identityref { + > base te-types:lsp-encoding-types; + > } + > description + > "LSP encoding type."; + > reference + > "RFC3945"; + > } + > leaf switching-type { + > type identityref { + > base te-types:switching-capabilities; + > } + > description + > "LSP switching type."; + > reference + > "RFC3945"; + > } + > } + > } diff --git "a/drafts/te-types-update/diffs/te-types/model-diff.txt\r" "b/drafts/te-types-update/diffs/te-types/model-diff.txt\r" new file mode 100644 index 0000000..d7b5a77 --- /dev/null +++ "b/drafts/te-types-update/diffs/te-types/model-diff.txt\r" @@ -0,0 +1,785 @@ +21a22,31 +> import ietf-network { +> prefix "nw"; +> reference "RFC 8345: A YANG Data Model for Network Topologies"; +> } +> +> import ietf-network-topology { +> prefix "nt"; +> reference "RFC 8345: A YANG Data Model for Network Topologies"; +> } +> +30c40 +< +--- +> +55c65 +< Copyright (c) 2020 IETF Trust and the persons identified as +--- +> Copyright (c) 2023 IETF Trust and the persons identified as +60c70 +< the license terms contained in, the Simplified BSD License set +--- +> the license terms contained in, the Revised BSD License set +65,66c75,109 +< This version of this YANG module is part of RFC 8776; see the +< RFC itself for full legal notices."; +--- +> 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."; +> revision 2023-11-24 { +> description +> "Added: +> - base identity lsp-provisioning-error-reason; +> - identity association-type-diversity; +> - identity tunnel-admin-state-auto; +> - identity lsp-restoration-restore-none; +> - identity restoration-scheme-rerouting; +> - base identity path-computation-error-reason and +> its derived identities; +> - base identity protocol-origin-type and +> its derived identities; +> - base identity svec-objective-function-type and its derived +> identities; +> - base identity svec-metric-type and its derived identities; +> - grouping encoding-and-switching-type. +> +> Updated: +> - description of the base identity objective-function-type; +> - description and reference of identity action-exercise. +> +> Obsoleted: +> - identity of-minimize-agg-bandwidth-consumption; +> - identity of-minimize-load-most-loaded-link; +> - identity of-minimize-cost-path-set; +> - identity lsp-protection-reroute-extra; +> - identity lsp-protection-reroute."; +> reference +> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; +> } +> // RFC Editor: replace XXXX with actual RFC number, update date +> // information and remove this note +545a589,616 +> // CHANGE NOTE: The typedef path-type below has been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> typedef path-type { +> type enumeration { +> enum primary-path { +> description +> "Indicates that the TE path is a primary path."; +> } +> enum secondary-path { +> description +> "Indicates that the TE path is a secondary path."; +> } +> enum primary-reverse-path { +> description +> "Indicates that the TE path is a primary reverse path."; +> } +> enum secondary-reverse-path { +> description +> "Indicates that the TE path is a secondary reverse path."; +> } +> } +> description +> "The type of TE path, indicating whether a path is a primary, +> or a reverse primary, or a secondary, or a reverse secondary +> path."; +> } +> +606a678,685 +> // CHANGE NOTE: The base identity lsp-provisioning-error-reason +> // has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity lsp-provisioning-error-reason { +> description +> "Base identity for LSP provisioning errors."; +> } +> +982a1062,1079 +> // CHANGE NOTE: The identity association-type-diversity below has +> // been added in this module revision +> // RFC Editor: remove the note above and this note +> identity association-type-diversity { +> base association-type; +> description +> "Association Type diversity used to associate LSPs whose +> paths are to be diverse from each other."; +> reference +> "RFC8800: Path Computation Element Communication Protocol +> (PCEP) Extension for Label Switched Path (LSP) Diversity +> Constraint Signaling"; +> } +> +> // CHANGE NOTE: The description of the base identity +> // objective-function-type has been updated +> // in this module revision +> // RFC Editor: remove the note above and this note +985c1082 +< "Base objective function type."; +--- +> "Base identity for path objective function type."; +1015a1113,1115 +> // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1017a1118 +> status obsolete; +1020c1121 +< consumption."; +--- +> consumption."; +1023c1124 +< Computation Element Communication Protocol (PCEP)"; +--- +> Computation Element Communication Protocol (PCEP)"; +1025a1127,1129 +> // CHANGE NOTE: The identity of-minimize-load-most-loaded-link +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1027a1132 +> status obsolete; +1030c1135 +< is carrying the highest load."; +--- +> is carrying the highest load."; +1033c1138 +< Computation Element Communication Protocol (PCEP)"; +--- +> Computation Element Communication Protocol (PCEP)"; +1035a1141,1143 +> // CHANGE NOTE: The identity of-minimize-cost-path-set +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1037a1146 +> status obsolete; +1216a1326,1337 +> // CHANGE NOTE: The identity tunnel-admin-state-auto below +> // has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity tunnel-admin-state-auto { +> base tunnel-admin-state-type; +> description +> "Tunnel administrative auto state. The administrative status +> in state datastore transitions to 'tunnel-admin-up' when the +> tunnel used by the client layer, and to 'tunnel-admin-down' +> when it is not used by the client layer."; +> } +> +1321a1443,1451 +> // CHANGE NOTE: The identity lsp-restoration-restore-none +> // below has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity lsp-restoration-restore-none { +> base lsp-restoration-type; +> description +> "No LSP affected by a failure is restored."; +> } +> +1339a1470,1484 +> // CHANGE NOTE: The identity restoration-scheme-rerouting +> // below has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity restoration-scheme-rerouting { +> base restoration-scheme-type; +> description +> "Restoration LSP is computed after the failure detection. +> +> This restoration scheme is also known as +> 'Full LSP Re-routing.'"; +> reference +> "RFC 4427: Recovery (Protection and Restoration) Terminology +> for Generalized Multi-Protocol Label Switching (GMPLS)"; +> } +> +1383a1529,1531 +> // CHANGE NOTE: The identity lsp-protection-reroute-extra +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1385a1534 +> status obsolete; +1387c1536,1540 +< "'(Full) Rerouting' LSP protection type."; +--- +> "'(Full) Rerouting' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1392a1546,1548 +> // CHANGE NOTE: The identity lsp-protection-reroute +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1394a1551 +> status obsolete; +1396c1553,1557 +< "'Rerouting without Extra-Traffic' LSP protection type."; +--- +> "'Rerouting without Extra-Traffic' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1628a1790,1793 +> // cCHANGE NOTE: The description and reference of the +> // identity action-exercise have been updated in this module +> // revision +> // RFC Editor: remove the note above and this note +1632,1633c1797,1799 +< "An action that starts testing whether or not APS communication +< is operating correctly. It is of lower priority than any +--- +> "An action that starts testing whether or not Automatic +> Protection Switching (APS) communication is operating +> correctly. It is of lower priority than any +1636,1637c1802,1803 +< "RFC 4427: Recovery (Protection and Restoration) Terminology +< for Generalized Multi-Protocol Label Switching (GMPLS)"; +--- +> "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - +> Linear trail and subnetwork protection"; +1916a2083,2085 +> // CHANGE NOTE: The description of the identity path-metric-type +> // has been updated in this module revision +> // RFC Editor: remove the note above and this note +1919c2088,2091 +< "Base identity for the path metric type."; +--- +> "Base identity for the path metric type. +> +> Derived identities SHOULD describe the unit and maximum value +> of the path metric types they define."; +1939a2112,2114 +> // CHANGE NOTE: The reference for the identity path-metric-hop +> // has been added in this module revision +> // RFC Editor: remove the note above and this note +1943a2119,2121 +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; +1945a2124 +> +2110a2290,2693 +> // CHANGE NOTE: The base identity path-computation-error-reason +> // and its derived identities below have been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> identity path-computation-error-reason { +> description +> "Base identity for path computation error reasons."; +> } +> +> identity path-computation-error-path-not-found { +> base path-computation-error-reason; +> description +> "Path computation has failed because of an unspecified +> reason."; +> reference +> "Section 7.5 of RFC5440: Path Computation Element (PCE) +> Communication Protocol (PCEP)"; +> } +> +> identity path-computation-error-no-topology { +> base path-computation-error-reason; +> description +> "Path computation has failed because there is no topology +> with the provided topology-identifier."; +> } +> +> identity path-computation-error-no-dependent-server { +> base path-computation-error-reason; +> description +> "Path computation has failed because one or more dependent +> path computation servers are unavailable. +> +> The dependent path computation server could be +> a Backward-Recursive Path Computation (BRPC) downstream +> PCE or a child PCE."; +> reference +> "RFC5441, RFC8685"; +> } +> +> identity path-computation-error-pce-unavailable { +> base path-computation-error-reason; +> description +> "Path computation has failed because PCE is not available. +> +> It corresponds to bit 31 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-no-inclusion-hop { +> base path-computation-error-reason; +> description +> "Path computation has failed because there is no +> node or link provided by one or more inclusion hops."; +> } +> +> identity path-computation-error-destination-unknown-in-domain { +> base path-computation-error-reason; +> description +> "Path computation has failed because the destination node is +> unknown in indicated destination domain. +> +> It corresponds to bit 19 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC8685; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-no-resource { +> base path-computation-error-reason; +> description +> "Path computation has failed because there is no +> available resource in one or more domains. +> +> It corresponds to bit 20 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC8685; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-child-pce-unresponsive { +> base path-computation-error-no-dependent-server; +> description +> "Path computation has failed because child PCE is not +> responsive. +> +> It corresponds to bit 21 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC8685; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-destination-domain-unknown { +> base path-computation-error-reason; +> description +> "Path computation has failed because the destination domain +> was unknown. +> +> It corresponds to bit 22 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC8685; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-p2mp { +> base path-computation-error-reason; +> description +> "Path computation has failed because of P2MP reachability +> problem. +> +> It corresponds to bit 24 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC8306; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-no-gco-migration { +> base path-computation-error-reason; +> description +> "Path computation has failed because of no Global Concurrent +> Optimization (GCO) migration path found. +> +> It corresponds to bit 26 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5557; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-no-gco-solution { +> base path-computation-error-reason; +> description +> "Path computation has failed because of no GCO solution +> found. +> +> It corresponds to bit 25 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5557; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-pks-expansion { +> base path-computation-error-reason; +> description +> "Path computation has failed because of Path-Key Subobject +> (PKS) expansion failure. +> +> It corresponds to bit 27 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5520; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-brpc-chain-unavailable { +> base path-computation-error-no-dependent-server; +> description +> "Path computation has failed because PCE BRPC chain +> unavailable. +> +> It corresponds to bit 28 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5441; +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-source-unknown { +> base path-computation-error-reason; +> description +> "Path computation has failed because source node is +> unknown. +> +> It corresponds to bit 29 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-destination-unknown { +> base path-computation-error-reason; +> description +> "Path computation has failed because destination node is +> unknown. +> +> It corresponds to bit 30 of the Flags field of the +> NO-PATH-VECTOR TLV."; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> identity path-computation-error-no-server { +> base path-computation-error-reason; +> description +> "Path computation has failed because path computation +> server is unavailable."; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); +> +> https://www.iana.org/assignments/pcep/pcep.xhtml"; +> } +> +> // CHANGE NOTE: The base identity protocol-origin-type and +> // its derived identities below have been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> identity protocol-origin-type { +> description +> "Base identity for protocol origin type."; +> } +> +> identity protocol-origin-api { +> base protocol-origin-type; +> description +> "Protocol origin is via Application Programmable Interface +> (API)."; +> } +> +> identity protocol-origin-pcep { +> base protocol-origin-type; +> description +> "Protocol origin is Path Computation Engine Protocol +> (PCEP)."; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; +> } +> +> identity protocol-origin-bgp { +> base protocol-origin-type; +> description +> "Protocol origin is Border Gateway Protocol (BGP)."; +> reference "RFC9012"; +> } +> +> // CHANGE NOTE: The base identity svec-objective-function-type +> // and its derived identities below have been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> identity svec-objective-function-type { +> description +> "Base identity for SVEC objective function type."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-of-minimize-agg-bandwidth-consumption { +> base svec-objective-function-type; +> description +> "Objective function for minimizing aggregate bandwidth +> consumption (MBC)."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-of-minimize-load-most-loaded-link { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the load on the link that +> is carrying the highest load (MLL)."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-of-minimize-cost-path-set { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the cost on a path set +> (MCC)."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-of-minimize-common-transit-domain { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the number of common +> transit domains (MCTD)."; +> reference +> "RFC8685: Path Computation Element Communication Protocol +> (PCEP) Extensions for the Hierarchical Path Computation +> Element (H-PCE) Architecture."; +> } +> +> identity svec-of-minimize-shared-link { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the number of shared +> links (MSL)."; +> reference +> "RFC8685: Path Computation Element Communication Protocol +> (PCEP) Extensions for the Hierarchical Path Computation +> Element (H-PCE) Architecture."; +> } +> +> identity svec-of-minimize-shared-srlg { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the number of shared +> Shared Risk Link Groups (SRLG) (MSS)."; +> reference +> "RFC8685: Path Computation Element Communication Protocol +> (PCEP) Extensions for the Hierarchical Path Computation +> Element (H-PCE) Architecture."; +> } +> +> identity svec-of-minimize-shared-nodes { +> base svec-objective-function-type; +> description +> "Objective function for minimizing the number of shared +> nodes (MSN)."; +> reference +> "RFC8685: Path Computation Element Communication Protocol +> (PCEP) Extensions for the Hierarchical Path Computation +> Element (H-PCE) Architecture."; +> } +> +> // CHANGE NOTE: The base identity svec-metric-type and +> // its derived identities below have been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> identity svec-metric-type { +> description +> "Base identity for SVEC metric type."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-metric-cumul-te { +> base svec-metric-type; +> description +> "Cumulative TE cost."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-metric-cumul-igp { +> base svec-metric-type; +> description +> "Cumulative IGP cost."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-metric-cumul-hop { +> base svec-metric-type; +> description +> "Cumulative Hop path metric."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-metric-aggregate-bandwidth-consumption { +> base svec-metric-type; +> description +> "Aggregate bandwidth consumption."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +> identity svec-metric-load-of-the-most-loaded-link { +> base svec-metric-type; +> description +> "Load of the most loaded link."; +> reference +> "RFC5541: Encoding of Objective Functions in the Path +> Computation Element Communication Protocol (PCEP)."; +> } +> +2514a3098,3106 +> must "node-id-uri or node-id" { +> description +> "At least one node identifier MUST be present."; +> } +> leaf node-id-uri { +> type nw:node-id; +> description +> "The identifier of a node in the topology."; +> } +2517d3108 +< mandatory true; +2566a3158,3168 +> must "(link-tp-id-uri or link-tp-id) and " + +> "(node-id-uri or node-id)" { +> description +> "At least one node identifier and at least one Link +> Termination Point (LTP) identifier MUST be present."; +> } +> leaf link-tp-id-uri { +> type nt:tp-id; +> description +> "Link Termination Point (LTP) identifier."; +> } +2569d3170 +< mandatory true; +2574a3176,3180 +> leaf node-id-uri { +> type nw:node-id; +> description +> "The identifier of a node in the topology."; +> } +2577d3182 +< mandatory true; +2646a3252,3255 +> must "node-id-uri or node-id" { +> description +> "At least one node identifier MUST be present."; +> } +2648a3258,3262 +> leaf node-id-uri { +> type nw:node-id; +> description +> "The identifier of a node in the topology."; +> } +2651d3264 +< mandatory true; +2696a3310,3320 +> must "(link-tp-id-uri or link-tp-id) and " + +> "(node-id-uri or node-id)" { +> description +> "At least one node identifier and at least one Link +> Termination Point (LTP) identifier MUST be present."; +> } +> leaf link-tp-id-uri { +> type nt:tp-id; +> description +> "Link Termination Point (LTP) identifier."; +> } +2699d3322 +< mandatory true; +2704a3328,3332 +> leaf node-id-uri { +> type nw:node-id; +> description +> "The identifier of a node in the topology."; +> } +2968a3597,3601 +> leaf network-id { +> type nw:network-id; +> description +> "The network topology identifier."; +> } +3124,3126c3757,3763 +< "Upper bound on the end-to-end TE path metric. A zero +< indicates an unbounded upper limit for the specific +< 'metric-type'."; +--- +> "Upper bound on the end-to-end TE path metric. +> +> A zero indicates an unbounded upper limit for the +> specific 'metric-type'. +> +> The unit of is interpreted in the context of the +> path-metric-type."; +3379c4016,4043 +< } +\ No newline at end of file +--- +> +> // NOTE: The grouping encoding-and-switching-type below has been +> // added in this module revision +> // RFC Editor: remove the note above and this note +> grouping encoding-and-switching-type { +> description +> "Common grouping to define the LSP encoding and +> switching types"; +> leaf encoding { +> type identityref { +> base te-types:lsp-encoding-types; +> } +> description +> "LSP encoding type."; +> reference +> "RFC3945"; +> } +> leaf switching-type { +> type identityref { +> base te-types:switching-capabilities; +> } +> description +> "LSP switching type."; +> reference +> "RFC3945"; +> } +> } +> } diff --git "a/drafts/te-types-update/diffs/te-types/model-updates.txt\r" "b/drafts/te-types-update/diffs/te-types/model-updates.txt\r" new file mode 100644 index 0000000..df17eab --- /dev/null +++ "b/drafts/te-types-update/diffs/te-types/model-updates.txt\r" @@ -0,0 +1,700 @@ + 21a22,31 + > import ietf-network { + > prefix "nw"; + > reference "RFC 8345: A YANG Data Model for Network Topologies"; + > } + > + > import ietf-network-topology { + > prefix "nt"; + > reference "RFC 8345: A YANG Data Model for Network Topologies"; + > } + > + 30c40 + < + --- + > + 55c65 + < Copyright (c) 2020 IETF Trust and the persons identified as + --- + > Copyright (c) 2023 IETF Trust and the persons identified as + 60c70 + < the license terms contained in, the Simplified BSD License set + --- + > the license terms contained in, the Revised BSD License set + 65,66c75,108 + < This version of this YANG module is part of RFC 8776; see the + < RFC itself for full legal notices."; + --- + > 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."; + > + > revision 2023-06-27 { + > description + > "Added: + > - base identity lsp-provisioning-error-reason; + > - identity association-type-diversity; + > - identity tunnel-admin-state-auto; + > - identity lsp-restoration-restore-none; + > - base identity path-computation-error-reason and + > its derived identities; + > - base identity protocol-origin-type and + > its derived identities; + > - base identity svec-objective-function-type and its derived + > identities; + > - base identity svec-metric-type and its derived identities; + > - grouping encoding-and-switching-type. + > + > Updated: + > - description of the base identity objective-function-type; + > - description and reference of identity action-exercise. + > + > Obsoleted: + > - identity of-minimize-agg-bandwidth-consumption + > - identity of-minimize-load-most-loaded-link + > - identity of-minimize-cost-path-set"; + > reference + > "RFC XXXX: Updated Common YANG Data Types for Traffic + > Engineering"; + > } + > // RFC Editor: replace XXXX with actual RFC number, update date + > // information and remove this note + 545a588,615 + > // CHANGE NOTE: The typedef path-type below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > typedef path-type { + > type enumeration { + > enum primary-path { + > description + > "Indicates that the TE path is a primary path."; + > } + > enum secondary-path { + > description + > "Indicates that the TE path is a secondary path."; + > } + > enum primary-reverse-path { + > description + > "Indicates that the TE path is a primary reverse path."; + > } + > enum secondary-reverse-path { + > description + > "Indicates that the TE path is a secondary reverse path."; + > } + > } + > description + > "The type of TE path, indicating whether a path is a primary, + > or a reverse primary, or a secondary, or a reverse secondary + > path."; + > } + > + 606a677,684 + > // CHANGE NOTE: The base identity lsp-provisioning-error-reason + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity lsp-provisioning-error-reason { + > description + > "Base identity for LSP provisioning errors."; + > } + > + 982a1061,1078 + > // CHANGE NOTE: The identity association-type-diversity below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity association-type-diversity { + > base association-type; + > description + > "Association Type diversity used to associate LSPs whose + > paths are to be diverse from each other."; + > reference + > "RFC8800: Path Computation Element Communication Protocol + > (PCEP) Extension for Label Switched Path (LSP) Diversity + > Constraint Signaling"; + > } + > + > // CHANGE NOTE: The description of the base identity + > // objective-function-type has been updated + > // in this module revision + > // RFC Editor: remove the note above and this note + 985c1081 + < "Base objective function type."; + --- + > "Base identity for path objective function type."; + 1015a1112,1114 + > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1017a1117 + > status obsolete; + 1020c1120 + < consumption."; + --- + > consumption."; + 1023c1123 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; + 1025a1126,1128 + > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1027a1131 + > status obsolete; + 1030c1134 + < is carrying the highest load."; + --- + > is carrying the highest load."; + 1033c1137 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; + 1035a1140,1142 + > // CHANGE NOTE: The identity of-minimize-cost-path-set + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1037a1145 + > status obsolete; + 1216a1325,1336 + > // CHANGE NOTE: The identity tunnel-admin-state-auto below + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity tunnel-admin-state-auto { + > base tunnel-admin-state-type; + > description + > "Tunnel administrative auto state. The administrative status + > in state datastore transitions to 'tunnel-admin-up' when the + > tunnel used by the client layer, and to 'tunnel-admin-down' + > when it is not used by the client layer."; + > } + > + 1321a1442,1450 + > // CHANGE NOTE: The identity lsp-restoration-restore-none + > // below has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity lsp-restoration-restore-none { + > base lsp-restoration-type; + > description + > "No LSP affected by a failure is restored."; + > } + > + 1628a1758,1761 + > // cCHANGE NOTE: The description and reference of the + > // identity action-exercise have been updated in this module + > // revision + > // RFC Editor: remove the note above and this note + 1632,1633c1765,1767 + < "An action that starts testing whether or not APS communication + < is operating correctly. It is of lower priority than any + --- + > "An action that starts testing whether or not Automatic + > Protection Switching (APS) communication is operating + > correctly. It is of lower priority than any + 1636,1637c1770,1771 + < "RFC 4427: Recovery (Protection and Restoration) Terminology + < for Generalized Multi-Protocol Label Switching (GMPLS)"; + --- + > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - + > Linear trail and subnetwork protection"; + 2110a2245,2641 + > // CHANGE NOTE: The base identity path-computation-error-reason + > // and its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-computation-error-reason { + > description + > "Base identity for path computation error reasons."; + > } + > + > identity path-computation-error-path-not-found { + > base path-computation-error-reason; + > description + > "Path computation has failed because of an unspecified + > reason."; + > reference + > "Section 7.5 of RFC5440"; + > } + > + > identity path-computation-error-no-topology { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no topology + > with the provided topology-identifier."; + > } + > + > identity path-computation-error-no-dependent-server { + > base path-computation-error-reason; + > description + > "Path computation has failed because one or more dependent + > path computation servers are unavailable. + > + > The dependent path computation server could be + > a Backward-Recursive Path Computation (BRPC) downstream + > PCE or a child PCE."; + > reference + > "RFC5441, RFC8685"; + > } + > + > identity path-computation-error-pce-unavailable { + > base path-computation-error-reason; + > description + > "Path computation has failed because PCE is not available. + > + > It corresponds to bit 31 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-inclusion-hop { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no + > node or link provided by one or more inclusion hops."; + > } + > + > identity path-computation-error-destination-unknown-in-domain { + > base path-computation-error-reason; + > description + > "Path computation has failed because the destination node is + > unknown in indicated destination domain. + > + > It corresponds to bit 19 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-resource { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no + > available resource in one or more domains. + > + > It corresponds to bit 20 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-child-pce-unresponsive { + > base path-computation-error-no-dependent-server; + > description + > "Path computation has failed because child PCE is not + > responsive. + > + > It corresponds to bit 21 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-destination-domain-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because the destination domain + > was unknown. + > + > It corresponds to bit 22 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-p2mp { + > base path-computation-error-reason; + > description + > "Path computation has failed because of P2MP reachability + > problem. + > + > It corresponds to bit 24 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8306; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-gco-migration { + > base path-computation-error-reason; + > description + > "Path computation has failed because of no Global Concurrent + > Optimization (GCO) migration path found. + > + > It corresponds to bit 26 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5557; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-gco-solution { + > base path-computation-error-reason; + > description + > "Path computation has failed because of no GCO solution + > found. + > + > It corresponds to bit 25 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5557; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-pks-expansion { + > base path-computation-error-reason; + > description + > "Path computation has failed because of Path-Key Subobject + > (PKS) expansion failure. + > + > It corresponds to bit 27 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5520; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-brpc-chain-unavailable { + > base path-computation-error-no-dependent-server; + > description + > "Path computation has failed because PCE BRPC chain + > unavailable. + > + > It corresponds to bit 28 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5441; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-source-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because source node is + > unknown. + > + > It corresponds to bit 29 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-destination-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because destination node is + > unknown. + > + > It corresponds to bit 30 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-no-server { + > base path-computation-error-reason; + > description + > "Path computation has failed because path computation + > server is unavailable."; + > reference + > "RFC5440; + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > // CHANGE NOTE: The base identity protocol-origin-type and + > // its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity protocol-origin-type { + > description + > "Base identity for protocol origin type."; + > } + > + > identity protocol-origin-api { + > base protocol-origin-type; + > description + > "Protocol origin is via Application Programmable Interface + > (API)."; + > } + > + > identity protocol-origin-pcep { + > base protocol-origin-type; + > description + > "Protocol origin is Path Computation Engine Protocol + > (PCEP)."; + > reference "RFC5440"; + > } + > + > identity protocol-origin-bgp { + > base protocol-origin-type; + > description + > "Protocol origin is Border Gateway Protocol (BGP)."; + > reference "RFC9012"; + > } + > + > // CHANGE NOTE: The base identity svec-objective-function-type + > // and its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity svec-objective-function-type { + > description + > "Base identity for SVEC objective function type."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-agg-bandwidth-consumption { + > base svec-objective-function-type; + > description + > "Objective function for minimizing aggregate bandwidth + > consumption (MBC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-load-most-loaded-link { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the load on the link that + > is carrying the highest load (MLL)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-cost-path-set { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the cost on a path set + > (MCC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-of-minimize-common-transit-domain { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of common + > transit domains (MCTD)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-link { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > links (MSL)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-srlg { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > Shared Risk Link Groups (SRLG) (MSS)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > identity svec-of-minimize-shared-nodes { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared + > nodes (MSN)."; + > reference + > "RFC8685: Path Computation Element Communication Protocol + > (PCEP) Extensions for the Hierarchical Path Computation + > Element (H-PCE) Architecture."; + > } + > + > // CHANGE NOTE: The base identity svec-metric-type and + > // its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity svec-metric-type { + > description + > "Base identity for SVEC metric type."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-te { + > base svec-metric-type; + > description + > "Cumulative TE cost."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-igp { + > base svec-metric-type; + > description + > "Cumulative IGP cost."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-cumul-hop { + > base svec-metric-type; + > description + > "Cumulative Hop path metric."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-aggregate-bandwidth-consumption { + > base svec-metric-type; + > description + > "Aggregate bandwidth consumption."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + > identity svec-metric-load-of-the-most-loaded-link { + > base svec-metric-type; + > description + > "Load of the most loaded link."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > + 2514a3046,3054 + > must "node-id-uri or node-id" { + > description + > "At least one node identifier MUST be present."; + > } + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2517d3056 + < mandatory true; + 2566a3106,3116 + > must "(link-tp-id-uri or link-tp-id) and " + + > "(node-id-uri or node-id)" { + > description + > "At least one node identifier and at least one Link + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; + > description + > "Link Termination Point (LTP) identifier."; + > } + 2569d3118 + < mandatory true; + 2574a3124,3128 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2577d3130 + < mandatory true; + 2646a3200,3203 + > must "node-id-uri or node-id" { + > description + > "At least one node identifier MUST be present."; + > } + 2648a3206,3210 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2651d3212 + < mandatory true; + 2696a3258,3268 + > must "(link-tp-id-uri or link-tp-id) and " + + > "(node-id-uri or node-id)" { + > description + > "At least one node identifier and at least one Link + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; + > description + > "Link Termination Point (LTP) identifier."; + > } + 2699d3270 + < mandatory true; + 2704a3276,3280 + > leaf node-id-uri { + > type nw:node-id; + > description + > "The identifier of a node in the topology."; + > } + 2968a3545,3549 + > leaf network-id { + > type nw:network-id; + > description + > "The network topology identifier."; + > } + 3379c3960,3987 + < } + \ No newline at end of file + --- + > + > // NOTE: The grouping encoding-and-switching-type below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > grouping encoding-and-switching-type { + > description + > "Common grouping to define the LSP encoding and + > switching types"; + > leaf encoding { + > type identityref { + > base te-types:lsp-encoding-types; + > } + > description + > "LSP encoding type."; + > reference + > "RFC3945"; + > } + > leaf switching-type { + > type identityref { + > base te-types:switching-capabilities; + > } + > description + > "LSP switching type."; + > reference + > "RFC3945"; + > } + > } + > } diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md index e1c565e..3eb907b 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md @@ -305,16 +305,18 @@ switching-capabilities: > A base YANG identity for supported interface switching capabilities as defined in {{?RFC3471}}. resource-affinities-type: -exx + > A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in {{?RFC2702}} and {{?RFC3209}}. CHANGE NOTE: The description of the path-metric-type has been updated +RFC Editor: remove the CHANGE NOTE above and this note + path-metric-type: > A base YANG identity for supported path metric types as defined in {{?RFC3630}} {{?RFC3785}}, {{!RFC5440}}, {{?RFC7471}}, {{?RFC8233}} and {{?RFC8570}}. -> Since the unit of the path metric value is interpreted in the context of the path metric type, derived identities SHOULD describe the unit and maximum value of the path metric types they define. +> The unit of the path metric value is interpreted in the context of the path metric type. The derived identities SHOULD describe the unit and maximum value of the path metric types they define. > For example, the bound of the 'path-metric-loss', defined in 'ietf-te-packet-types', is defined in multiples of the basic unit 0.000003% as described in {{?RFC7471}} and {{?RFC8570}}. @@ -469,7 +471,7 @@ RFC Editor: remove the CHANGE NOTE above and this note {::include ../../ietf-te-types.yang} ~~~~ {: #fig-te-yang title="TE Types YANG module" -sourcecode-markers="true" sourcecode-name="ietf-te-types@2023-06-27.yang"} +sourcecode-markers="true" sourcecode-name="ietf-te-types@2023-11-24.yang"} {: #pkt-yang-code} diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt index 61bee84..d577e1b 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt @@ -6,13 +6,13 @@ TEAS Working Group I. Busi Internet-Draft Huawei Obsoletes: 8776 (if approved) A. Guo Intended status: Standards Track Futurewei Technologies -Expires: 20 May 2024 X. Liu +Expires: 27 May 2024 X. Liu Alef Edge T. Saad Cisco Systems Inc. I. Bryskin Individual - 17 November 2023 + 24 November 2023 Common YANG Data Types for Traffic Engineering @@ -41,7 +41,7 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on 20 May 2024. + This Internet-Draft will expire on 27 May 2024. Copyright Notice @@ -53,7 +53,7 @@ Copyright Notice -Busi, et al. Expires 20 May 2024 [Page 1] +Busi, et al. Expires 27 May 2024 [Page 1] Internet-Draft TE Common YANG Types November 2023 @@ -109,7 +109,7 @@ Table of Contents -Busi, et al. Expires 20 May 2024 [Page 2] +Busi, et al. Expires 27 May 2024 [Page 2] Internet-Draft TE Common YANG Types November 2023 @@ -165,7 +165,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 3] +Busi, et al. Expires 27 May 2024 [Page 3] Internet-Draft TE Common YANG Types November 2023 @@ -221,7 +221,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 4] +Busi, et al. Expires 27 May 2024 [Page 4] Internet-Draft TE Common YANG Types November 2023 @@ -277,7 +277,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 5] +Busi, et al. Expires 27 May 2024 [Page 5] Internet-Draft TE Common YANG Types November 2023 @@ -333,7 +333,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 6] +Busi, et al. Expires 27 May 2024 [Page 6] Internet-Draft TE Common YANG Types November 2023 @@ -389,7 +389,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 7] +Busi, et al. Expires 27 May 2024 [Page 7] Internet-Draft TE Common YANG Types November 2023 @@ -445,7 +445,7 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 20 May 2024 [Page 8] +Busi, et al. Expires 27 May 2024 [Page 8] Internet-Draft TE Common YANG Types November 2023 @@ -478,34 +478,38 @@ Internet-Draft TE Common YANG Types November 2023 A base YANG identity for supported interface switching capabilities as defined in [RFC3471]. - resource-affinities-type: exx > A base YANG identity for supported - attribute filters associated with a tunnel that must be satisfied for - a link to be acceptable as defined in [RFC2702] and [RFC3209]. + resource-affinities-type: + + A base YANG identity for supported attribute filters associated + with a tunnel that must be satisfied for a link to be acceptable + as defined in [RFC2702] and [RFC3209]. CHANGE NOTE: The description of the path-metric-type has been updated + RFC Editor: remove the CHANGE NOTE above and this note + path-metric-type: A base YANG identity for supported path metric types as defined in [RFC3630] [RFC3785], [RFC5440], [RFC7471], [RFC8233] and [RFC8570]. - Since the unit of the path metric value is interpreted in the - context of the path metric type, derived identities SHOULD - describe the unit and maximum value of the path metric types they - define. + The unit of the path metric value is interpreted in the context of + the path metric type. The derived identities SHOULD describe the + unit and maximum value of the path metric types they define. - For example, the bound of the 'path-metric-loss', defined in - 'ietf-te-packet-types', is defined in multiples of the basic unit - 0.000003% as described in [RFC7471] and [RFC8570]. -Busi, et al. Expires 20 May 2024 [Page 9] +Busi, et al. Expires 27 May 2024 [Page 9] Internet-Draft TE Common YANG Types November 2023 + For example, the bound of the 'path-metric-loss', defined in + 'ietf-te-packet-types', is defined in multiples of the basic unit + 0.000003% as described in [RFC7471] and [RFC8570]. + explicit-route-hop: A YANG grouping that defines supported explicit routes as defined @@ -549,19 +553,18 @@ Internet-Draft TE Common YANG Types November 2023 encoding-and-switching-type: - This is a common grouping to define the LSP encoding and switching - types. - - -Busi, et al. Expires 20 May 2024 [Page 10] +Busi, et al. Expires 27 May 2024 [Page 10] Internet-Draft TE Common YANG Types November 2023 + This is a common grouping to define the LSP encoding and switching + types. + CHANGE NOTE: The tunnel-admin-state-auto YANG identity, derived from the tunnel-admin-status-type base YANG identity has also been added. No description is provided, since no description for the tunnel- @@ -606,18 +609,20 @@ Internet-Draft TE Common YANG Types November 2023 The "ietf-te-packet-types" module (Section 5) covers the common types and groupings that are specific to packet technology. - The "ietf-te-packet-types" module contains the following YANG - reusable types and groupings: - backup-protection-type: -Busi, et al. Expires 20 May 2024 [Page 11] +Busi, et al. Expires 27 May 2024 [Page 11] Internet-Draft TE Common YANG Types November 2023 + The "ietf-te-packet-types" module contains the following YANG + reusable types and groupings: + + backup-protection-type: + A base YANG identity for supported protection types that a backup or bypass tunnel can provide as defined in [RFC4090]. @@ -660,20 +665,20 @@ Internet-Draft TE Common YANG Types November 2023 te-packet-path-bandwidth - A YANG grouping that defines the path bandwidth information and - could be used in any Packet TE model (e.g., MPLS-TE topology - model) for the path bandwidth representation (e.g., the bandwidth - of an MPLS-TE LSP). - -Busi, et al. Expires 20 May 2024 [Page 12] +Busi, et al. Expires 27 May 2024 [Page 12] Internet-Draft TE Common YANG Types November 2023 + A YANG grouping that defines the path bandwidth information and + could be used in any Packet TE model (e.g., MPLS-TE topology + model) for the path bandwidth representation (e.g., the bandwidth + of an MPLS-TE LSP). + All the path and LSP bandwidth related sections in the "ietf-te- types" generic module, Section 4, need to be augmented with this grouping for the usage of Packet TE technologies. @@ -717,20 +722,20 @@ Internet-Draft TE Common YANG Types November 2023 [RFC4736], [RFC6004], [RFC6511], [RFC7139], [RFC7308], [RFC7551], [RFC7571], [RFC7579], and [ITU-T_G.709]. - CHANGE NOTE: Please focus your review only on the updates to the YANG - model: see also Appendix A.1. - - RFC Editor: remove the CHANGE NOTE above and this note - -Busi, et al. Expires 20 May 2024 [Page 13] +Busi, et al. Expires 27 May 2024 [Page 13] Internet-Draft TE Common YANG Types November 2023 - file "ietf-te-types@2023-06-27.yang" + CHANGE NOTE: Please focus your review only on the updates to the YANG + model: see also Appendix A.1. + + RFC Editor: remove the CHANGE NOTE above and this note + + file "ietf-te-types@2023-11-24.yang" module ietf-te-types { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-te-types"; @@ -773,19 +778,19 @@ Internet-Draft TE Common YANG Types November 2023 Editor: Rakesh Gandhi - - - Editor: Vishnu Pavan Beeram - - -Busi, et al. Expires 20 May 2024 [Page 14] +Busi, et al. Expires 27 May 2024 [Page 14] Internet-Draft TE Common YANG Types November 2023 + + + Editor: Vishnu Pavan Beeram + + Editor: Xufeng Liu @@ -816,7 +821,7 @@ Internet-Draft TE Common YANG Types November 2023 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."; - revision 2023-11-17 { + revision 2023-11-24 { description "Added: - base identity lsp-provisioning-error-reason; @@ -829,19 +834,19 @@ Internet-Draft TE Common YANG Types November 2023 - base identity protocol-origin-type and its derived identities; - base identity svec-objective-function-type and its derived - identities; - - base identity svec-metric-type and its derived identities; - - grouping encoding-and-switching-type. - - Updated: -Busi, et al. Expires 20 May 2024 [Page 15] +Busi, et al. Expires 27 May 2024 [Page 15] Internet-Draft TE Common YANG Types November 2023 + identities; + - base identity svec-metric-type and its derived identities; + - grouping encoding-and-switching-type. + + Updated: - description of the base identity objective-function-type; - description and reference of identity action-exercise. @@ -885,19 +890,19 @@ Internet-Draft TE Common YANG Types November 2023 RFC 5305: IS-IS Extensions for Traffic Engineering RFC 7308: Extended Administrative Groups in MPLS Traffic Engineering (MPLS-TE)"; - } - - typedef admin-groups { - type union { - type admin-group; -Busi, et al. Expires 20 May 2024 [Page 16] +Busi, et al. Expires 27 May 2024 [Page 16] Internet-Draft TE Common YANG Types November 2023 + } + + typedef admin-groups { + type union { + type admin-group; type extended-admin-group; } description @@ -941,20 +946,20 @@ Internet-Draft TE Common YANG Types November 2023 value 1; description "Normal. Indicates that the anomalous bit is not set."; - } - enum abnormal { - value 2; - description - "Abnormal. Indicates that the anomalous bit is set."; -Busi, et al. Expires 20 May 2024 [Page 17] +Busi, et al. Expires 27 May 2024 [Page 17] Internet-Draft TE Common YANG Types November 2023 } + enum abnormal { + value 2; + description + "Abnormal. Indicates that the anomalous bit is set."; + } } description "Indicates whether a performance metric is normal (anomalous @@ -997,19 +1002,19 @@ Internet-Draft TE Common YANG Types November 2023 "The resource is disabled in the control plane to prepare for a graceful shutdown for maintenance purposes."; reference - "RFC 5817: Graceful Shutdown in MPLS and Generalized MPLS - Traffic Engineering Networks"; - } - enum maintenance { - description -Busi, et al. Expires 20 May 2024 [Page 18] +Busi, et al. Expires 27 May 2024 [Page 18] Internet-Draft TE Common YANG Types November 2023 + "RFC 5817: Graceful Shutdown in MPLS and Generalized MPLS + Traffic Engineering Networks"; + } + enum maintenance { + description "The resource is disabled in the data plane for maintenance purposes."; } @@ -1053,19 +1058,19 @@ Internet-Draft TE Common YANG Types November 2023 a list of pairs of slot numbers and widths can be used, such as '0,2,3,3', indicating a frequency slot 0 with slot width 2 and a frequency slot 3 with slot width 3. - Canonically, the string is represented as all lowercase and in - hex, where the prefix '0x' precedes the hex number."; - reference - "RFC 8294: Common YANG Data Types for the Routing Area - ITU-T Recommendation G.709: Interfaces for the -Busi, et al. Expires 20 May 2024 [Page 19] +Busi, et al. Expires 27 May 2024 [Page 19] Internet-Draft TE Common YANG Types November 2023 + Canonically, the string is represented as all lowercase and in + hex, where the prefix '0x' precedes the hex number."; + reference + "RFC 8294: Common YANG Data Types for the Routing Area + ITU-T Recommendation G.709: Interfaces for the optical transport network"; } @@ -1109,19 +1114,19 @@ Internet-Draft TE Common YANG Types November 2023 "Enumerated type for specifying loose or strict paths."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, - Section 4.3.3"; - } - - typedef te-link-access-type { - type enumeration { -Busi, et al. Expires 20 May 2024 [Page 20] +Busi, et al. Expires 27 May 2024 [Page 20] Internet-Draft TE Common YANG Types November 2023 + Section 4.3.3"; + } + + typedef te-link-access-type { + type enumeration { enum point-to-point { description "The link is point-to-point."; @@ -1165,19 +1170,19 @@ Internet-Draft TE Common YANG Types November 2023 description "The explicit route represents an outgoing link on a node."; - } - } - description - "Enumerated type for specifying the direction of a link on - a node."; -Busi, et al. Expires 20 May 2024 [Page 21] +Busi, et al. Expires 27 May 2024 [Page 21] Internet-Draft TE Common YANG Types November 2023 + } + } + description + "Enumerated type for specifying the direction of a link on + a node."; } typedef te-metric { @@ -1221,19 +1226,20 @@ Internet-Draft TE Common YANG Types November 2023 } typedef te-admin-status { - type te-common-status; - description - "Defines a type representing the administrative status of - a TE resource."; - } -Busi, et al. Expires 20 May 2024 [Page 22] +Busi, et al. Expires 27 May 2024 [Page 22] Internet-Draft TE Common YANG Types November 2023 + type te-common-status; + description + "Defines a type representing the administrative status of + a TE resource."; + } + typedef te-path-disjointness { type bits { bit node { @@ -1276,20 +1282,20 @@ Internet-Draft TE Common YANG Types November 2023 description "The recovery action has succeeded. The working span has reported a failure/degrade condition, and the user traffic - is being transported (or selected) on the recovery span."; - } - enum recovery-failed { - description - "The recovery action has failed."; - } -Busi, et al. Expires 20 May 2024 [Page 23] +Busi, et al. Expires 27 May 2024 [Page 23] Internet-Draft TE Common YANG Types November 2023 + is being transported (or selected) on the recovery span."; + } + enum recovery-failed { + description + "The recovery action has failed."; + } enum reversion-started { description "The reversion has started."; @@ -1332,20 +1338,20 @@ Internet-Draft TE Common YANG Types November 2023 type string { pattern '/?([a-zA-Z0-9\-_.]+)(/[a-zA-Z0-9\-_.]+)*'; } - description - "A type for the name of a TE node template or TE link - template."; - } - - typedef te-topology-event-type { -Busi, et al. Expires 20 May 2024 [Page 24] +Busi, et al. Expires 27 May 2024 [Page 24] Internet-Draft TE Common YANG Types November 2023 + description + "A type for the name of a TE node template or TE link + template."; + } + + typedef te-topology-event-type { type enumeration { enum add { value 0; @@ -1389,19 +1395,18 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 8345: A YANG Data Model for Network Topologies"; } - typedef te-tp-id { - type union { - type uint32; - // Unnumbered - type inet:ip-address; - -Busi, et al. Expires 20 May 2024 [Page 25] +Busi, et al. Expires 27 May 2024 [Page 25] Internet-Draft TE Common YANG Types November 2023 + typedef te-tp-id { + type union { + type uint32; + // Unnumbered + type inet:ip-address; // IPv4 or IPv6 address } description @@ -1445,19 +1450,19 @@ Internet-Draft TE Common YANG Types November 2023 /* TE features */ feature p2mp-te { - description - "Indicates support for Point-to-Multipoint TE (P2MP-TE)."; - reference - "RFC 4875: Extensions to Resource Reservation Protocol - - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE -Busi, et al. Expires 20 May 2024 [Page 26] +Busi, et al. Expires 27 May 2024 [Page 26] Internet-Draft TE Common YANG Types November 2023 + description + "Indicates support for Point-to-Multipoint TE (P2MP-TE)."; + reference + "RFC 4875: Extensions to Resource Reservation Protocol - + Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE Label Switched Paths (LSPs)"; } @@ -1502,18 +1507,18 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates support for path optimization metrics."; } - feature path-optimization-objective-function { - description - "Indicates support for path optimization objective functions."; - } - -Busi, et al. Expires 20 May 2024 [Page 27] +Busi, et al. Expires 27 May 2024 [Page 27] Internet-Draft TE Common YANG Types November 2023 + feature path-optimization-objective-function { + description + "Indicates support for path optimization objective functions."; + } + /* * Identities */ @@ -1558,18 +1563,17 @@ Internet-Draft TE Common YANG Types November 2023 Section 4.7.1"; } - identity bandwidth-protection-desired { - base session-attributes-flags; - description - "Requests FRR bandwidth protection on LSRs, if present."; - -Busi, et al. Expires 20 May 2024 [Page 28] +Busi, et al. Expires 27 May 2024 [Page 28] Internet-Draft TE Common YANG Types November 2023 + identity bandwidth-protection-desired { + base session-attributes-flags; + description + "Requests FRR bandwidth protection on LSRs, if present."; reference "RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP Tunnels"; } @@ -1614,18 +1618,18 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates end-to-end rerouting behavior for an LSP undergoing establishment. This MAY also be used to specify the behavior of end-to-end LSP recovery for - established LSPs."; - reference - "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS - RSVP-TE -Busi, et al. Expires 20 May 2024 [Page 29] +Busi, et al. Expires 27 May 2024 [Page 29] Internet-Draft TE Common YANG Types November 2023 + established LSPs."; + reference + "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS + RSVP-TE RFC 5420: Encoding of Attributes for MPLS LSP Establishment Using Resource Reservation Protocol Traffic Engineering (RSVP-TE) @@ -1670,18 +1674,18 @@ Internet-Draft TE Common YANG Types November 2023 Route Object (ERO)"; } - identity lsp-integrity-required { - base lsp-attributes-flags; - description - "Indicates that LSP integrity is required."; -Busi, et al. Expires 20 May 2024 [Page 30] +Busi, et al. Expires 27 May 2024 [Page 30] Internet-Draft TE Common YANG Types November 2023 + identity lsp-integrity-required { + base lsp-attributes-flags; + description + "Indicates that LSP integrity is required."; reference "RFC 4875: Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE @@ -1726,18 +1730,18 @@ Internet-Draft TE Common YANG Types November 2023 } identity non-php-behavior-flag { - base lsp-attributes-flags; - description - "Indicates that non-PHP (non-Penultimate Hop Popping) behavior - for the LSP is desired."; -Busi, et al. Expires 20 May 2024 [Page 31] +Busi, et al. Expires 27 May 2024 [Page 31] Internet-Draft TE Common YANG Types November 2023 + base lsp-attributes-flags; + description + "Indicates that non-PHP (non-Penultimate Hop Popping) behavior + for the LSP is desired."; reference "RFC 6511: Non-Penultimate Hop Popping Behavior and Out-of-Band Mapping for RSVP-TE Label Switched Paths @@ -1782,18 +1786,19 @@ Internet-Draft TE Common YANG Types November 2023 description "OAM Maintenance Entity Group Intermediate Points (MIP) entities desired."; - reference - "RFC 7260: GMPLS RSVP-TE Extensions for Operations, - Administration, and Maintenance (OAM) Configuration"; - } -Busi, et al. Expires 20 May 2024 [Page 32] +Busi, et al. Expires 27 May 2024 [Page 32] Internet-Draft TE Common YANG Types November 2023 + reference + "RFC 7260: GMPLS RSVP-TE Extensions for Operations, + Administration, and Maintenance (OAM) Configuration"; + } + identity srlg-collection-desired { base lsp-attributes-flags; description @@ -1837,19 +1842,19 @@ Internet-Draft TE Common YANG Types November 2023 identity link-protection-type { description "Base identity for the link protection type."; - } - - identity link-protection-unprotected { - base link-protection-type; - description -Busi, et al. Expires 20 May 2024 [Page 33] +Busi, et al. Expires 27 May 2024 [Page 33] Internet-Draft TE Common YANG Types November 2023 + } + + identity link-protection-unprotected { + base link-protection-type; + description "Unprotected link type."; reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End @@ -1893,19 +1898,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity link-protection-enhanced { - base link-protection-type; - description - "A compound link protection type derived from the underlay - TE tunnel protection configuration supporting the TE link."; - } -Busi, et al. Expires 20 May 2024 [Page 34] +Busi, et al. Expires 27 May 2024 [Page 34] Internet-Draft TE Common YANG Types November 2023 + base link-protection-type; + description + "A compound link protection type derived from the underlay + TE tunnel protection configuration supporting the TE link."; + } + identity association-type { description "Base identity for the tunnel association."; @@ -1948,20 +1954,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Association type for single-sided bidirectional LSPs, used to associate two LSPs of two tunnels, where one - tunnel is configured on one side/endpoint and the other - tunnel is dynamically created on the other endpoint."; - reference - "RFC 6780: RSVP ASSOCIATION Object Extensions - RFC 7551: RSVP-TE Extensions for Associated Bidirectional - Label Switched Paths (LSPs)"; -Busi, et al. Expires 20 May 2024 [Page 35] +Busi, et al. Expires 27 May 2024 [Page 35] Internet-Draft TE Common YANG Types November 2023 + tunnel is configured on one side/endpoint and the other + tunnel is dynamically created on the other endpoint."; + reference + "RFC 6780: RSVP ASSOCIATION Object Extensions + RFC 7551: RSVP-TE Extensions for Associated Bidirectional + Label Switched Paths (LSPs)"; } // CHANGE NOTE: The identity association-type-diversity below has @@ -2004,20 +2010,20 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; - } - - identity of-maximize-residual-bandwidth { - base objective-function-type; - description - "Objective function for maximizing residual bandwidth."; -Busi, et al. Expires 20 May 2024 [Page 36] +Busi, et al. Expires 27 May 2024 [Page 36] Internet-Draft TE Common YANG Types November 2023 + } + + identity of-maximize-residual-bandwidth { + base objective-function-type; + description + "Objective function for maximizing residual bandwidth."; reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; @@ -2060,20 +2066,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Objective function for minimizing the cost on a path set."; reference - "RFC 5541: Encoding of Objective Functions in the Path - Computation Element Communication Protocol (PCEP)"; - } - - identity path-computation-method { - description -Busi, et al. Expires 20 May 2024 [Page 37] +Busi, et al. Expires 27 May 2024 [Page 37] Internet-Draft TE Common YANG Types November 2023 + "RFC 5541: Encoding of Objective Functions in the Path + Computation Element Communication Protocol (PCEP)"; + } + + identity path-computation-method { + description "Base identity for supported path computation mechanisms."; } @@ -2116,20 +2122,20 @@ Internet-Draft TE Common YANG Types November 2023 Engineering"; } - identity lsp-metric-type { - description - "Base identity for the LSP metric specification types."; - } - - identity lsp-metric-relative { -Busi, et al. Expires 20 May 2024 [Page 38] +Busi, et al. Expires 27 May 2024 [Page 38] Internet-Draft TE Common YANG Types November 2023 + identity lsp-metric-type { + description + "Base identity for the LSP metric specification types."; + } + + identity lsp-metric-relative { base lsp-metric-type; description "The metric specified for the LSPs to which this identity @@ -2172,20 +2178,20 @@ Internet-Draft TE Common YANG Types November 2023 "TE Point-to-Point (P2P) tunnel type."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; - } - identity te-tunnel-p2mp { - base te-tunnel-type; - description - "TE P2MP tunnel type."; - -Busi, et al. Expires 20 May 2024 [Page 39] +Busi, et al. Expires 27 May 2024 [Page 39] Internet-Draft TE Common YANG Types November 2023 + } + + identity te-tunnel-p2mp { + base te-tunnel-type; + description + "TE P2MP tunnel type."; reference "RFC 4875: Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to-Multipoint TE @@ -2228,20 +2234,20 @@ Internet-Draft TE Common YANG Types November 2023 identity te-action-success { base te-action-result; description - "TE action was successful."; - } - - identity te-action-fail { - base te-action-result; - description -Busi, et al. Expires 20 May 2024 [Page 40] +Busi, et al. Expires 27 May 2024 [Page 40] Internet-Draft TE Common YANG Types November 2023 + "TE action was successful."; + } + + identity te-action-fail { + base te-action-result; + description "TE action failed."; } @@ -2285,19 +2291,19 @@ Internet-Draft TE Common YANG Types November 2023 "Base identity for TE tunnel states."; } - identity tunnel-state-up { - base tunnel-state-type; - description - "Tunnel's state is up."; - } - -Busi, et al. Expires 20 May 2024 [Page 41] +Busi, et al. Expires 27 May 2024 [Page 41] Internet-Draft TE Common YANG Types November 2023 + identity tunnel-state-up { + base tunnel-state-type; + description + "Tunnel's state is up."; + } + identity tunnel-state-down { base tunnel-state-type; description @@ -2340,20 +2346,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-state-setup-failed { - base lsp-state-type; - description - "State setup failed."; - } - - identity lsp-state-up { -Busi, et al. Expires 20 May 2024 [Page 42] +Busi, et al. Expires 27 May 2024 [Page 42] Internet-Draft TE Common YANG Types November 2023 + base lsp-state-type; + description + "State setup failed."; + } + + identity lsp-state-up { base lsp-state-type; description "State is up."; @@ -2396,20 +2402,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-restoration-type { - description - "Base identity from which LSP restoration types are derived."; - } - // CHANGE NOTE: The identity lsp-restoration-restore-none - // below has been added in this module revision - -Busi, et al. Expires 20 May 2024 [Page 43] +Busi, et al. Expires 27 May 2024 [Page 43] Internet-Draft TE Common YANG Types November 2023 + description + "Base identity from which LSP restoration types are derived."; + } + + // CHANGE NOTE: The identity lsp-restoration-restore-none + // below has been added in this module revision // RFC Editor: remove the note above and this note identity lsp-restoration-restore-none { base lsp-restoration-type; @@ -2443,7 +2449,7 @@ Internet-Draft TE Common YANG Types November 2023 description "Restoration LSP is computed after the failure detection. - This restoration schema is also known as + This restoration scheme is also known as 'Full LSP Re-routing.'"; reference "RFC 4427: Recovery (Protection and Restoration) Terminology @@ -2452,20 +2458,21 @@ Internet-Draft TE Common YANG Types November 2023 identity restoration-scheme-preconfigured { base restoration-scheme-type; - description - "Restoration LSP is preconfigured prior to the failure."; - reference - "RFC 4427: Recovery (Protection and Restoration) Terminology - for Generalized Multi-Protocol Label Switching (GMPLS)"; - } -Busi, et al. Expires 20 May 2024 [Page 44] +Busi, et al. Expires 27 May 2024 [Page 44] Internet-Draft TE Common YANG Types November 2023 + description + "Restoration LSP is preconfigured prior to the failure."; + reference + "RFC 4427: Recovery (Protection and Restoration) Terminology + for Generalized Multi-Protocol Label Switching (GMPLS)"; + } + identity restoration-scheme-precomputed { base restoration-scheme-type; description @@ -2507,21 +2514,21 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-protection-reroute-extra { base lsp-protection-type; status obsolete; - description - "'(Full) Rerouting' LSP protection type. - - This identity has been obsoleted: the - 'restoration-scheme-rerouting' identity SHOULD be used - instead."; - reference -Busi, et al. Expires 20 May 2024 [Page 45] +Busi, et al. Expires 27 May 2024 [Page 45] Internet-Draft TE Common YANG Types November 2023 + description + "'(Full) Rerouting' LSP protection type. + + This identity has been obsoleted: the + 'restoration-scheme-rerouting' identity SHOULD be used + instead."; + reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } @@ -2563,21 +2570,21 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-protection-unidir-1-plus-1 { base lsp-protection-type; - description - "'1+1 Unidirectional Protection' LSP protection type."; - reference - "RFC 4872: RSVP-TE Extensions in Support of End-to-End - Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; - } - -Busi, et al. Expires 20 May 2024 [Page 46] +Busi, et al. Expires 27 May 2024 [Page 46] Internet-Draft TE Common YANG Types November 2023 + description + "'1+1 Unidirectional Protection' LSP protection type."; + reference + "RFC 4872: RSVP-TE Extensions in Support of End-to-End + Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; + } + identity lsp-protection-bidir-1-plus-1 { base lsp-protection-type; description @@ -2619,6 +2626,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity lockout-of-protection { + + + +Busi, et al. Expires 27 May 2024 [Page 47] + +Internet-Draft TE Common YANG Types November 2023 + + base lsp-protection-state; description "A Loss of Protection (LoP) command is active."; @@ -2627,13 +2642,6 @@ Internet-Draft TE Common YANG Types November 2023 for Generalized Multi-Protocol Label Switching (GMPLS)"; } - - -Busi, et al. Expires 20 May 2024 [Page 47] - -Internet-Draft TE Common YANG Types November 2023 - - identity forced-switch { base lsp-protection-state; description @@ -2674,6 +2682,14 @@ Internet-Draft TE Common YANG Types November 2023 identity wait-to-restore { base lsp-protection-state; + + + +Busi, et al. Expires 27 May 2024 [Page 48] + +Internet-Draft TE Common YANG Types November 2023 + + description "A WTR timer is running."; reference @@ -2682,14 +2698,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity do-not-revert { - - - -Busi, et al. Expires 20 May 2024 [Page 48] - -Internet-Draft TE Common YANG Types November 2023 - - base lsp-protection-state; description "A Do Not Revert (DNR) condition is active because of @@ -2730,6 +2738,14 @@ Internet-Draft TE Common YANG Types November 2023 base protection-external-commands; description "An action that clears the active freeze state."; + + + +Busi, et al. Expires 27 May 2024 [Page 49] + +Internet-Draft TE Common YANG Types November 2023 + + reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -2738,14 +2754,6 @@ Internet-Draft TE Common YANG Types November 2023 identity action-lockout-of-normal { base protection-external-commands; description - - - -Busi, et al. Expires 20 May 2024 [Page 49] - -Internet-Draft TE Common YANG Types November 2023 - - "A temporary configuration action initiated by an operator command to ensure that the normal traffic is not allowed to use the protection transport entity."; @@ -2786,6 +2794,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; + + + +Busi, et al. Expires 27 May 2024 [Page 50] + +Internet-Draft TE Common YANG Types November 2023 + + } identity action-manual-switch { @@ -2794,14 +2810,6 @@ Internet-Draft TE Common YANG Types November 2023 "A switchover action initiated by an operator command to switch the Extra-Traffic signal, the normal traffic signal, or the null signal to the protection transport entity, unless - - - -Busi, et al. Expires 20 May 2024 [Page 50] - -Internet-Draft TE Common YANG Types November 2023 - - a fault condition exists on other transport entities or a switchover command of equal or higher priority is in effect."; reference @@ -2842,6 +2850,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; + + + +Busi, et al. Expires 27 May 2024 [Page 51] + +Internet-Draft TE Common YANG Types November 2023 + + } identity switching-psc1 { @@ -2850,14 +2866,6 @@ Internet-Draft TE Common YANG Types November 2023 "Packet-Switch Capable-1 (PSC-1)."; reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) - - - -Busi, et al. Expires 20 May 2024 [Page 51] - -Internet-Draft TE Common YANG Types November 2023 - - Signaling Functional Description"; } @@ -2898,6 +2906,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity switching-dcsc { + + + +Busi, et al. Expires 27 May 2024 [Page 52] + +Internet-Draft TE Common YANG Types November 2023 + + base switching-capabilities; description "Data Channel Switching Capable (DCSC)."; @@ -2906,14 +2922,6 @@ Internet-Draft TE Common YANG Types November 2023 Switching Capable (DCSC) and Channel Set Label Extensions"; } - - - -Busi, et al. Expires 20 May 2024 [Page 52] - -Internet-Draft TE Common YANG Types November 2023 - - identity switching-lsc { base switching-capabilities; description @@ -2954,6 +2962,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Ethernet LSP encoding."; reference + + + +Busi, et al. Expires 27 May 2024 [Page 53] + +Internet-Draft TE Common YANG Types November 2023 + + "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; } @@ -2962,14 +2978,6 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-encoding-types; description "ANSI/ETSI PDH LSP encoding."; - - - -Busi, et al. Expires 20 May 2024 [Page 53] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; @@ -3011,6 +3019,13 @@ Internet-Draft TE Common YANG Types November 2023 Signaling Functional Description"; } + + +Busi, et al. Expires 27 May 2024 [Page 54] + +Internet-Draft TE Common YANG Types November 2023 + + identity lsp-encoding-fiber-channel { base lsp-encoding-types; description @@ -3018,14 +3033,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; - - - -Busi, et al. Expires 20 May 2024 [Page 54] - -Internet-Draft TE Common YANG Types November 2023 - - } identity lsp-encoding-oduk { @@ -3067,21 +3074,21 @@ Internet-Draft TE Common YANG Types November 2023 base path-signaling-type; description "Static LSP provisioning path setup."; - } - identity path-setup-rsvp { - base path-signaling-type; - description - "RSVP-TE signaling path setup."; - reference - -Busi, et al. Expires 20 May 2024 [Page 55] +Busi, et al. Expires 27 May 2024 [Page 55] Internet-Draft TE Common YANG Types November 2023 + } + + identity path-setup-rsvp { + base path-signaling-type; + description + "RSVP-TE signaling path setup."; + reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } @@ -3124,20 +3131,19 @@ Internet-Draft TE Common YANG Types November 2023 "'Include route' object."; } - identity route-exclude-object { - base route-usage-type; - description - "'Exclude route' object."; - reference - "RFC 4874: Exclude Routes - Extension to Resource ReserVation - -Busi, et al. Expires 20 May 2024 [Page 56] +Busi, et al. Expires 27 May 2024 [Page 56] Internet-Draft TE Common YANG Types November 2023 + identity route-exclude-object { + base route-usage-type; + description + "'Exclude route' object."; + reference + "RFC 4874: Exclude Routes - Extension to Resource ReserVation Protocol-Traffic Engineering (RSVP-TE)"; } @@ -3180,20 +3186,20 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The reference for the identity path-metric-hop - // has been added in this module revision - // RFC Editor: remove the note above and this note - identity path-metric-hop { - base path-metric-type; - description - "Hop path metric."; -Busi, et al. Expires 20 May 2024 [Page 57] +Busi, et al. Expires 27 May 2024 [Page 57] Internet-Draft TE Common YANG Types November 2023 + // has been added in this module revision + // RFC Editor: remove the note above and this note + identity path-metric-hop { + base path-metric-type; + description + "Hop path metric."; reference "RFC5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -3236,20 +3242,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-metric-optimize-excludes { - base path-metric-type; - description - "A metric that optimizes to a maximum the number of excluded - resources specified in a set."; - } - -Busi, et al. Expires 20 May 2024 [Page 58] +Busi, et al. Expires 27 May 2024 [Page 58] Internet-Draft TE Common YANG Types November 2023 + base path-metric-type; + description + "A metric that optimizes to a maximum the number of excluded + resources specified in a set."; + } + identity path-tiebreaker-type { description "Base identity for the path tiebreaker type."; @@ -3292,20 +3298,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity resource-aff-include-any { - base resource-affinities-type; - description - "The set of attribute filters associated with a - tunnel, any of which must be present for a link - to be acceptable."; - reference -Busi, et al. Expires 20 May 2024 [Page 59] +Busi, et al. Expires 27 May 2024 [Page 59] Internet-Draft TE Common YANG Types November 2023 + base resource-affinities-type; + description + "The set of attribute filters associated with a + tunnel, any of which must be present for a link + to be acceptable."; + reference "RFC 2702: Requirements for Traffic Engineering Over MPLS RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; } @@ -3348,20 +3354,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Optimized on delay."; reference - "RFC 5541: Encoding of Objective Functions in the Path - Computation Element Communication Protocol (PCEP)"; - } - identity path-computation-srlg-type { - description - -Busi, et al. Expires 20 May 2024 [Page 60] +Busi, et al. Expires 27 May 2024 [Page 60] Internet-Draft TE Common YANG Types November 2023 + "RFC 5541: Encoding of Objective Functions in the Path + Computation Element Communication Protocol (PCEP)"; + } + + identity path-computation-srlg-type { + description "Base identity for SRLG path computation."; } @@ -3404,20 +3410,20 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because of an unspecified reason."; reference - "Section 7.5 of RFC5440: Path Computation Element (PCE) - Communication Protocol (PCEP)"; - } - identity path-computation-error-no-topology { - base path-computation-error-reason; - -Busi, et al. Expires 20 May 2024 [Page 61] +Busi, et al. Expires 27 May 2024 [Page 61] Internet-Draft TE Common YANG Types November 2023 + "Section 7.5 of RFC5440: Path Computation Element (PCE) + Communication Protocol (PCEP)"; + } + + identity path-computation-error-no-topology { + base path-computation-error-reason; description "Path computation has failed because there is no topology with the provided topology-identifier."; @@ -3460,20 +3466,20 @@ Internet-Draft TE Common YANG Types November 2023 identity path-computation-error-destination-unknown-in-domain { base path-computation-error-reason; description - "Path computation has failed because the destination node is - unknown in indicated destination domain. - - It corresponds to bit 19 of the Flags field of the - NO-PATH-VECTOR TLV."; - reference -Busi, et al. Expires 20 May 2024 [Page 62] +Busi, et al. Expires 27 May 2024 [Page 62] Internet-Draft TE Common YANG Types November 2023 + "Path computation has failed because the destination node is + unknown in indicated destination domain. + + It corresponds to bit 19 of the Flags field of the + NO-PATH-VECTOR TLV."; + reference "RFC8685; https://www.iana.org/assignments/pcep/pcep.xhtml"; @@ -3516,20 +3522,20 @@ Internet-Draft TE Common YANG Types November 2023 It corresponds to bit 22 of the Flags field of the NO-PATH-VECTOR TLV."; reference - "RFC8685; - - https://www.iana.org/assignments/pcep/pcep.xhtml"; - } - - identity path-computation-error-p2mp { -Busi, et al. Expires 20 May 2024 [Page 63] +Busi, et al. Expires 27 May 2024 [Page 63] Internet-Draft TE Common YANG Types November 2023 + "RFC8685; + + https://www.iana.org/assignments/pcep/pcep.xhtml"; + } + + identity path-computation-error-p2mp { base path-computation-error-reason; description "Path computation has failed because of P2MP reachability @@ -3572,20 +3578,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-computation-error-pks-expansion { - base path-computation-error-reason; - description - "Path computation has failed because of Path-Key Subobject - (PKS) expansion failure. - - It corresponds to bit 27 of the Flags field of the -Busi, et al. Expires 20 May 2024 [Page 64] +Busi, et al. Expires 27 May 2024 [Page 64] Internet-Draft TE Common YANG Types November 2023 + base path-computation-error-reason; + description + "Path computation has failed because of Path-Key Subobject + (PKS) expansion failure. + + It corresponds to bit 27 of the Flags field of the NO-PATH-VECTOR TLV."; reference "RFC5520; @@ -3628,20 +3634,20 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because destination node is unknown. - It corresponds to bit 30 of the Flags field of the - NO-PATH-VECTOR TLV."; - reference - "RFC5440: Path Computation Element (PCE) Communication - Protocol (PCEP); - -Busi, et al. Expires 20 May 2024 [Page 65] +Busi, et al. Expires 27 May 2024 [Page 65] Internet-Draft TE Common YANG Types November 2023 + It corresponds to bit 30 of the Flags field of the + NO-PATH-VECTOR TLV."; + reference + "RFC5440: Path Computation Element (PCE) Communication + Protocol (PCEP); + https://www.iana.org/assignments/pcep/pcep.xhtml"; } @@ -3684,20 +3690,20 @@ Internet-Draft TE Common YANG Types November 2023 } identity protocol-origin-bgp { - base protocol-origin-type; - description - "Protocol origin is Border Gateway Protocol (BGP)."; - reference "RFC9012"; - } - -Busi, et al. Expires 20 May 2024 [Page 66] +Busi, et al. Expires 27 May 2024 [Page 66] Internet-Draft TE Common YANG Types November 2023 + base protocol-origin-type; + description + "Protocol origin is Border Gateway Protocol (BGP)."; + reference "RFC9012"; + } + // CHANGE NOTE: The base identity svec-objective-function-type // and its derived identities below have been // added in this module revision @@ -3740,20 +3746,20 @@ Internet-Draft TE Common YANG Types November 2023 Computation Element Communication Protocol (PCEP)."; } - identity svec-of-minimize-common-transit-domain { - base svec-objective-function-type; - description - "Objective function for minimizing the number of common - transit domains (MCTD)."; - reference -Busi, et al. Expires 20 May 2024 [Page 67] +Busi, et al. Expires 27 May 2024 [Page 67] Internet-Draft TE Common YANG Types November 2023 + identity svec-of-minimize-common-transit-domain { + base svec-objective-function-type; + description + "Objective function for minimizing the number of common + transit domains (MCTD)."; + reference "RFC8685: Path Computation Element Communication Protocol (PCEP) Extensions for the Hierarchical Path Computation Element (H-PCE) Architecture."; @@ -3796,20 +3802,20 @@ Internet-Draft TE Common YANG Types November 2023 // its derived identities below have been // added in this module revision // RFC Editor: remove the note above and this note - identity svec-metric-type { - description - "Base identity for SVEC metric type."; - reference - "RFC5541: Encoding of Objective Functions in the Path - Computation Element Communication Protocol (PCEP)."; -Busi, et al. Expires 20 May 2024 [Page 68] +Busi, et al. Expires 27 May 2024 [Page 68] Internet-Draft TE Common YANG Types November 2023 + identity svec-metric-type { + description + "Base identity for SVEC metric type."; + reference + "RFC5541: Encoding of Objective Functions in the Path + Computation Element Communication Protocol (PCEP)."; } identity svec-metric-cumul-te { @@ -3852,20 +3858,20 @@ Internet-Draft TE Common YANG Types November 2023 base svec-metric-type; description "Load of the most loaded link."; - reference - "RFC5541: Encoding of Objective Functions in the Path - Computation Element Communication Protocol (PCEP)."; - } - /** - -Busi, et al. Expires 20 May 2024 [Page 69] +Busi, et al. Expires 27 May 2024 [Page 69] Internet-Draft TE Common YANG Types November 2023 + reference + "RFC5541: Encoding of Objective Functions in the Path + Computation Element Communication Protocol (PCEP)."; + } + + /** * TE bandwidth groupings **/ @@ -3908,20 +3914,20 @@ Internet-Draft TE Common YANG Types November 2023 is used."; container te-label { description - "Container that specifies the TE label. The choices can - be augmented for specific data-plane technologies."; - choice technology { - default "generic"; - description - "Data-plane technology type."; -Busi, et al. Expires 20 May 2024 [Page 70] +Busi, et al. Expires 27 May 2024 [Page 70] Internet-Draft TE Common YANG Types November 2023 + "Container that specifies the TE label. The choices can + be augmented for specific data-plane technologies."; + choice technology { + default "generic"; + description + "Data-plane technology type."; case generic { leaf generic { type rt-types:generalized-label; @@ -3964,20 +3970,20 @@ Internet-Draft TE Common YANG Types November 2023 leaf topology-id { type te-topology-id; default ""; - description - "When the datastore contains several topologies, - 'topology-id' distinguishes between them. If omitted, - the default (empty) string for this leaf is assumed."; - } - } -Busi, et al. Expires 20 May 2024 [Page 71] +Busi, et al. Expires 27 May 2024 [Page 71] Internet-Draft TE Common YANG Types November 2023 + description + "When the datastore contains several topologies, + 'topology-id' distinguishes between them. If omitted, + the default (empty) string for this leaf is assumed."; + } + } } /** @@ -4020,20 +4026,20 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using TE Metric Extensions - RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; - leaf two-way-delay { - type uint32 { - range "0..16777215"; - } - description -Busi, et al. Expires 20 May 2024 [Page 72] +Busi, et al. Expires 27 May 2024 [Page 72] Internet-Draft TE Common YANG Types November 2023 + RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; + leaf two-way-delay { + type uint32 { + range "0..16777215"; + } + description "Two-way delay or latency in microseconds."; } leaf two-way-delay-normality { @@ -4076,20 +4082,20 @@ Internet-Draft TE Common YANG Types November 2023 type rt-types:bandwidth-ieee-float32; units "bytes per second"; default "0x0p0"; - description - "Available bandwidth that is defined to be residual - bandwidth minus the measured bandwidth used for the - actual forwarding of non-RSVP-TE LSP packets. For a - bundled link, available bandwidth is defined to be the - sum of the component link available bandwidths."; -Busi, et al. Expires 20 May 2024 [Page 73] +Busi, et al. Expires 27 May 2024 [Page 73] Internet-Draft TE Common YANG Types November 2023 + description + "Available bandwidth that is defined to be residual + bandwidth minus the measured bandwidth used for the + actual forwarding of non-RSVP-TE LSP packets. For a + bundled link, available bandwidth is defined to be the + sum of the component link available bandwidths."; } leaf one-way-available-bandwidth-normality { type te-types:performance-metrics-normality; @@ -4132,20 +4138,20 @@ Internet-Draft TE Common YANG Types November 2023 default "0x0p0"; description "Residual bandwidth that subtracts tunnel reservations from - Maximum Bandwidth (or link capacity) (RFC 3630) and - provides an aggregated remainder across QoS classes."; - reference - "RFC 3630: Traffic Engineering (TE) Extensions to OSPF - Version 2"; - } -Busi, et al. Expires 20 May 2024 [Page 74] +Busi, et al. Expires 27 May 2024 [Page 74] Internet-Draft TE Common YANG Types November 2023 + Maximum Bandwidth (or link capacity) (RFC 3630) and + provides an aggregated remainder across QoS classes."; + reference + "RFC 3630: Traffic Engineering (TE) Extensions to OSPF + Version 2"; + } leaf one-way-available-bandwidth { type rt-types:bandwidth-ieee-float32; units "bytes per second"; @@ -4188,20 +4194,20 @@ Internet-Draft TE Common YANG Types November 2023 attributes."; uses one-way-performance-metrics; uses two-way-performance-metrics; - } - - grouping performance-metrics-attributes { - description - "Contains PM attributes."; - container performance-metrics-one-way { -Busi, et al. Expires 20 May 2024 [Page 75] +Busi, et al. Expires 27 May 2024 [Page 75] Internet-Draft TE Common YANG Types November 2023 + } + + grouping performance-metrics-attributes { + description + "Contains PM attributes."; + container performance-metrics-one-way { description "One-way link performance information in real time."; reference @@ -4244,20 +4250,20 @@ Internet-Draft TE Common YANG Types November 2023 RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; leaf one-way-delay-offset { type uint32 { - range "0..16777215"; - } - default "0"; - description - "Offset value to be added to the measured delay value."; - } -Busi, et al. Expires 20 May 2024 [Page 76] +Busi, et al. Expires 27 May 2024 [Page 76] Internet-Draft TE Common YANG Types November 2023 + range "0..16777215"; + } + default "0"; + description + "Offset value to be added to the measured delay value."; + } leaf measure-interval { type uint32; default "30"; @@ -4300,20 +4306,20 @@ Internet-Draft TE Common YANG Types November 2023 for all but the minimum-delay metric (or a lower bound for the minimum-delay metric only) and the advertised value is not already inside that bound, a 'normal' - announcement (anomalous bit cleared) will be triggered."; - } - container threshold-accelerated-advertisement { - description - "When the difference between the last advertised value and - the current measured value exceeds this threshold, an -Busi, et al. Expires 20 May 2024 [Page 77] +Busi, et al. Expires 27 May 2024 [Page 77] Internet-Draft TE Common YANG Types November 2023 + announcement (anomalous bit cleared) will be triggered."; + } + container threshold-accelerated-advertisement { + description + "When the difference between the last advertised value and + the current measured value exceeds this threshold, an 'anomalous' announcement (anomalous bit set) will be triggered."; uses performance-metrics-thresholds; @@ -4356,20 +4362,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Numbered node route hop."; reference - "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, - Section 4.3, EXPLICIT_ROUTE in RSVP-TE - RFC 3477: Signalling Unnumbered Links in Resource - ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; - } - } -Busi, et al. Expires 20 May 2024 [Page 78] +Busi, et al. Expires 27 May 2024 [Page 78] Internet-Draft TE Common YANG Types November 2023 + "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, + Section 4.3, EXPLICIT_ROUTE in RSVP-TE + RFC 3477: Signalling Unnumbered Links in Resource + ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; + } + } case numbered-link-hop { container numbered-link-hop { leaf link-tp-id { @@ -4412,20 +4418,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Link Termination Point (LTP) identifier."; } - leaf link-tp-id { - type te-tp-id; - description - "TE LTP identifier. The combination of the TE link ID - and the TE node ID is used to identify an unnumbered - TE link."; -Busi, et al. Expires 20 May 2024 [Page 79] +Busi, et al. Expires 27 May 2024 [Page 79] Internet-Draft TE Common YANG Types November 2023 + leaf link-tp-id { + type te-tp-id; + description + "TE LTP identifier. The combination of the TE link ID + and the TE node ID is used to identify an unnumbered + TE link."; } leaf node-id-uri { type nw:node-id; @@ -4468,20 +4474,20 @@ Internet-Draft TE Common YANG Types November 2023 } leaf hop-type { type te-hop-type; - default "strict"; - description - "Strict or loose hop."; - } - description - "AS explicit route hop."; -Busi, et al. Expires 20 May 2024 [Page 80] +Busi, et al. Expires 27 May 2024 [Page 80] Internet-Draft TE Common YANG Types November 2023 + default "strict"; + description + "Strict or loose hop."; + } + description + "AS explicit route hop."; } } case label { @@ -4524,20 +4530,20 @@ Internet-Draft TE Common YANG Types November 2023 } leaf node-id { type te-node-id; - description - "The identifier of a node in the TE topology."; - } - leaf-list flags { - type path-attribute-flags; - description -Busi, et al. Expires 20 May 2024 [Page 81] +Busi, et al. Expires 27 May 2024 [Page 81] Internet-Draft TE Common YANG Types November 2023 + description + "The identifier of a node in the TE topology."; + } + leaf-list flags { + type path-attribute-flags; + description "Path attributes flags."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels @@ -4580,20 +4586,20 @@ Internet-Draft TE Common YANG Types November 2023 must "(link-tp-id-uri or link-tp-id) and " + "(node-id-uri or node-id)" { description - "At least one node identifier and at least one Link - Termination Point (LTP) identifier MUST be present."; - } - leaf link-tp-id-uri { - type nt:tp-id; - description -Busi, et al. Expires 20 May 2024 [Page 82] +Busi, et al. Expires 27 May 2024 [Page 82] Internet-Draft TE Common YANG Types November 2023 + "At least one node identifier and at least one Link + Termination Point (LTP) identifier MUST be present."; + } + leaf link-tp-id-uri { + type nt:tp-id; + description "Link Termination Point (LTP) identifier."; } leaf link-tp-id { @@ -4636,20 +4642,20 @@ Internet-Draft TE Common YANG Types November 2023 case label { container label-hop { description - "Label route hop type."; - uses te-label; - leaf-list flags { - type path-attribute-flags; - description - "Path attributes flags."; -Busi, et al. Expires 20 May 2024 [Page 83] +Busi, et al. Expires 27 May 2024 [Page 83] Internet-Draft TE Common YANG Types November 2023 + "Label route hop type."; + uses te-label; + leaf-list flags { + type path-attribute-flags; + description + "Path attributes flags."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP @@ -4692,20 +4698,20 @@ Internet-Draft TE Common YANG Types November 2023 + " not(te-label/direction))" + " or " + "(../label-end/te-label/direction = te-label/direction)" - + " or " - + "(not(te-label/direction) and" - + " (../label-end/te-label/direction = 'forward'))" - + " or " - + "(not(../label-end/te-label/direction) and" - + " (te-label/direction = 'forward'))" { -Busi, et al. Expires 20 May 2024 [Page 84] +Busi, et al. Expires 27 May 2024 [Page 84] Internet-Draft TE Common YANG Types November 2023 + + " or " + + "(not(te-label/direction) and" + + " (../label-end/te-label/direction = 'forward'))" + + " or " + + "(not(../label-end/te-label/direction) and" + + " (te-label/direction = 'forward'))" { error-message "'label-start' and 'label-end' must have the " + "same direction."; } @@ -4748,20 +4754,20 @@ Internet-Draft TE Common YANG Types November 2023 case generic { leaf generic { type int32; - default "1"; - description - "Label range step."; - } - } - } -Busi, et al. Expires 20 May 2024 [Page 85] +Busi, et al. Expires 27 May 2024 [Page 85] Internet-Draft TE Common YANG Types November 2023 + default "1"; + description + "Label range step."; + } + } + } } leaf range-bitmap { type yang:hex-string; @@ -4804,20 +4810,20 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 7579: General Network Element Constraint Encoding for GMPLS-Controlled Networks"; - uses label-restriction-info; - } - } - } - - grouping optimization-metric-entry { -Busi, et al. Expires 20 May 2024 [Page 86] +Busi, et al. Expires 27 May 2024 [Page 86] Internet-Draft TE Common YANG Types November 2023 + uses label-restriction-info; + } + } + } + + grouping optimization-metric-entry { description "Optimization metrics configuration grouping."; leaf metric-type { @@ -4860,20 +4866,20 @@ Internet-Draft TE Common YANG Types November 2023 } leaf link-protection { type identityref { - base link-protection-type; - } - default "te-types:link-protection-unprotected"; - description - "Link protection type required for the links included - in the computed path."; -Busi, et al. Expires 20 May 2024 [Page 87] +Busi, et al. Expires 27 May 2024 [Page 87] Internet-Draft TE Common YANG Types November 2023 + base link-protection-type; + } + default "te-types:link-protection-unprotected"; + description + "Link protection type required for the links included + in the computed path."; reference "RFC 4202: Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -4916,20 +4922,20 @@ Internet-Draft TE Common YANG Types November 2023 type nw:network-id; description "The network topology identifier."; - } - uses te-topology-identifier; - uses common-constraints; - } - - grouping path-constraints-route-objects { -Busi, et al. Expires 20 May 2024 [Page 88] +Busi, et al. Expires 27 May 2024 [Page 88] Internet-Draft TE Common YANG Types November 2023 + } + uses te-topology-identifier; + uses common-constraints; + } + + grouping path-constraints-route-objects { description "List of route entries to be included or excluded when performing the path computation."; @@ -4972,20 +4978,20 @@ Internet-Draft TE Common YANG Types November 2023 "Route object include-exclude index. The index is used to identify an entry in the list. The order of entries is defined by the user without relying on key values."; - } - uses explicit-route-hop { - augment "type" { - case srlg { - container srlg { - description -Busi, et al. Expires 20 May 2024 [Page 89] +Busi, et al. Expires 27 May 2024 [Page 89] Internet-Draft TE Common YANG Types November 2023 + } + uses explicit-route-hop { + augment "type" { + case srlg { + container srlg { + description "SRLG container."; leaf srlg { type uint32; @@ -5028,20 +5034,20 @@ Internet-Draft TE Common YANG Types November 2023 grouping path-route-exclude-objects { description - "List of route objects to be excluded when performing - the path computation."; - list route-object-exclude-object { - key "index"; - ordered-by user; - description -Busi, et al. Expires 20 May 2024 [Page 90] +Busi, et al. Expires 27 May 2024 [Page 90] Internet-Draft TE Common YANG Types November 2023 + "List of route objects to be excluded when performing + the path computation."; + list route-object-exclude-object { + key "index"; + ordered-by user; + description "List of Explicit Route Objects to be excluded in the path computation."; leaf index { @@ -5084,20 +5090,20 @@ Internet-Draft TE Common YANG Types November 2023 key "metric-type"; description "List of TE path metric bounds."; - leaf metric-type { - type identityref { - base path-metric-type; - } - description - "Identifies an entry in the list of 'metric-type' items -Busi, et al. Expires 20 May 2024 [Page 91] +Busi, et al. Expires 27 May 2024 [Page 91] Internet-Draft TE Common YANG Types November 2023 + leaf metric-type { + type identityref { + base path-metric-type; + } + description + "Identifies an entry in the list of 'metric-type' items bound for the TE path."; } leaf upper-bound { @@ -5140,20 +5146,20 @@ Internet-Draft TE Common YANG Types November 2023 description "Container for the list of tiebreakers."; list tiebreaker { - key "tiebreaker-type"; - description - "The list of tiebreaker criteria to apply on an - equally favored set of paths, in order to pick - the best."; - leaf tiebreaker-type { -Busi, et al. Expires 20 May 2024 [Page 92] +Busi, et al. Expires 27 May 2024 [Page 92] Internet-Draft TE Common YANG Types November 2023 + key "tiebreaker-type"; + description + "The list of tiebreaker criteria to apply on an + equally favored set of paths, in order to pick + the best."; + leaf tiebreaker-type { type identityref { base path-metric-type; } @@ -5196,20 +5202,20 @@ Internet-Draft TE Common YANG Types November 2023 "List of named affinity constraints."; leaf usage { type identityref { - base resource-affinities-type; - } - description - "Identifies an entry in the list of value affinity - constraints."; - } -Busi, et al. Expires 20 May 2024 [Page 93] +Busi, et al. Expires 27 May 2024 [Page 93] Internet-Draft TE Common YANG Types November 2023 + base resource-affinities-type; + } + description + "Identifies an entry in the list of value affinity + constraints."; + } leaf value { type admin-groups; default ""; @@ -5252,20 +5258,20 @@ Internet-Draft TE Common YANG Types November 2023 "Path SRLG grouping."; container path-srlgs-lists { description - "Path SRLG properties container."; - list path-srlgs-list { - key "usage"; - description - "List of SRLG values to be included or excluded."; - leaf usage { -Busi, et al. Expires 20 May 2024 [Page 94] +Busi, et al. Expires 27 May 2024 [Page 94] Internet-Draft TE Common YANG Types November 2023 + "Path SRLG properties container."; + list path-srlgs-list { + key "usage"; + description + "List of SRLG values to be included or excluded."; + leaf usage { type identityref { base route-usage-type; } @@ -5304,24 +5310,24 @@ Internet-Draft TE Common YANG Types November 2023 } } - grouping generic-path-disjointness { - description - "Path disjointness grouping."; - leaf disjointness { - type te-path-disjointness; - description - "The type of resource disjointness. - When configured for a primary path, the disjointness level - applies to all secondary LSPs. When configured for a - secondary path, the disjointness level overrides the level + grouping generic-path-disjointness { + description + "Path disjointness grouping."; + leaf disjointness { -Busi, et al. Expires 20 May 2024 [Page 95] +Busi, et al. Expires 27 May 2024 [Page 95] Internet-Draft TE Common YANG Types November 2023 + type te-path-disjointness; + description + "The type of resource disjointness. + When configured for a primary path, the disjointness level + applies to all secondary LSPs. When configured for a + secondary path, the disjointness level overrides the level configured for the primary path."; } } @@ -5364,20 +5370,20 @@ Internet-Draft TE Common YANG Types November 2023 description "TE path metric type."; } - leaf accumulative-value { - type uint64; - description - "TE path metric accumulative value."; - } - } -Busi, et al. Expires 20 May 2024 [Page 96] +Busi, et al. Expires 27 May 2024 [Page 96] Internet-Draft TE Common YANG Types November 2023 + leaf accumulative-value { + type uint64; + description + "TE path metric accumulative value."; + } + } uses generic-path-affinities; uses generic-path-srlgs; container path-route-objects { @@ -5420,20 +5426,20 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC3945"; } - leaf switching-type { - type identityref { - base te-types:switching-capabilities; - } - description - "LSP switching type."; -Busi, et al. Expires 20 May 2024 [Page 97] +Busi, et al. Expires 27 May 2024 [Page 97] Internet-Draft TE Common YANG Types November 2023 + leaf switching-type { + type identityref { + base te-types:switching-capabilities; + } + description + "LSP switching type."; reference "RFC3945"; } @@ -5476,20 +5482,20 @@ Internet-Draft TE Common YANG Types November 2023 "WG Web: WG List: - Editor: Tarek Saad - - - Editor: Rakesh Gandhi - - -Busi, et al. Expires 20 May 2024 [Page 98] +Busi, et al. Expires 27 May 2024 [Page 98] Internet-Draft TE Common YANG Types November 2023 + Editor: Tarek Saad + + + Editor: Rakesh Gandhi + + Editor: Vishnu Pavan Beeram @@ -5532,20 +5538,20 @@ Internet-Draft TE Common YANG Types November 2023 Updated module description."; reference "RFC XXXX: Common YANG Data Types for Traffic Engineering"; - } - // RFC Editor: replace XXXX with actual RFC number, update date - // information and remove this note - - revision 2020-06-10 { - description -Busi, et al. Expires 20 May 2024 [Page 99] +Busi, et al. Expires 27 May 2024 [Page 99] Internet-Draft TE Common YANG Types November 2023 + } + // RFC Editor: replace XXXX with actual RFC number, update date + // information and remove this note + + revision 2020-06-10 { + description "Latest revision of TE MPLS types."; reference "RFC 8776: Common YANG Data Types for Traffic Engineering"; @@ -5588,20 +5594,20 @@ Internet-Draft TE Common YANG Types November 2023 "RFC2698: A Two Rate Three Color Marker"; } - identity rfc-4115-bwp { - base bandwidth-profile-type; - description - "RFC 4115 Bandwidth Profile"; - reference - "RFC4115: A Differentiated Service Two-Rate, Three-Color -Busi, et al. Expires 20 May 2024 [Page 100] +Busi, et al. Expires 27 May 2024 [Page 100] Internet-Draft TE Common YANG Types November 2023 + identity rfc-4115-bwp { + base bandwidth-profile-type; + description + "RFC 4115 Bandwidth Profile"; + reference + "RFC4115: A Differentiated Service Two-Rate, Three-Color Marker with Efficient Handling of in-Profile Traffic"; } @@ -5645,19 +5651,18 @@ Internet-Draft TE Common YANG Types November 2023 maximum value of the path delay variation that can be expressed. - Values that are larger than the maximum value SHOULD be - encoded as the maximum value."; - reference - "RFC8233: Extensions to the Path Computation Element - Communication Protocol (PCEP) to Compute Service-Aware Label - -Busi, et al. Expires 20 May 2024 [Page 101] +Busi, et al. Expires 27 May 2024 [Page 101] Internet-Draft TE Common YANG Types November 2023 + Values that are larger than the maximum value SHOULD be + encoded as the maximum value."; + reference + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label Switched Paths (LSPs); RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; @@ -5701,19 +5706,19 @@ Internet-Draft TE Common YANG Types November 2023 typedef bc-type { type uint8 { range "0..7"; - } - description - "Diffserv-TE bandwidth constraints as defined in RFC 4124."; - reference - "RFC 4124: Protocol Extensions for Support of Diffserv-aware -Busi, et al. Expires 20 May 2024 [Page 102] +Busi, et al. Expires 27 May 2024 [Page 102] Internet-Draft TE Common YANG Types November 2023 + } + description + "Diffserv-TE bandwidth constraints as defined in RFC 4124."; + reference + "RFC 4124: Protocol Extensions for Support of Diffserv-aware MPLS Traffic Engineering"; } @@ -5757,19 +5762,19 @@ Internet-Draft TE Common YANG Types November 2023 identity bc-model-type { description - "Base identity for the Diffserv-TE Bandwidth Constraints - Model type."; - reference - "RFC 4124: Protocol Extensions for Support of Diffserv-aware - MPLS Traffic Engineering"; -Busi, et al. Expires 20 May 2024 [Page 103] +Busi, et al. Expires 27 May 2024 [Page 103] Internet-Draft TE Common YANG Types November 2023 + "Base identity for the Diffserv-TE Bandwidth Constraints + Model type."; + reference + "RFC 4124: Protocol Extensions for Support of Diffserv-aware + MPLS Traffic Engineering"; } identity bc-model-rdm { @@ -5813,19 +5818,19 @@ Internet-Draft TE Common YANG Types November 2023 leaf one-way-min-delay { type uint32 { range "0..16777215"; - } - description - "One-way minimum delay or latency in microseconds."; - } - leaf one-way-min-delay-normality { -Busi, et al. Expires 20 May 2024 [Page 104] +Busi, et al. Expires 27 May 2024 [Page 104] Internet-Draft TE Common YANG Types November 2023 + } + description + "One-way minimum delay or latency in microseconds."; + } + leaf one-way-min-delay-normality { type te-types:performance-metrics-normality; default "normal"; description @@ -5869,19 +5874,19 @@ Internet-Draft TE Common YANG Types November 2023 Extensions"; } leaf one-way-packet-loss { - type decimal64 { - fraction-digits 6; - range "0..50.331642"; - } - description -Busi, et al. Expires 20 May 2024 [Page 105] +Busi, et al. Expires 27 May 2024 [Page 105] Internet-Draft TE Common YANG Types November 2023 + type decimal64 { + fraction-digits 6; + range "0..50.331642"; + } + description "One-way packet loss as a percentage of the total traffic sent over a configurable interval. The finest precision is 0.000003%, where the maximum is 50.331642%."; @@ -5925,19 +5930,19 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for - Explicitly Routed Label Switched Paths (LSPs) Using - TE Metric Extensions - RFC 8570: IS-IS Traffic Engineering (TE) Metric - Extensions"; - } -Busi, et al. Expires 20 May 2024 [Page 106] +Busi, et al. Expires 27 May 2024 [Page 106] Internet-Draft TE Common YANG Types November 2023 + Explicitly Routed Label Switched Paths (LSPs) Using + TE Metric Extensions + RFC 8570: IS-IS Traffic Engineering (TE) Metric + Extensions"; + } leaf two-way-max-delay { type uint32 { range "0..16777215"; @@ -5981,19 +5986,19 @@ Internet-Draft TE Common YANG Types November 2023 Extensions RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using - TE Metric Extensions - RFC 8570: IS-IS Traffic Engineering (TE) Metric - Extensions"; - } - leaf two-way-packet-loss { -Busi, et al. Expires 20 May 2024 [Page 107] +Busi, et al. Expires 27 May 2024 [Page 107] Internet-Draft TE Common YANG Types November 2023 + TE Metric Extensions + RFC 8570: IS-IS Traffic Engineering (TE) Metric + Extensions"; + } + leaf two-way-packet-loss { type decimal64 { fraction-digits 6; range "0..50.331642"; @@ -6037,19 +6042,19 @@ Internet-Draft TE Common YANG Types November 2023 } leaf one-way-max-delay { type uint32 { - range "0..16777215"; - } - default "0"; - description - "One-way maximum delay or latency in microseconds."; -Busi, et al. Expires 20 May 2024 [Page 108] +Busi, et al. Expires 27 May 2024 [Page 108] Internet-Draft TE Common YANG Types November 2023 + range "0..16777215"; + } + default "0"; + description + "One-way maximum delay or latency in microseconds."; } leaf one-way-delay-variation { type uint32 { @@ -6093,19 +6098,19 @@ Internet-Draft TE Common YANG Types November 2023 } leaf two-way-delay-variation { type uint32 { - range "0..16777215"; - } - default "0"; - description - "Two-way delay variation in microseconds."; -Busi, et al. Expires 20 May 2024 [Page 109] +Busi, et al. Expires 27 May 2024 [Page 109] Internet-Draft TE Common YANG Types November 2023 + range "0..16777215"; + } + default "0"; + description + "Two-way delay variation in microseconds."; } leaf two-way-packet-loss { type decimal64 { @@ -6149,19 +6154,19 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The te-packet-path-bandwidth below has been - // added in this module revision - // RFC Editor: remove the note above and this note - grouping te-packet-path-bandwidth { - description - "Path bandwidth for Packet. "; -Busi, et al. Expires 20 May 2024 [Page 110] +Busi, et al. Expires 27 May 2024 [Page 110] Internet-Draft TE Common YANG Types November 2023 + // added in this module revision + // RFC Editor: remove the note above and this note + grouping te-packet-path-bandwidth { + description + "Path bandwidth for Packet. "; leaf bandwidth-profile-name { type string; description "Name of Bandwidth Profile."; @@ -6205,19 +6210,19 @@ Internet-Draft TE Common YANG Types November 2023 "Peak Information Rate (PIR)."; } leaf pbs { - type uint64; - units "bytes"; - description - "Peak Burst Size (PBS)."; - } -Busi, et al. Expires 20 May 2024 [Page 111] +Busi, et al. Expires 27 May 2024 [Page 111] Internet-Draft TE Common YANG Types November 2023 + type uint64; + units "bytes"; + description + "Peak Burst Size (PBS)."; + } } // CHANGE NOTE: The te-packet-path-bandwidth below has been @@ -6254,6 +6259,21 @@ Internet-Draft TE Common YANG Types November 2023 This document also adds updated YANG modules to the "YANG Module Names" registry [RFC7950]: + + + + + + + + + + +Busi, et al. Expires 27 May 2024 [Page 112] + +Internet-Draft TE Common YANG Types November 2023 + + name: ietf-te-types namespace: urn:ietf:params:xml:ns:yang:ietf-te-types prefix: te-types @@ -6267,13 +6287,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC Editor: Please replace XXXX with the RFC number assigned to this document. - - -Busi, et al. Expires 20 May 2024 [Page 112] - -Internet-Draft TE Common YANG Types November 2023 - - 7. Security Considerations The YANG module specified in this document defines a schema for data @@ -6310,6 +6323,13 @@ Internet-Draft TE Common YANG Types November 2023 switching - Linear trail and subnetwork protection", ITU-T G.808.1 , May 2014. + + +Busi, et al. Expires 27 May 2024 [Page 113] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, @@ -6320,16 +6340,6 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC5440, March 2009, . - - - - - -Busi, et al. Expires 20 May 2024 [Page 113] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC5441] Vasseur, JP., Ed., Zhang, R., Bitar, N., and JL. Le Roux, "A Backward-Recursive PCE-Based Computation (BRPC) Procedure to Compute Shortest Constrained Inter-Domain @@ -6369,6 +6379,13 @@ Internet-Draft TE Common YANG Types November 2023 Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011, . + + +Busi, et al. Expires 27 May 2024 [Page 114] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC6991] Schoenwaelder, J., Ed., "Common YANG Data Types", RFC 6991, DOI 10.17487/RFC6991, July 2013, . @@ -6377,15 +6394,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7950, DOI 10.17487/RFC7950, August 2016, . - - - - -Busi, et al. Expires 20 May 2024 [Page 114] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017, . @@ -6427,21 +6435,18 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC8685, December 2019, . - [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, - "Common YANG Data Types for Traffic Engineering", - RFC 8776, DOI 10.17487/RFC8776, June 2020, - . - - - - -Busi, et al. Expires 20 May 2024 [Page 115] +Busi, et al. Expires 27 May 2024 [Page 115] Internet-Draft TE Common YANG Types November 2023 + [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, + "Common YANG Data Types for Traffic Engineering", + RFC 8776, DOI 10.17487/RFC8776, June 2020, + . + [RFC8800] Litkowski, S., Sivabalan, S., Barth, C., and M. Negi, "Path Computation Element Communication Protocol (PCEP) Extension for Label Switched Path (LSP) Diversity @@ -6479,6 +6484,20 @@ Internet-Draft TE Common YANG Types November 2023 October 2023, . + + + + + + + + + +Busi, et al. Expires 27 May 2024 [Page 116] + +Internet-Draft TE Common YANG Types November 2023 + + [I-D.ietf-teas-yang-te-mpls] Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. Bryskin, "A YANG Data Model for MPLS Traffic Engineering @@ -6491,13 +6510,6 @@ Internet-Draft TE Common YANG Types November 2023 International Telecommunication Union, "Interfaces for the optical transport network", ITU-T G.709 , June 2020. - - -Busi, et al. Expires 20 May 2024 [Page 116] - -Internet-Draft TE Common YANG Types November 2023 - - [MEF_10.3] MEF, "Ethernet Services Attributes Phase 3", MEF 10.3 , October 2013. @@ -6534,6 +6546,14 @@ Internet-Draft TE Common YANG Types November 2023 (RSVP-TE)", RFC 3477, DOI 10.17487/RFC3477, January 2003, . + + + +Busi, et al. Expires 27 May 2024 [Page 117] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC3630] Katz, D., Kompella, K., and D. Yeung, "Traffic Engineering (TE) Extensions to OSPF Version 2", RFC 3630, DOI 10.17487/RFC3630, September 2003, @@ -6543,17 +6563,6 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC3688, January 2004, . - - - - - - -Busi, et al. Expires 20 May 2024 [Page 117] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC3785] Le Faucheur, F., Uppili, R., Vedrenne, A., Merckx, P., and T. Telkamp, "Use of Interior Gateway Protocol (IGP) Metric as a second MPLS Traffic Engineering (TE) Metric", BCP 87, @@ -6591,6 +6600,16 @@ Internet-Draft TE Common YANG Types November 2023 RFC 4127, DOI 10.17487/RFC4127, June 2005, . + + + + + +Busi, et al. Expires 27 May 2024 [Page 118] + +Internet-Draft TE Common YANG Types November 2023 + + [RFC4202] Kompella, K., Ed. and Y. Rekhter, Ed., "Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 4202, DOI 10.17487/RFC4202, October 2005, @@ -6601,15 +6620,6 @@ Internet-Draft TE Common YANG Types November 2023 (GMPLS)", RFC 4203, DOI 10.17487/RFC4203, October 2005, . - - - - -Busi, et al. Expires 20 May 2024 [Page 118] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC4328] Papadimitriou, D., Ed., "Generalized Multi-Protocol Label Switching (GMPLS) Signaling Extensions for G.709 Optical Transport Networks Control", RFC 4328, @@ -6648,24 +6658,21 @@ Internet-Draft TE Common YANG Types November 2023 "GMPLS Segment Recovery", RFC 4873, DOI 10.17487/RFC4873, May 2007, . - [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. - Yasukawa, Ed., "Extensions to Resource Reservation - Protocol - Traffic Engineering (RSVP-TE) for Point-to- - Multipoint TE Label Switched Paths (LSPs)", RFC 4875, - DOI 10.17487/RFC4875, May 2007, - . - - - - -Busi, et al. Expires 20 May 2024 [Page 119] +Busi, et al. Expires 27 May 2024 [Page 119] Internet-Draft TE Common YANG Types November 2023 + [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. + Yasukawa, Ed., "Extensions to Resource Reservation + Protocol - Traffic Engineering (RSVP-TE) for Point-to- + Multipoint TE Label Switched Paths (LSPs)", RFC 4875, + DOI 10.17487/RFC4875, May 2007, + . + [RFC4920] Farrel, A., Ed., Satyanarayana, A., Iwata, A., Fujita, N., and G. Ash, "Crankback Signaling Extensions for MPLS and GMPLS RSVP-TE", RFC 4920, DOI 10.17487/RFC4920, July 2007, @@ -6708,20 +6715,19 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC5712, January 2010, . - [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, - D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol - Extensions for Multi-Layer and Multi-Region Networks (MLN/ - MRN)", RFC 6001, DOI 10.17487/RFC6001, October 2010, - . - - -Busi, et al. Expires 20 May 2024 [Page 120] +Busi, et al. Expires 27 May 2024 [Page 120] Internet-Draft TE Common YANG Types November 2023 + [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, + D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol + Extensions for Multi-Layer and Multi-Region Networks (MLN/ + MRN)", RFC 6001, DOI 10.17487/RFC6001, October 2010, + . + [RFC6004] Berger, L. and D. Fedyk, "Generalized MPLS (GMPLS) Support for Metro Ethernet Forum and G.8011 Ethernet Service Switching", RFC 6004, DOI 10.17487/RFC6004, October 2010, @@ -6762,22 +6768,22 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC6827, January 2013, . - [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., - and K. Pithewan, "GMPLS Signaling Extensions for Control - of Evolving G.709 Optical Transport Networks", RFC 7139, - DOI 10.17487/RFC7139, March 2014, - . - -Busi, et al. Expires 20 May 2024 [Page 121] +Busi, et al. Expires 27 May 2024 [Page 121] Internet-Draft TE Common YANG Types November 2023 + [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., + and K. Pithewan, "GMPLS Signaling Extensions for Control + of Evolving G.709 Optical Transport Networks", RFC 7139, + DOI 10.17487/RFC7139, March 2014, + . + [RFC7260] Takacs, A., Fedyk, D., and J. He, "GMPLS RSVP-TE Extensions for Operations, Administration, and Maintenance (OAM) Configuration", RFC 7260, DOI 10.17487/RFC7260, June @@ -6821,19 +6827,19 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7823, DOI 10.17487/RFC7823, May 2016, . - [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., - Hartley, M., and Z. Ali, "RSVP-TE Extensions for - Collecting Shared Risk Link Group (SRLG) Information", - RFC 8001, DOI 10.17487/RFC8001, January 2017, - . - -Busi, et al. Expires 20 May 2024 [Page 122] +Busi, et al. Expires 27 May 2024 [Page 122] Internet-Draft TE Common YANG Types November 2023 + [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., + Hartley, M., and Z. Ali, "RSVP-TE Extensions for + Collecting Shared Risk Link Group (SRLG) Information", + RFC 8001, DOI 10.17487/RFC8001, January 2017, + . + [RFC8149] Saad, T., Ed., Gandhi, R., Ed., Ali, Z., Venator, R., and Y. Kamite, "RSVP Extensions for Reoptimization of Loosely Routed Point-to-Multipoint Traffic Engineering Label @@ -6877,19 +6883,17 @@ A.1. TE Types YANG Diffs of the YANG model in Section 4 to the changes compared with the YANG model in [RFC8776]. - This diff has been generated using the following UNIX commands to - compare the YANG module revisions in section 3.1 of [RFC8776] and in - Section 4: - - - -Busi, et al. Expires 20 May 2024 [Page 123] +Busi, et al. Expires 27 May 2024 [Page 123] Internet-Draft TE Common YANG Types November 2023 + This diff has been generated using the following UNIX commands to + compare the YANG module revisions in section 3.1 of [RFC8776] and in + Section 4: + diff ietf-te-types@2020-06-10.yang ietf-te-types.yang > model-diff.txt sed 's/^/ /' model-diff.txt > model-diff-spaces.txt @@ -6934,18 +6938,18 @@ Internet-Draft TE Common YANG Types November 2023 > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; - > - identity tunnel-admin-state-auto; - > - identity lsp-restoration-restore-none; - > - base identity path-computation-error-reason and - > its derived identities; -Busi, et al. Expires 20 May 2024 [Page 124] +Busi, et al. Expires 27 May 2024 [Page 124] Internet-Draft TE Common YANG Types November 2023 + > - identity tunnel-admin-state-auto; + > - identity lsp-restoration-restore-none; + > - base identity path-computation-error-reason and + > its derived identities; > - base identity protocol-origin-type and > its derived identities; > - base identity svec-objective-function-type and its derived @@ -6990,18 +6994,18 @@ Internet-Draft TE Common YANG Types November 2023 > "Indicates that the TE path is a secondary reverse path."; > } > } - > description - > "The type of TE path, indicating whether a path is a primary, - > or a reverse primary, or a secondary, or a reverse secondary - > path."; -Busi, et al. Expires 20 May 2024 [Page 125] +Busi, et al. Expires 27 May 2024 [Page 125] Internet-Draft TE Common YANG Types November 2023 + > description + > "The type of TE path, indicating whether a path is a primary, + > or a reverse primary, or a secondary, or a reverse secondary + > path."; > } > 606a677,684 @@ -7046,18 +7050,18 @@ Internet-Draft TE Common YANG Types November 2023 < consumption."; --- > consumption."; - 1023c1123 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; -Busi, et al. Expires 20 May 2024 [Page 126] +Busi, et al. Expires 27 May 2024 [Page 126] Internet-Draft TE Common YANG Types November 2023 + 1023c1123 + < Computation Element Communication Protocol (PCEP)"; + --- + > Computation Element Communication Protocol (PCEP)"; 1025a1126,1128 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision @@ -7102,18 +7106,18 @@ Internet-Draft TE Common YANG Types November 2023 > } > 1628a1758,1761 - > // cCHANGE NOTE: The description and reference of the - > // identity action-exercise have been updated in this module - > // revision - > // RFC Editor: remove the note above and this note -Busi, et al. Expires 20 May 2024 [Page 127] +Busi, et al. Expires 27 May 2024 [Page 127] Internet-Draft TE Common YANG Types November 2023 + > // cCHANGE NOTE: The description and reference of the + > // identity action-exercise have been updated in this module + > // revision + > // RFC Editor: remove the note above and this note 1632,1633c1765,1767 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any @@ -7158,18 +7162,18 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Path computation has failed because one or more dependent > path computation servers are unavailable. - > - > The dependent path computation server could be - > a Backward-Recursive Path Computation (BRPC) downstream - > PCE or a child PCE."; -Busi, et al. Expires 20 May 2024 [Page 128] +Busi, et al. Expires 27 May 2024 [Page 128] Internet-Draft TE Common YANG Types November 2023 + > + > The dependent path computation server could be + > a Backward-Recursive Path Computation (BRPC) downstream + > PCE or a child PCE."; > reference > "RFC5441, RFC8685"; > } @@ -7214,18 +7218,18 @@ Internet-Draft TE Common YANG Types November 2023 > "Path computation has failed because there is no > available resource in one or more domains. > - > It corresponds to bit 20 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; -Busi, et al. Expires 20 May 2024 [Page 129] +Busi, et al. Expires 27 May 2024 [Page 129] Internet-Draft TE Common YANG Types November 2023 + > It corresponds to bit 20 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC8685; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7270,18 +7274,18 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC8306; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-gco-migration { - > base path-computation-error-reason; -Busi, et al. Expires 20 May 2024 [Page 130] +Busi, et al. Expires 27 May 2024 [Page 130] Internet-Draft TE Common YANG Types November 2023 + > } + > + > identity path-computation-error-no-gco-migration { + > base path-computation-error-reason; > description > "Path computation has failed because of no Global Concurrent > Optimization (GCO) migration path found. @@ -7326,18 +7330,18 @@ Internet-Draft TE Common YANG Types November 2023 > base path-computation-error-no-dependent-server; > description > "Path computation has failed because PCE BRPC chain - > unavailable. - > - > It corresponds to bit 28 of the Flags field of the - > NO-PATH-VECTOR TLV."; -Busi, et al. Expires 20 May 2024 [Page 131] +Busi, et al. Expires 27 May 2024 [Page 131] Internet-Draft TE Common YANG Types November 2023 + > unavailable. + > + > It corresponds to bit 28 of the Flags field of the + > NO-PATH-VECTOR TLV."; > reference > "RFC5441; > @@ -7382,18 +7386,18 @@ Internet-Draft TE Common YANG Types November 2023 > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } - > - > // CHANGE NOTE: The base identity protocol-origin-type and - > // its derived identities below have been - > // added in this module revision -Busi, et al. Expires 20 May 2024 [Page 132] +Busi, et al. Expires 27 May 2024 [Page 132] Internet-Draft TE Common YANG Types November 2023 + > + > // CHANGE NOTE: The base identity protocol-origin-type and + > // its derived identities below have been + > // added in this module revision > // RFC Editor: remove the note above and this note > identity protocol-origin-type { > description @@ -7438,18 +7442,18 @@ Internet-Draft TE Common YANG Types November 2023 > base svec-objective-function-type; > description > "Objective function for minimizing aggregate bandwidth - > consumption (MBC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; -Busi, et al. Expires 20 May 2024 [Page 133] +Busi, et al. Expires 27 May 2024 [Page 133] Internet-Draft TE Common YANG Types November 2023 + > consumption (MBC)."; + > reference + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; > } > > identity svec-of-minimize-load-most-loaded-link { @@ -7494,18 +7498,18 @@ Internet-Draft TE Common YANG Types November 2023 > Element (H-PCE) Architecture."; > } > - > identity svec-of-minimize-shared-srlg { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared -Busi, et al. Expires 20 May 2024 [Page 134] +Busi, et al. Expires 27 May 2024 [Page 134] Internet-Draft TE Common YANG Types November 2023 + > identity svec-of-minimize-shared-srlg { + > base svec-objective-function-type; + > description + > "Objective function for minimizing the number of shared > Shared Risk Link Groups (SRLG) (MSS)."; > reference > "RFC8685: Path Computation Element Communication Protocol @@ -7550,18 +7554,18 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Cumulative IGP cost."; > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > -Busi, et al. Expires 20 May 2024 [Page 135] +Busi, et al. Expires 27 May 2024 [Page 135] Internet-Draft TE Common YANG Types November 2023 + > "RFC5541: Encoding of Objective Functions in the Path + > Computation Element Communication Protocol (PCEP)."; + > } + > > identity svec-metric-cumul-hop { > base svec-metric-type; > description @@ -7606,18 +7610,18 @@ Internet-Draft TE Common YANG Types November 2023 > "(node-id-uri or node-id)" { > description > "At least one node identifier and at least one Link - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; -Busi, et al. Expires 20 May 2024 [Page 136] +Busi, et al. Expires 27 May 2024 [Page 136] Internet-Draft TE Common YANG Types November 2023 + > Termination Point (LTP) identifier MUST be present."; + > } + > leaf link-tp-id-uri { + > type nt:tp-id; > description > "Link Termination Point (LTP) identifier."; > } @@ -7662,18 +7666,18 @@ Internet-Draft TE Common YANG Types November 2023 > leaf node-id-uri { > type nw:node-id; > description - > "The identifier of a node in the topology."; - > } - 2968a3545,3549 - > leaf network-id { -Busi, et al. Expires 20 May 2024 [Page 137] +Busi, et al. Expires 27 May 2024 [Page 137] Internet-Draft TE Common YANG Types November 2023 + > "The identifier of a node in the topology."; + > } + 2968a3545,3549 + > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; @@ -7718,18 +7722,18 @@ A.2. Packet TE Types YANG Diffs This section provides the diff between the YANG module in section 3.2 of [RFC8776] and the YANG model revision in Section 5. - The intention of this appendix is to facilitate focusing the review - of the YANG model in Section 5 to the changes compared with the YANG - model in [RFC8776]. - -Busi, et al. Expires 20 May 2024 [Page 138] +Busi, et al. Expires 27 May 2024 [Page 138] Internet-Draft TE Common YANG Types November 2023 + The intention of this appendix is to facilitate focusing the review + of the YANG model in Section 5 to the changes compared with the YANG + model in [RFC8776]. + This diff has been generated using the following UNIX commands to compare the YANG module revisions in section 3.2 of [RFC8776] and in Section 5: @@ -7774,18 +7778,18 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Added common TE packet identities: > - bandwidth-profile-type. - > - > Added common TE packet groupings: - > - te-packet-path-bandwidth; - > - te-packet-link-bandwidth."; -Busi, et al. Expires 20 May 2024 [Page 139] +Busi, et al. Expires 27 May 2024 [Page 139] Internet-Draft TE Common YANG Types November 2023 + > + > Added common TE packet groupings: + > - te-packet-path-bandwidth; + > - te-packet-link-bandwidth."; > reference > "RFC XXXX: Updated Common YANG Data Types for Traffic > Engineering"; @@ -7830,18 +7834,18 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC 2698 Bandwidth Profile"; > reference > "RFC2698: A Two Rate Three Color Marker"; - > } - > - > identity rfc-4115-bwp { - > base bandwidth-profile-type; -Busi, et al. Expires 20 May 2024 [Page 140] +Busi, et al. Expires 27 May 2024 [Page 140] Internet-Draft TE Common YANG Types November 2023 + > } + > + > identity rfc-4115-bwp { + > base bandwidth-profile-type; > description > "RFC 4115 Bandwidth Profile"; > reference @@ -7886,18 +7890,18 @@ Internet-Draft TE Common YANG Types November 2023 > type uint64; > units "bits/second"; > mandatory true; - > description - > "Committed Burst Size (CBS)."; - > } - > leaf eir { -Busi, et al. Expires 20 May 2024 [Page 141] +Busi, et al. Expires 27 May 2024 [Page 141] Internet-Draft TE Common YANG Types November 2023 + > description + > "Committed Burst Size (CBS)."; + > } + > leaf eir { > type uint64; > units "bits/second"; > description @@ -7943,17 +7947,15 @@ Appendix B. Option Considered for updating RFC8776 published in [RFC8776] without delaying too much the progress of the mature WG documents. - Three possible options have been identified to address this concern. - - - -Busi, et al. Expires 20 May 2024 [Page 142] +Busi, et al. Expires 27 May 2024 [Page 142] Internet-Draft TE Common YANG Types November 2023 + Three possible options have been identified to address this concern. + One option is to keep these definitions in the YANG modules where they have initially been defined: other YANG modules can still import them. The drawback of this approach is that it defeating the value @@ -8003,9 +8005,7 @@ Internet-Draft TE Common YANG Types November 2023 - - -Busi, et al. Expires 20 May 2024 [Page 143] +Busi, et al. Expires 27 May 2024 [Page 143] Internet-Draft TE Common YANG Types November 2023 @@ -8061,4 +8061,4 @@ Authors' Addresses -Busi, et al. Expires 20 May 2024 [Page 144] +Busi, et al. Expires 27 May 2024 [Page 144] diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml index 60beaba..2de7fc2 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml @@ -48,7 +48,7 @@ - + TEAS Working Group @@ -401,12 +401,16 @@ appear in all capitals, as shown here. A base YANG identity for supported interface switching capabilities as defined in .
-resource-affinities-type: -exx -> A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in and . +resource-affinities-type: + +
  • + A base YANG identity for supported attribute filters associated with a tunnel that must be satisfied for a link to be acceptable as defined in and . +
CHANGE NOTE: The description of the path-metric-type has been updated +RFC Editor: remove the CHANGE NOTE above and this note + path-metric-type:
  • @@ -414,7 +418,7 @@ exx
  • - Since the unit of the path metric value is interpreted in the context of the path metric type, derived identities SHOULD describe the unit and maximum value of the path metric types they define. + The unit of the path metric value is interpreted in the context of the path metric type. The derived identities SHOULD describe the unit and maximum value of the path metric types they define.
  • @@ -612,7 +616,7 @@ exx RFC Editor: remove the CHANGE NOTE above and this note -
    diff --git a/ietf-te-types.yang b/ietf-te-types.yang index 2614b2e..e0f7154 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -75,7 +75,7 @@ module ietf-te-types { 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."; - revision 2023-11-17 { + revision 2023-11-24 { description "Added: - base identity lsp-provisioning-error-reason; @@ -1475,7 +1475,7 @@ module ietf-te-types { description "Restoration LSP is computed after the failure detection. - This restoration schema is also known as + This restoration scheme is also known as 'Full LSP Re-routing.'"; reference "RFC 4427: Recovery (Protection and Restoration) Terminology From 45a8d17121576e4fcd38b152a6aaf776d1ae3dd2 Mon Sep 17 00:00:00 2001 From: italobusi Date: Fri, 19 Jan 2024 19:15:39 +0100 Subject: [PATCH 07/10] Updated typedef te-node-id Added support also for 16 octects TE identifiers (formatted as IPv6 addresses): fix #129 --- ietf-te-types.yang | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ietf-te-types.yang b/ietf-te-types.yang index e0f7154..51bd4c5 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -94,7 +94,8 @@ module ietf-te-types { Updated: - description of the base identity objective-function-type; - - description and reference of identity action-exercise. + - description and reference of identity action-exercise; + - typedef te-node-id to support also 16 octects TE identifiers. Obsoleted: - identity of-minimize-agg-bandwidth-consumption; @@ -393,25 +394,36 @@ module ietf-te-types { } typedef te-node-id { - type yang:dotted-quad; + type union { + type yang:dotted-quad; + type inet:ipv6-address-no-zone; + } description "A type representing the identifier for a node in a TE topology. - The identifier is represented as 4 octets in dotted-quad - notation. + + The identifier is represented either as 4 octets in + dotted-quad notation or 16 octets in full, mixed, shortened, + or shortened-mixed IPv6 address notation. + This attribute MAY be mapped to the Router Address TLV described in Section 2.4.1 of RFC 3630, the TE Router ID described in Section 3 of RFC 6827, the Traffic Engineering - Router ID TLV described in Section 4.3 of RFC 5305, or the - TE Router ID TLV described in Section 3.2.1 of RFC 6119. + Router ID TLV described in Section 4.3 of RFC 5305, the TE + Router ID TLV described in Section 3.2.1 of RFC 6119, or the + IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. + The reachability of such a TE node MAY be achieved by a mechanism such as that described in Section 6.2 of RFC 6827."; reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2, Section 2.4.1 + RFC 5305: IS-IS Extensions for Traffic Engineering, Section 4.3 + RFC 6119: IPv6 Traffic Engineering in IS-IS, Section 3.2.1 + RFC 6827: Automatically Switched Optical Network (ASON) Routing for OSPFv2 Protocols, Section 3"; } From de3bfb16abbb3eb7a292357c2d9813807b9dbea0 Mon Sep 17 00:00:00 2001 From: italobusi Date: Thu, 25 Jan 2024 18:00:30 +0100 Subject: [PATCH 08/10] Renamed container explicit-route-objects-always Container explicit-route-objects-always renamed as explicit-route-objects: fix #254 --- .../draft-ietf-teas-rfc8776-update.md | 2 +- .../draft-ietf-teas-rfc8776-update.txt | 2208 +++++++++-------- .../draft-ietf-teas-rfc8776-update.xml | 1572 ++++++------ ietf-te-types.yang | 9 +- 4 files changed, 1934 insertions(+), 1857 deletions(-) diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md index 3eb907b..5f4881e 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md @@ -471,7 +471,7 @@ RFC Editor: remove the CHANGE NOTE above and this note {::include ../../ietf-te-types.yang} ~~~~ {: #fig-te-yang title="TE Types YANG module" -sourcecode-markers="true" sourcecode-name="ietf-te-types@2023-11-24.yang"} +sourcecode-markers="true" sourcecode-name="ietf-te-types@2024-01-25.yang"} {: #pkt-yang-code} diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt index d577e1b..556ff7d 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt @@ -6,13 +6,13 @@ TEAS Working Group I. Busi Internet-Draft Huawei Obsoletes: 8776 (if approved) A. Guo Intended status: Standards Track Futurewei Technologies -Expires: 27 May 2024 X. Liu +Expires: 28 July 2024 X. Liu Alef Edge T. Saad Cisco Systems Inc. I. Bryskin Individual - 24 November 2023 + 25 January 2024 Common YANG Data Types for Traffic Engineering @@ -41,11 +41,11 @@ Status of This Memo time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - This Internet-Draft will expire on 27 May 2024. + This Internet-Draft will expire on 28 July 2024. Copyright Notice - Copyright (c) 2023 IETF Trust and the persons identified as the + Copyright (c) 2024 IETF Trust and the persons identified as the document authors. All rights reserved. @@ -53,9 +53,9 @@ Copyright Notice -Busi, et al. Expires 27 May 2024 [Page 1] +Busi, et al. Expires 28 July 2024 [Page 1] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 This document is subject to BCP 78 and the IETF Trust's Legal @@ -83,13 +83,13 @@ Table of Contents 5. Packet TE Types YANG Module . . . . . . . . . . . . . . . . . 98 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 112 7. Security Considerations . . . . . . . . . . . . . . . . . . . 113 - 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 113 - 8.1. Normative References . . . . . . . . . . . . . . . . . . 113 + 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 114 + 8.1. Normative References . . . . . . . . . . . . . . . . . . 114 8.2. Informative References . . . . . . . . . . . . . . . . . 116 - Appendix A. Changes from RFC 8776 . . . . . . . . . . . . . . . 123 - A.1. TE Types YANG Diffs . . . . . . . . . . . . . . . . . . . 123 - A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 138 - Appendix B. Option Considered for updating RFC8776 . . . . . . . 142 + Appendix A. Changes from RFC 8776 . . . . . . . . . . . . . . . 124 + A.1. TE Types YANG Diffs . . . . . . . . . . . . . . . . . . . 124 + A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 139 + Appendix B. Option Considered for updating RFC8776 . . . . . . . 143 Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 144 Contributors . . . . . . . . . . . . . . . . . . . . . . . . . . 144 Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 144 @@ -109,9 +109,9 @@ Table of Contents -Busi, et al. Expires 27 May 2024 [Page 2] +Busi, et al. Expires 28 July 2024 [Page 2] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 This document introduces a collection of common data types derived @@ -165,9 +165,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 3] +Busi, et al. Expires 28 July 2024 [Page 3] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 +=================+======================+===========+ @@ -221,9 +221,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 4] +Busi, et al. Expires 28 July 2024 [Page 4] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 DS-TE: @@ -277,9 +277,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 5] +Busi, et al. Expires 28 July 2024 [Page 5] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 te-bandwidth: @@ -333,9 +333,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 6] +Busi, et al. Expires 28 July 2024 [Page 6] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 A type representing the identifier for a node in a TE topology. @@ -389,9 +389,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 7] +Busi, et al. Expires 28 July 2024 [Page 7] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 path-attribute-flags: @@ -445,9 +445,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 8] +Busi, et al. Expires 28 July 2024 [Page 8] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 minimize-agg-bandwidth-consumption, of-minimize-load-most-loaded-link @@ -501,9 +501,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 9] +Busi, et al. Expires 28 July 2024 [Page 9] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 For example, the bound of the 'path-metric-loss', defined in @@ -557,9 +557,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 10] +Busi, et al. Expires 28 July 2024 [Page 10] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 This is a common grouping to define the LSP encoding and switching @@ -613,9 +613,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 11] +Busi, et al. Expires 28 July 2024 [Page 11] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 The "ietf-te-packet-types" module contains the following YANG @@ -669,9 +669,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 12] +Busi, et al. Expires 28 July 2024 [Page 12] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 A YANG grouping that defines the path bandwidth information and @@ -725,9 +725,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 13] +Busi, et al. Expires 28 July 2024 [Page 13] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 CHANGE NOTE: Please focus your review only on the updates to the YANG @@ -735,7 +735,7 @@ Internet-Draft TE Common YANG Types November 2023 RFC Editor: remove the CHANGE NOTE above and this note - file "ietf-te-types@2023-11-24.yang" + file "ietf-te-types@2024-01-25.yang" module ietf-te-types { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-te-types"; @@ -781,9 +781,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 14] +Busi, et al. Expires 28 July 2024 [Page 14] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 @@ -821,7 +821,7 @@ Internet-Draft TE Common YANG Types November 2023 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."; - revision 2023-11-24 { + revision 2023-11-25e { description "Added: - base identity lsp-provisioning-error-reason; @@ -837,9 +837,9 @@ Internet-Draft TE Common YANG Types November 2023 -Busi, et al. Expires 27 May 2024 [Page 15] +Busi, et al. Expires 28 July 2024 [Page 15] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 identities; @@ -848,14 +848,18 @@ Internet-Draft TE Common YANG Types November 2023 Updated: - description of the base identity objective-function-type; - - description and reference of identity action-exercise. + - description and reference of identity action-exercise; + - typedef te-node-id to support also 16 octects TE identifiers. Obsoleted: - identity of-minimize-agg-bandwidth-consumption; - identity of-minimize-load-most-loaded-link; - identity of-minimize-cost-path-set; - identity lsp-protection-reroute-extra; - - identity lsp-protection-reroute."; + - identity lsp-protection-reroute. + + Container explicit-route-objects-always renamed as + explicit-route-objects."; reference "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } @@ -886,18 +890,18 @@ Internet-Draft TE Common YANG Types November 2023 configured value may be omitted for brevity."; reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF - Version 2 - RFC 5305: IS-IS Extensions for Traffic Engineering - RFC 7308: Extended Administrative Groups in MPLS Traffic - Engineering (MPLS-TE)"; -Busi, et al. Expires 27 May 2024 [Page 16] +Busi, et al. Expires 28 July 2024 [Page 16] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + Version 2 + RFC 5305: IS-IS Extensions for Traffic Engineering + RFC 7308: Extended Administrative Groups in MPLS Traffic + Engineering (MPLS-TE)"; } typedef admin-groups { @@ -942,18 +946,18 @@ Internet-Draft TE Common YANG Types November 2023 description "Unknown."; } - enum normal { - value 1; - description - "Normal. Indicates that the anomalous bit is not set."; -Busi, et al. Expires 27 May 2024 [Page 17] +Busi, et al. Expires 28 July 2024 [Page 17] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + enum normal { + value 1; + description + "Normal. Indicates that the anomalous bit is not set."; } enum abnormal { value 2; @@ -998,18 +1002,18 @@ Internet-Draft TE Common YANG Types November 2023 "In some test mode."; } enum preparing-maintenance { - description - "The resource is disabled in the control plane to prepare - for a graceful shutdown for maintenance purposes."; - reference -Busi, et al. Expires 27 May 2024 [Page 18] +Busi, et al. Expires 28 July 2024 [Page 18] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + description + "The resource is disabled in the control plane to prepare + for a graceful shutdown for maintenance purposes."; + reference "RFC 5817: Graceful Shutdown in MPLS and Generalized MPLS Traffic Engineering Networks"; } @@ -1054,18 +1058,18 @@ Internet-Draft TE Common YANG Types November 2023 For the Optical Transport Network (OTN) switching type, a list of integers can be used, such as '0,2,3,1', indicating two ODU0s and one ODU3. ('ODU' stands for 'Optical Data - Unit'.) For Dense Wavelength Division Multiplexing (DWDM), - a list of pairs of slot numbers and widths can be used, - such as '0,2,3,3', indicating a frequency slot 0 with - slot width 2 and a frequency slot 3 with slot width 3. -Busi, et al. Expires 27 May 2024 [Page 19] +Busi, et al. Expires 28 July 2024 [Page 19] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + Unit'.) For Dense Wavelength Division Multiplexing (DWDM), + a list of pairs of slot numbers and widths can be used, + such as '0,2,3,3', indicating a frequency slot 0 with + slot width 2 and a frequency slot 3 with slot width 3. Canonically, the string is represented as all lowercase and in hex, where the prefix '0x' precedes the hex number."; reference @@ -1110,18 +1114,18 @@ Internet-Draft TE Common YANG Types November 2023 "A strict hop in an explicit path."; } } - description - "Enumerated type for specifying loose or strict paths."; - reference - "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, -Busi, et al. Expires 27 May 2024 [Page 20] +Busi, et al. Expires 28 July 2024 [Page 20] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + description + "Enumerated type for specifying loose or strict paths."; + reference + "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, Section 4.3.3"; } @@ -1166,18 +1170,18 @@ Internet-Draft TE Common YANG Types November 2023 "The explicit route represents an incoming link on a node."; } - enum outgoing { - description - "The explicit route represents an outgoing link on - a node."; -Busi, et al. Expires 27 May 2024 [Page 21] +Busi, et al. Expires 28 July 2024 [Page 21] -Internet-Draft TE Common YANG Types November 2023 +Internet-Draft TE Common YANG Types January 2024 + enum outgoing { + description + "The explicit route represents an outgoing link on + a node."; } } description @@ -1195,25 +1199,43 @@ Internet-Draft TE Common YANG Types November 2023 } typedef te-node-id { - type yang:dotted-quad; + type union { + type yang:dotted-quad; + type inet:ipv6-address-no-zone; + } description "A type representing the identifier for a node in a TE topology. - The identifier is represented as 4 octets in dotted-quad - notation. + + The identifier is represented either as 4 octets in + dotted-quad notation or 16 octets in full, mixed, shortened, + or shortened-mixed IPv6 address notation. + This attribute MAY be mapped to the Router Address TLV described in Section 2.4.1 of RFC 3630, the TE Router ID described in Section 3 of RFC 6827, the Traffic Engineering - Router ID TLV described in Section 4.3 of RFC 5305, or the - TE Router ID TLV described in Section 3.2.1 of RFC 6119. + Router ID TLV described in Section 4.3 of RFC 5305, the TE + Router ID TLV described in Section 3.2.1 of RFC 6119, or the + IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. + The reachability of such a TE node MAY be achieved by a mechanism such as that described in Section 6.2 of RFC 6827."; reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF Version 2, Section 2.4.1 + RFC 5305: IS-IS Extensions for Traffic Engineering, Section 4.3 + + + +Busi, et al. Expires 28 July 2024 [Page 22] + +Internet-Draft TE Common YANG Types January 2024 + + RFC 6119: IPv6 Traffic Engineering in IS-IS, Section 3.2.1 + RFC 6827: Automatically Switched Optical Network (ASON) Routing for OSPFv2 Protocols, Section 3"; } @@ -1226,14 +1248,6 @@ Internet-Draft TE Common YANG Types November 2023 } typedef te-admin-status { - - - -Busi, et al. Expires 27 May 2024 [Page 22] - -Internet-Draft TE Common YANG Types November 2023 - - type te-common-status; description "Defines a type representing the administrative status of @@ -1268,6 +1282,14 @@ Internet-Draft TE Common YANG Types November 2023 typedef te-recovery-status { type enumeration { enum normal { + + + +Busi, et al. Expires 28 July 2024 [Page 23] + +Internet-Draft TE Common YANG Types January 2024 + + description "Both the recovery span and the working span are fully allocated and active, data traffic is being @@ -1282,14 +1304,6 @@ Internet-Draft TE Common YANG Types November 2023 description "The recovery action has succeeded. The working span has reported a failure/degrade condition, and the user traffic - - - -Busi, et al. Expires 27 May 2024 [Page 23] - -Internet-Draft TE Common YANG Types November 2023 - - is being transported (or selected) on the recovery span."; } enum recovery-failed { @@ -1324,6 +1338,14 @@ Internet-Draft TE Common YANG Types November 2023 "The recovery domain is recovering from a failure/degrade condition on the working span that is being controlled by the Wait-to-Restore (WTR) timer."; + + + +Busi, et al. Expires 28 July 2024 [Page 24] + +Internet-Draft TE Common YANG Types January 2024 + + } } description @@ -1338,14 +1360,6 @@ Internet-Draft TE Common YANG Types November 2023 type string { pattern '/?([a-zA-Z0-9\-_.]+)(/[a-zA-Z0-9\-_.]+)*'; } - - - -Busi, et al. Expires 27 May 2024 [Page 24] - -Internet-Draft TE Common YANG Types November 2023 - - description "A type for the name of a TE node template or TE link template."; @@ -1380,6 +1394,14 @@ Internet-Draft TE Common YANG Types November 2023 // empty string } type string { + + + +Busi, et al. Expires 28 July 2024 [Page 25] + +Internet-Draft TE Common YANG Types January 2024 + + pattern '([a-zA-Z0-9\-_.]+:)*' + '/?([a-zA-Z0-9\-_.]+)(/[a-zA-Z0-9\-_.]+)*'; } @@ -1395,13 +1417,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 8345: A YANG Data Model for Network Topologies"; } - - -Busi, et al. Expires 27 May 2024 [Page 25] - -Internet-Draft TE Common YANG Types November 2023 - - typedef te-tp-id { type union { type uint32; @@ -1435,6 +1450,14 @@ Internet-Draft TE Common YANG Types November 2023 enum primary-reverse-path { description "Indicates that the TE path is a primary reverse path."; + + + +Busi, et al. Expires 28 July 2024 [Page 26] + +Internet-Draft TE Common YANG Types January 2024 + + } enum secondary-reverse-path { description @@ -1450,14 +1473,6 @@ Internet-Draft TE Common YANG Types November 2023 /* TE features */ feature p2mp-te { - - - -Busi, et al. Expires 27 May 2024 [Page 26] - -Internet-Draft TE Common YANG Types November 2023 - - description "Indicates support for Point-to-Multipoint TE (P2MP-TE)."; reference @@ -1492,6 +1507,13 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates support for named extended administrative groups."; } + + +Busi, et al. Expires 28 July 2024 [Page 27] + +Internet-Draft TE Common YANG Types January 2024 + + feature named-srlg-groups { description "Indicates support for named SRLG groups."; @@ -1507,13 +1529,6 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates support for path optimization metrics."; } - - -Busi, et al. Expires 27 May 2024 [Page 27] - -Internet-Draft TE Common YANG Types November 2023 - - feature path-optimization-objective-function { description "Indicates support for path optimization objective functions."; @@ -1547,6 +1562,14 @@ Internet-Draft TE Common YANG Types November 2023 identity se-style-desired { base session-attributes-flags; + + + +Busi, et al. Expires 28 July 2024 [Page 28] + +Internet-Draft TE Common YANG Types January 2024 + + description "Shared explicit style, to allow the LSP to be established and share resources with the old LSP."; @@ -1563,13 +1586,6 @@ Internet-Draft TE Common YANG Types November 2023 Section 4.7.1"; } - - -Busi, et al. Expires 27 May 2024 [Page 28] - -Internet-Draft TE Common YANG Types November 2023 - - identity bandwidth-protection-desired { base session-attributes-flags; description @@ -1602,6 +1618,14 @@ Internet-Draft TE Common YANG Types November 2023 identity soft-preemption-desired { base session-attributes-flags; description + + + +Busi, et al. Expires 28 July 2024 [Page 29] + +Internet-Draft TE Common YANG Types January 2024 + + "Soft preemption of LSP resources is desired."; reference "RFC 5712: MPLS Traffic Engineering Soft Preemption"; @@ -1618,14 +1642,6 @@ Internet-Draft TE Common YANG Types November 2023 "Indicates end-to-end rerouting behavior for an LSP undergoing establishment. This MAY also be used to specify the behavior of end-to-end LSP recovery for - - - -Busi, et al. Expires 27 May 2024 [Page 29] - -Internet-Draft TE Common YANG Types November 2023 - - established LSPs."; reference "RFC 4920: Crankback Signaling Extensions for MPLS and GMPLS @@ -1658,6 +1674,14 @@ Internet-Draft TE Common YANG Types November 2023 Route Object (ERO)"; } + + + +Busi, et al. Expires 28 July 2024 [Page 30] + +Internet-Draft TE Common YANG Types January 2024 + + identity segment-based-rerouting-desired { base lsp-attributes-flags; description @@ -1674,14 +1698,6 @@ Internet-Draft TE Common YANG Types November 2023 Route Object (ERO)"; } - - - -Busi, et al. Expires 27 May 2024 [Page 30] - -Internet-Draft TE Common YANG Types November 2023 - - identity lsp-integrity-required { base lsp-attributes-flags; description @@ -1714,6 +1730,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 5150: Label Switched Path Stitching with Generalized Multiprotocol Label Switching Traffic Engineering (GMPLS TE) RFC 7570: Label Switched Path (LSP) Attribute in the Explicit + + + +Busi, et al. Expires 28 July 2024 [Page 31] + +Internet-Draft TE Common YANG Types January 2024 + + Route Object (ERO)"; } @@ -1730,14 +1754,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity non-php-behavior-flag { - - - -Busi, et al. Expires 27 May 2024 [Page 31] - -Internet-Draft TE Common YANG Types November 2023 - - base lsp-attributes-flags; description "Indicates that non-PHP (non-Penultimate Hop Popping) behavior @@ -1771,6 +1787,13 @@ Internet-Draft TE Common YANG Types November 2023 Route Object (ERO)"; } + + +Busi, et al. Expires 28 July 2024 [Page 32] + +Internet-Draft TE Common YANG Types January 2024 + + identity oam-mep-entity-desired { base lsp-attributes-flags; description @@ -1786,14 +1809,6 @@ Internet-Draft TE Common YANG Types November 2023 description "OAM Maintenance Entity Group Intermediate Points (MIP) entities desired."; - - - -Busi, et al. Expires 27 May 2024 [Page 32] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 7260: GMPLS RSVP-TE Extensions for Operations, Administration, and Maintenance (OAM) Configuration"; @@ -1827,6 +1842,14 @@ Internet-Draft TE Common YANG Types November 2023 "P2MP-TE tree re-evaluation request."; reference "RFC 8149: RSVP Extensions for Reoptimization of Loosely Routed + + + +Busi, et al. Expires 28 July 2024 [Page 33] + +Internet-Draft TE Common YANG Types January 2024 + + Point-to-Multipoint Traffic Engineering Label Switched Paths (LSPs)"; } @@ -1842,14 +1865,6 @@ Internet-Draft TE Common YANG Types November 2023 identity link-protection-type { description "Base identity for the link protection type."; - - - -Busi, et al. Expires 27 May 2024 [Page 33] - -Internet-Draft TE Common YANG Types November 2023 - - } identity link-protection-unprotected { @@ -1883,6 +1898,14 @@ Internet-Draft TE Common YANG Types November 2023 base link-protection-type; description "One-for-one (1:1) protected link type."; + + + +Busi, et al. Expires 28 July 2024 [Page 34] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; @@ -1898,14 +1921,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity link-protection-enhanced { - - - -Busi, et al. Expires 27 May 2024 [Page 34] - -Internet-Draft TE Common YANG Types November 2023 - - base link-protection-type; description "A compound link protection type derived from the underlay @@ -1939,6 +1954,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity association-type-double-sided-bidir { + + + +Busi, et al. Expires 28 July 2024 [Page 35] + +Internet-Draft TE Common YANG Types January 2024 + + base association-type; description "Association type for double-sided bidirectional LSPs, @@ -1954,14 +1977,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Association type for single-sided bidirectional LSPs, used to associate two LSPs of two tunnels, where one - - - -Busi, et al. Expires 27 May 2024 [Page 35] - -Internet-Draft TE Common YANG Types November 2023 - - tunnel is configured on one side/endpoint and the other tunnel is dynamically created on the other endpoint."; reference @@ -1995,6 +2010,14 @@ Internet-Draft TE Common YANG Types November 2023 identity of-minimize-cost-path { base objective-function-type; + + + +Busi, et al. Expires 28 July 2024 [Page 36] + +Internet-Draft TE Common YANG Types January 2024 + + description "Objective function for minimizing path cost."; reference @@ -2010,14 +2033,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; - - - -Busi, et al. Expires 27 May 2024 [Page 36] - -Internet-Draft TE Common YANG Types November 2023 - - } identity of-maximize-residual-bandwidth { @@ -2051,6 +2066,14 @@ Internet-Draft TE Common YANG Types November 2023 status obsolete; description "Objective function for minimizing the load on the link that + + + +Busi, et al. Expires 28 July 2024 [Page 37] + +Internet-Draft TE Common YANG Types January 2024 + + is carrying the highest load."; reference "RFC 5541: Encoding of Objective Functions in the Path @@ -2066,14 +2089,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Objective function for minimizing the cost on a path set."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 37] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; } @@ -2107,6 +2122,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 3272: Overview and Principles of Internet Traffic Engineering RFC 4657: Path Computation Element (PCE) Communication + + + +Busi, et al. Expires 28 July 2024 [Page 38] + +Internet-Draft TE Common YANG Types January 2024 + + Protocol Generic Requirements"; } @@ -2122,14 +2145,6 @@ Internet-Draft TE Common YANG Types November 2023 Engineering"; } - - - -Busi, et al. Expires 27 May 2024 [Page 38] - -Internet-Draft TE Common YANG Types November 2023 - - identity lsp-metric-type { description "Base identity for the LSP metric specification types."; @@ -2163,7 +2178,15 @@ Internet-Draft TE Common YANG Types November 2023 not specified explicitly; rather, it is directly inherited from the IGP cost."; reference - "RFC 4657: Path Computation Element (PCE) Communication + + + +Busi, et al. Expires 28 July 2024 [Page 39] + +Internet-Draft TE Common YANG Types January 2024 + + + "RFC 4657: Path Computation Element (PCE) Communication Protocol Generic Requirements"; } @@ -2178,14 +2201,6 @@ Internet-Draft TE Common YANG Types November 2023 "TE Point-to-Point (P2P) tunnel type."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels"; - - - -Busi, et al. Expires 27 May 2024 [Page 39] - -Internet-Draft TE Common YANG Types November 2023 - - } identity te-tunnel-p2mp { @@ -2219,6 +2234,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity tunnel-action-switchpath { + + + +Busi, et al. Expires 28 July 2024 [Page 40] + +Internet-Draft TE Common YANG Types January 2024 + + base tunnel-action-type; description "TE tunnel action that switches the tunnel's LSP to use the @@ -2234,14 +2257,6 @@ Internet-Draft TE Common YANG Types November 2023 identity te-action-success { base te-action-result; description - - - -Busi, et al. Expires 27 May 2024 [Page 40] - -Internet-Draft TE Common YANG Types November 2023 - - "TE action was successful."; } @@ -2275,6 +2290,14 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The identity tunnel-admin-state-auto below + + + +Busi, et al. Expires 28 July 2024 [Page 41] + +Internet-Draft TE Common YANG Types January 2024 + + // has been added in this module revision // RFC Editor: remove the note above and this note identity tunnel-admin-state-auto { @@ -2291,13 +2314,6 @@ Internet-Draft TE Common YANG Types November 2023 "Base identity for TE tunnel states."; } - - -Busi, et al. Expires 27 May 2024 [Page 41] - -Internet-Draft TE Common YANG Types November 2023 - - identity tunnel-state-up { base tunnel-state-type; description @@ -2330,6 +2346,14 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-path-computation-failed { base lsp-state-type; description + + + +Busi, et al. Expires 28 July 2024 [Page 42] + +Internet-Draft TE Common YANG Types January 2024 + + "State path computation failed."; } @@ -2346,14 +2370,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-state-setup-failed { - - - -Busi, et al. Expires 27 May 2024 [Page 42] - -Internet-Draft TE Common YANG Types November 2023 - - base lsp-state-type; description "State setup failed."; @@ -2386,6 +2402,14 @@ Internet-Draft TE Common YANG Types November 2023 base path-invalidation-action-type; description "Upon invalidation of the TE tunnel path, the tunnel remains + + + +Busi, et al. Expires 28 July 2024 [Page 43] + +Internet-Draft TE Common YANG Types January 2024 + + valid, but any packet mapped over the tunnel is dropped."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, @@ -2402,14 +2426,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity lsp-restoration-type { - - - -Busi, et al. Expires 27 May 2024 [Page 43] - -Internet-Draft TE Common YANG Types November 2023 - - description "Base identity from which LSP restoration types are derived."; } @@ -2442,6 +2458,14 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The identity restoration-scheme-rerouting + + + +Busi, et al. Expires 28 July 2024 [Page 44] + +Internet-Draft TE Common YANG Types January 2024 + + // below has been added in this module revision // RFC Editor: remove the note above and this note identity restoration-scheme-rerouting { @@ -2458,14 +2482,6 @@ Internet-Draft TE Common YANG Types November 2023 identity restoration-scheme-preconfigured { base restoration-scheme-type; - - - -Busi, et al. Expires 27 May 2024 [Page 44] - -Internet-Draft TE Common YANG Types November 2023 - - description "Restoration LSP is preconfigured prior to the failure."; reference @@ -2499,6 +2515,13 @@ Internet-Draft TE Common YANG Types November 2023 Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } + + +Busi, et al. Expires 28 July 2024 [Page 45] + +Internet-Draft TE Common YANG Types January 2024 + + identity lsp-protection-unprotected { base lsp-protection-type; description @@ -2514,14 +2537,6 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-protection-reroute-extra { base lsp-protection-type; status obsolete; - - - -Busi, et al. Expires 27 May 2024 [Page 45] - -Internet-Draft TE Common YANG Types November 2023 - - description "'(Full) Rerouting' LSP protection type. @@ -2555,6 +2570,14 @@ Internet-Draft TE Common YANG Types November 2023 description "'1:N Protection with Extra-Traffic' LSP protection type."; reference + + + +Busi, et al. Expires 28 July 2024 [Page 46] + +Internet-Draft TE Common YANG Types January 2024 + + "RFC 4872: RSVP-TE Extensions in Support of End-to-End Generalized Multi-Protocol Label Switching (GMPLS) Recovery"; } @@ -2570,14 +2593,6 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-protection-unidir-1-plus-1 { base lsp-protection-type; - - - -Busi, et al. Expires 27 May 2024 [Page 46] - -Internet-Draft TE Common YANG Types November 2023 - - description "'1+1 Unidirectional Protection' LSP protection type."; reference @@ -2611,6 +2626,14 @@ Internet-Draft TE Common YANG Types November 2023 identity normal { base lsp-protection-state; description + + + +Busi, et al. Expires 28 July 2024 [Page 47] + +Internet-Draft TE Common YANG Types January 2024 + + "Normal state."; } @@ -2626,14 +2649,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity lockout-of-protection { - - - -Busi, et al. Expires 27 May 2024 [Page 47] - -Internet-Draft TE Common YANG Types November 2023 - - base lsp-protection-state; description "A Loss of Protection (LoP) command is active."; @@ -2667,6 +2682,14 @@ Internet-Draft TE Common YANG Types November 2023 "There is a signal degrade condition on either the working path or the protection path."; reference + + + +Busi, et al. Expires 28 July 2024 [Page 48] + +Internet-Draft TE Common YANG Types January 2024 + + "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; } @@ -2682,14 +2705,6 @@ Internet-Draft TE Common YANG Types November 2023 identity wait-to-restore { base lsp-protection-state; - - - -Busi, et al. Expires 27 May 2024 [Page 48] - -Internet-Draft TE Common YANG Types November 2023 - - description "A WTR timer is running."; reference @@ -2723,6 +2738,14 @@ Internet-Draft TE Common YANG Types November 2023 used for troubleshooting purposes are derived."; } + + + +Busi, et al. Expires 28 July 2024 [Page 49] + +Internet-Draft TE Common YANG Types January 2024 + + identity action-freeze { base protection-external-commands; description @@ -2738,14 +2761,6 @@ Internet-Draft TE Common YANG Types November 2023 base protection-external-commands; description "An action that clears the active freeze state."; - - - -Busi, et al. Expires 27 May 2024 [Page 49] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -2779,6 +2794,14 @@ Internet-Draft TE Common YANG Types November 2023 command to ensure that the protection transport entity is temporarily not available to transport a traffic signal (either normal or Extra-Traffic)."; + + + +Busi, et al. Expires 28 July 2024 [Page 50] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; @@ -2794,14 +2817,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 4427: Recovery (Protection and Restoration) Terminology for Generalized Multi-Protocol Label Switching (GMPLS)"; - - - -Busi, et al. Expires 27 May 2024 [Page 50] - -Internet-Draft TE Common YANG Types November 2023 - - } identity action-manual-switch { @@ -2835,6 +2850,14 @@ Internet-Draft TE Common YANG Types November 2023 identity clear { base protection-external-commands; + + + +Busi, et al. Expires 28 July 2024 [Page 51] + +Internet-Draft TE Common YANG Types January 2024 + + description "An action that clears the active near-end lockout of a protection, forced switchover, manual switchover, WTR state, @@ -2850,14 +2873,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; - - - -Busi, et al. Expires 27 May 2024 [Page 51] - -Internet-Draft TE Common YANG Types November 2023 - - } identity switching-psc1 { @@ -2891,6 +2906,14 @@ Internet-Draft TE Common YANG Types November 2023 base switching-capabilities; description "Time-Division-Multiplex Capable (TDM)."; + + + +Busi, et al. Expires 28 July 2024 [Page 52] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; @@ -2906,14 +2929,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity switching-dcsc { - - - -Busi, et al. Expires 27 May 2024 [Page 52] - -Internet-Draft TE Common YANG Types November 2023 - - base switching-capabilities; description "Data Channel Switching Capable (DCSC)."; @@ -2948,6 +2963,13 @@ Internet-Draft TE Common YANG Types November 2023 Signaling Functional Description"; } + + +Busi, et al. Expires 28 July 2024 [Page 53] + +Internet-Draft TE Common YANG Types January 2024 + + identity lsp-encoding-packet { base lsp-encoding-types; description @@ -2962,14 +2984,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Ethernet LSP encoding."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 53] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) Signaling Functional Description"; } @@ -3004,6 +3018,14 @@ Internet-Draft TE Common YANG Types November 2023 identity lsp-encoding-lambda { base lsp-encoding-types; description + + + +Busi, et al. Expires 28 July 2024 [Page 54] + +Internet-Draft TE Common YANG Types January 2024 + + "Lambda (photonic) LSP encoding."; reference "RFC 3471: Generalized Multi-Protocol Label Switching (GMPLS) @@ -3019,13 +3041,6 @@ Internet-Draft TE Common YANG Types November 2023 Signaling Functional Description"; } - - -Busi, et al. Expires 27 May 2024 [Page 54] - -Internet-Draft TE Common YANG Types November 2023 - - identity lsp-encoding-fiber-channel { base lsp-encoding-types; description @@ -3059,6 +3074,14 @@ Internet-Draft TE Common YANG Types November 2023 base lsp-encoding-types; description "Line (e.g., 8B/10B) LSP encoding."; + + + +Busi, et al. Expires 28 July 2024 [Page 55] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC 6004: Generalized MPLS (GMPLS) Support for Metro Ethernet Forum and G.8011 Ethernet Service Switching"; @@ -3074,14 +3097,6 @@ Internet-Draft TE Common YANG Types November 2023 base path-signaling-type; description "Static LSP provisioning path setup."; - - - -Busi, et al. Expires 27 May 2024 [Page 55] - -Internet-Draft TE Common YANG Types November 2023 - - } identity path-setup-rsvp { @@ -3115,6 +3130,14 @@ Internet-Draft TE Common YANG Types November 2023 identity path-scope-end-to-end { base path-scope-type; description + + + +Busi, et al. Expires 28 July 2024 [Page 56] + +Internet-Draft TE Common YANG Types January 2024 + + "Path scope end to end."; reference "RFC 4873: GMPLS Segment Recovery"; @@ -3131,13 +3154,6 @@ Internet-Draft TE Common YANG Types November 2023 "'Include route' object."; } - - -Busi, et al. Expires 27 May 2024 [Page 56] - -Internet-Draft TE Common YANG Types November 2023 - - identity route-exclude-object { base route-usage-type; description @@ -3170,6 +3186,14 @@ Internet-Draft TE Common YANG Types November 2023 identity path-metric-te { base path-metric-type; description + + + +Busi, et al. Expires 28 July 2024 [Page 57] + +Internet-Draft TE Common YANG Types January 2024 + + "TE path metric."; reference "RFC 3785: Use of Interior Gateway Protocol (IGP) Metric as a @@ -3186,14 +3210,6 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The reference for the identity path-metric-hop - - - -Busi, et al. Expires 27 May 2024 [Page 57] - -Internet-Draft TE Common YANG Types November 2023 - - // has been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-hop { @@ -3226,6 +3242,14 @@ Internet-Draft TE Common YANG Types November 2023 base path-metric-type; description "Unidirectional Residual Bandwidth, which is defined to be + + + +Busi, et al. Expires 28 July 2024 [Page 58] + +Internet-Draft TE Common YANG Types January 2024 + + Maximum Bandwidth (RFC 3630) minus the bandwidth currently allocated to LSPs."; reference @@ -3242,14 +3266,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-metric-optimize-excludes { - - - -Busi, et al. Expires 27 May 2024 [Page 58] - -Internet-Draft TE Common YANG Types November 2023 - - base path-metric-type; description "A metric that optimizes to a maximum the number of excluded @@ -3282,6 +3298,14 @@ Internet-Draft TE Common YANG Types November 2023 identity resource-affinities-type { description "Base identity for resource class affinities."; + + + +Busi, et al. Expires 28 July 2024 [Page 59] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC 2702: Requirements for Traffic Engineering Over MPLS"; } @@ -3298,14 +3322,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity resource-aff-include-any { - - - -Busi, et al. Expires 27 May 2024 [Page 59] - -Internet-Draft TE Common YANG Types November 2023 - - base resource-affinities-type; description "The set of attribute filters associated with a @@ -3338,6 +3354,14 @@ Internet-Draft TE Common YANG Types November 2023 base te-optimization-criterion; description "Optimization is not applied."; + + + +Busi, et al. Expires 28 July 2024 [Page 60] + +Internet-Draft TE Common YANG Types January 2024 + + } identity cost { @@ -3354,14 +3378,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Optimized on delay."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 60] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)"; } @@ -3395,6 +3411,13 @@ Internet-Draft TE Common YANG Types November 2023 "Includes a weighted SRLG check in the path computation."; } + + +Busi, et al. Expires 28 July 2024 [Page 61] + +Internet-Draft TE Common YANG Types January 2024 + + // CHANGE NOTE: The base identity path-computation-error-reason // and its derived identities below have been // added in this module revision @@ -3410,14 +3433,6 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because of an unspecified reason."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 61] - -Internet-Draft TE Common YANG Types November 2023 - - "Section 7.5 of RFC5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; } @@ -3451,6 +3466,14 @@ Internet-Draft TE Common YANG Types November 2023 NO-PATH-VECTOR TLV."; reference "RFC5440: Path Computation Element (PCE) Communication + + + +Busi, et al. Expires 28 July 2024 [Page 62] + +Internet-Draft TE Common YANG Types January 2024 + + Protocol (PCEP); https://www.iana.org/assignments/pcep/pcep.xhtml"; @@ -3466,14 +3489,6 @@ Internet-Draft TE Common YANG Types November 2023 identity path-computation-error-destination-unknown-in-domain { base path-computation-error-reason; description - - - -Busi, et al. Expires 27 May 2024 [Page 62] - -Internet-Draft TE Common YANG Types November 2023 - - "Path computation has failed because the destination node is unknown in indicated destination domain. @@ -3507,6 +3522,14 @@ Internet-Draft TE Common YANG Types November 2023 It corresponds to bit 21 of the Flags field of the NO-PATH-VECTOR TLV."; + + + +Busi, et al. Expires 28 July 2024 [Page 63] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC8685; @@ -3522,14 +3545,6 @@ Internet-Draft TE Common YANG Types November 2023 It corresponds to bit 22 of the Flags field of the NO-PATH-VECTOR TLV."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 63] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC8685; https://www.iana.org/assignments/pcep/pcep.xhtml"; @@ -3563,6 +3578,14 @@ Internet-Draft TE Common YANG Types November 2023 https://www.iana.org/assignments/pcep/pcep.xhtml"; } + + + +Busi, et al. Expires 28 July 2024 [Page 64] + +Internet-Draft TE Common YANG Types January 2024 + + identity path-computation-error-no-gco-solution { base path-computation-error-reason; description @@ -3578,14 +3601,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity path-computation-error-pks-expansion { - - - -Busi, et al. Expires 27 May 2024 [Page 64] - -Internet-Draft TE Common YANG Types November 2023 - - base path-computation-error-reason; description "Path computation has failed because of Path-Key Subobject @@ -3619,6 +3634,14 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because source node is unknown. + + + +Busi, et al. Expires 28 July 2024 [Page 65] + +Internet-Draft TE Common YANG Types January 2024 + + It corresponds to bit 29 of the Flags field of the NO-PATH-VECTOR TLV."; reference @@ -3634,14 +3657,6 @@ Internet-Draft TE Common YANG Types November 2023 "Path computation has failed because destination node is unknown. - - - -Busi, et al. Expires 27 May 2024 [Page 65] - -Internet-Draft TE Common YANG Types November 2023 - - It corresponds to bit 30 of the Flags field of the NO-PATH-VECTOR TLV."; reference @@ -3675,6 +3690,14 @@ Internet-Draft TE Common YANG Types November 2023 identity protocol-origin-api { base protocol-origin-type; description + + + +Busi, et al. Expires 28 July 2024 [Page 66] + +Internet-Draft TE Common YANG Types January 2024 + + "Protocol origin is via Application Programmable Interface (API)."; } @@ -3690,14 +3713,6 @@ Internet-Draft TE Common YANG Types November 2023 } identity protocol-origin-bgp { - - - -Busi, et al. Expires 27 May 2024 [Page 66] - -Internet-Draft TE Common YANG Types November 2023 - - base protocol-origin-type; description "Protocol origin is Border Gateway Protocol (BGP)."; @@ -3731,6 +3746,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Objective function for minimizing the load on the link that is carrying the highest load (MLL)."; + + + +Busi, et al. Expires 28 July 2024 [Page 67] + +Internet-Draft TE Common YANG Types January 2024 + + reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; @@ -3746,14 +3769,6 @@ Internet-Draft TE Common YANG Types November 2023 Computation Element Communication Protocol (PCEP)."; } - - - -Busi, et al. Expires 27 May 2024 [Page 67] - -Internet-Draft TE Common YANG Types November 2023 - - identity svec-of-minimize-common-transit-domain { base svec-objective-function-type; description @@ -3787,6 +3802,14 @@ Internet-Draft TE Common YANG Types November 2023 Element (H-PCE) Architecture."; } + + + +Busi, et al. Expires 28 July 2024 [Page 68] + +Internet-Draft TE Common YANG Types January 2024 + + identity svec-of-minimize-shared-nodes { base svec-objective-function-type; description @@ -3802,14 +3825,6 @@ Internet-Draft TE Common YANG Types November 2023 // its derived identities below have been // added in this module revision // RFC Editor: remove the note above and this note - - - -Busi, et al. Expires 27 May 2024 [Page 68] - -Internet-Draft TE Common YANG Types November 2023 - - identity svec-metric-type { description "Base identity for SVEC metric type."; @@ -3843,6 +3858,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; + + + +Busi, et al. Expires 28 July 2024 [Page 69] + +Internet-Draft TE Common YANG Types January 2024 + + } identity svec-metric-aggregate-bandwidth-consumption { @@ -3858,14 +3881,6 @@ Internet-Draft TE Common YANG Types November 2023 base svec-metric-type; description "Load of the most loaded link."; - - - -Busi, et al. Expires 27 May 2024 [Page 69] - -Internet-Draft TE Common YANG Types November 2023 - - reference "RFC5541: Encoding of Objective Functions in the Path Computation Element Communication Protocol (PCEP)."; @@ -3899,6 +3914,14 @@ Internet-Draft TE Common YANG Types November 2023 } } } + + + +Busi, et al. Expires 28 July 2024 [Page 70] + +Internet-Draft TE Common YANG Types January 2024 + + } } @@ -3914,14 +3937,6 @@ Internet-Draft TE Common YANG Types November 2023 is used."; container te-label { description - - - -Busi, et al. Expires 27 May 2024 [Page 70] - -Internet-Draft TE Common YANG Types November 2023 - - "Container that specifies the TE label. The choices can be augmented for specific data-plane technologies."; choice technology { @@ -3955,6 +3970,14 @@ Internet-Draft TE Common YANG Types November 2023 type te-global-id; default "0"; description + + + +Busi, et al. Expires 28 July 2024 [Page 71] + +Internet-Draft TE Common YANG Types January 2024 + + "An identifier to uniquely identify a provider. If omitted, it assumes that the topology provider ID value = 0 (the default)."; @@ -3970,14 +3993,6 @@ Internet-Draft TE Common YANG Types November 2023 leaf topology-id { type te-topology-id; default ""; - - - -Busi, et al. Expires 27 May 2024 [Page 71] - -Internet-Draft TE Common YANG Types November 2023 - - description "When the datastore contains several topologies, 'topology-id' distinguishes between them. If omitted, @@ -4011,6 +4026,14 @@ Internet-Draft TE Common YANG Types November 2023 } leaf one-way-delay-normality { type te-types:performance-metrics-normality; + + + +Busi, et al. Expires 28 July 2024 [Page 72] + +Internet-Draft TE Common YANG Types January 2024 + + description "One-way delay normality."; } @@ -4026,14 +4049,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using TE Metric Extensions - - - -Busi, et al. Expires 27 May 2024 [Page 72] - -Internet-Draft TE Common YANG Types November 2023 - - RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; leaf two-way-delay { type uint32 { @@ -4067,6 +4082,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Residual bandwidth that subtracts tunnel reservations from Maximum Bandwidth (or link capacity) (RFC 3630) and + + + +Busi, et al. Expires 28 July 2024 [Page 73] + +Internet-Draft TE Common YANG Types January 2024 + + provides an aggregated remainder across QoS classes."; reference "RFC 3630: Traffic Engineering (TE) Extensions to OSPF @@ -4082,14 +4105,6 @@ Internet-Draft TE Common YANG Types November 2023 type rt-types:bandwidth-ieee-float32; units "bytes per second"; default "0x0p0"; - - - -Busi, et al. Expires 27 May 2024 [Page 73] - -Internet-Draft TE Common YANG Types November 2023 - - description "Available bandwidth that is defined to be residual bandwidth minus the measured bandwidth used for the @@ -4123,6 +4138,14 @@ Internet-Draft TE Common YANG Types November 2023 grouping one-way-performance-metrics { description + + + +Busi, et al. Expires 28 July 2024 [Page 74] + +Internet-Draft TE Common YANG Types January 2024 + + "One-way PM throttle grouping."; leaf one-way-delay { type uint32 { @@ -4138,14 +4161,6 @@ Internet-Draft TE Common YANG Types November 2023 default "0x0p0"; description "Residual bandwidth that subtracts tunnel reservations from - - - -Busi, et al. Expires 27 May 2024 [Page 74] - -Internet-Draft TE Common YANG Types November 2023 - - Maximum Bandwidth (or link capacity) (RFC 3630) and provides an aggregated remainder across QoS classes."; reference @@ -4179,6 +4194,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Two-way PM throttle grouping."; leaf two-way-delay { + + + +Busi, et al. Expires 28 July 2024 [Page 75] + +Internet-Draft TE Common YANG Types January 2024 + + type uint32 { range "0..16777215"; } @@ -4194,14 +4217,6 @@ Internet-Draft TE Common YANG Types November 2023 attributes."; uses one-way-performance-metrics; uses two-way-performance-metrics; - - - -Busi, et al. Expires 27 May 2024 [Page 75] - -Internet-Draft TE Common YANG Types November 2023 - - } grouping performance-metrics-attributes { @@ -4235,6 +4250,14 @@ Internet-Draft TE Common YANG Types November 2023 container throttle { must 'suppression-interval >= measure-interval' { error-message "'suppression-interval' cannot be less than " + + + +Busi, et al. Expires 28 July 2024 [Page 76] + +Internet-Draft TE Common YANG Types January 2024 + + + "'measure-interval'."; description "Constraint on 'suppression-interval' and @@ -4250,14 +4273,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; leaf one-way-delay-offset { type uint32 { - - - -Busi, et al. Expires 27 May 2024 [Page 76] - -Internet-Draft TE Common YANG Types November 2023 - - range "0..16777215"; } default "0"; @@ -4291,6 +4306,14 @@ Internet-Draft TE Common YANG Types November 2023 Extensions, Section 6"; } container threshold-out { + + + +Busi, et al. Expires 28 July 2024 [Page 77] + +Internet-Draft TE Common YANG Types January 2024 + + uses performance-metrics-thresholds; description "If the measured parameter falls outside an upper bound @@ -4306,14 +4329,6 @@ Internet-Draft TE Common YANG Types November 2023 for all but the minimum-delay metric (or a lower bound for the minimum-delay metric only) and the advertised value is not already inside that bound, a 'normal' - - - -Busi, et al. Expires 27 May 2024 [Page 77] - -Internet-Draft TE Common YANG Types November 2023 - - announcement (anomalous bit cleared) will be triggered."; } container threshold-accelerated-advertisement { @@ -4347,6 +4362,14 @@ Internet-Draft TE Common YANG Types November 2023 type nw:node-id; description "The identifier of a node in the topology."; + + + +Busi, et al. Expires 28 July 2024 [Page 78] + +Internet-Draft TE Common YANG Types January 2024 + + } leaf node-id { type te-node-id; @@ -4362,14 +4385,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Numbered node route hop."; reference - - - -Busi, et al. Expires 27 May 2024 [Page 78] - -Internet-Draft TE Common YANG Types November 2023 - - "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, Section 4.3, EXPLICIT_ROUTE in RSVP-TE RFC 3477: Signalling Unnumbered Links in Resource @@ -4403,6 +4418,14 @@ Internet-Draft TE Common YANG Types November 2023 Section 4.3, EXPLICIT_ROUTE in RSVP-TE RFC 3477: Signalling Unnumbered Links in Resource ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; + + + +Busi, et al. Expires 28 July 2024 [Page 79] + +Internet-Draft TE Common YANG Types January 2024 + + } } case unnumbered-link-hop { @@ -4418,14 +4441,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Link Termination Point (LTP) identifier."; } - - - -Busi, et al. Expires 27 May 2024 [Page 79] - -Internet-Draft TE Common YANG Types November 2023 - - leaf link-tp-id { type te-tp-id; description @@ -4459,6 +4474,14 @@ Internet-Draft TE Common YANG Types November 2023 "Unnumbered link explicit route hop."; reference "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels, + + + +Busi, et al. Expires 28 July 2024 [Page 80] + +Internet-Draft TE Common YANG Types January 2024 + + Section 4.3, EXPLICIT_ROUTE in RSVP-TE RFC 3477: Signalling Unnumbered Links in Resource ReSerVation Protocol - Traffic Engineering (RSVP-TE)"; @@ -4474,14 +4497,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf hop-type { type te-hop-type; - - - -Busi, et al. Expires 27 May 2024 [Page 80] - -Internet-Draft TE Common YANG Types November 2023 - - default "strict"; description "Strict or loose hop."; @@ -4515,6 +4530,14 @@ Internet-Draft TE Common YANG Types November 2023 choice type { description "The Record Route entry type."; + + + +Busi, et al. Expires 28 July 2024 [Page 81] + +Internet-Draft TE Common YANG Types January 2024 + + case numbered-node-hop { container numbered-node-hop { must "node-id-uri or node-id" { @@ -4530,14 +4553,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf node-id { type te-node-id; - - - -Busi, et al. Expires 27 May 2024 [Page 81] - -Internet-Draft TE Common YANG Types November 2023 - - description "The identifier of a node in the TE topology."; } @@ -4571,7 +4586,15 @@ Internet-Draft TE Common YANG Types November 2023 description "Path attributes flags."; reference - "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels + + + +Busi, et al. Expires 28 July 2024 [Page 82] + +Internet-Draft TE Common YANG Types January 2024 + + + "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP Tunnels RFC 4561: Definition of a Record Route Object (RRO) @@ -4586,14 +4609,6 @@ Internet-Draft TE Common YANG Types November 2023 must "(link-tp-id-uri or link-tp-id) and " + "(node-id-uri or node-id)" { description - - - -Busi, et al. Expires 27 May 2024 [Page 82] - -Internet-Draft TE Common YANG Types November 2023 - - "At least one node identifier and at least one Link Termination Point (LTP) identifier MUST be present."; } @@ -4627,6 +4642,14 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 3209: RSVP-TE: Extensions to RSVP for LSP Tunnels RFC 4090: Fast Reroute Extensions to RSVP-TE for LSP Tunnels + + + +Busi, et al. Expires 28 July 2024 [Page 83] + +Internet-Draft TE Common YANG Types January 2024 + + RFC 4561: Definition of a Record Route Object (RRO) Node-Id Sub-Object"; } @@ -4642,14 +4665,6 @@ Internet-Draft TE Common YANG Types November 2023 case label { container label-hop { description - - - -Busi, et al. Expires 27 May 2024 [Page 83] - -Internet-Draft TE Common YANG Types November 2023 - - "Label route hop type."; uses te-label; leaf-list flags { @@ -4683,6 +4698,14 @@ Internet-Draft TE Common YANG Types November 2023 description "The label or label range is exclusive."; } + + + +Busi, et al. Expires 28 July 2024 [Page 84] + +Internet-Draft TE Common YANG Types January 2024 + + } default "inclusive"; description @@ -4698,14 +4721,6 @@ Internet-Draft TE Common YANG Types November 2023 + " not(te-label/direction))" + " or " + "(../label-end/te-label/direction = te-label/direction)" - - - -Busi, et al. Expires 27 May 2024 [Page 84] - -Internet-Draft TE Common YANG Types November 2023 - - + " or " + "(not(te-label/direction) and" + " (../label-end/te-label/direction = 'forward'))" @@ -4739,6 +4754,14 @@ Internet-Draft TE Common YANG Types November 2023 "This is the ending label if a label range is specified. This attribute is not set if a single label is specified."; uses te-label; + + + +Busi, et al. Expires 28 July 2024 [Page 85] + +Internet-Draft TE Common YANG Types January 2024 + + } container label-step { description @@ -4754,14 +4777,6 @@ Internet-Draft TE Common YANG Types November 2023 case generic { leaf generic { type int32; - - - -Busi, et al. Expires 27 May 2024 [Page 85] - -Internet-Draft TE Common YANG Types November 2023 - - default "1"; description "Label range step."; @@ -4795,6 +4810,14 @@ Internet-Draft TE Common YANG Types November 2023 } grouping label-set-info { + + + +Busi, et al. Expires 28 July 2024 [Page 86] + +Internet-Draft TE Common YANG Types January 2024 + + description "Grouping for the list of label restrictions specifying what labels may or may not be used."; @@ -4810,14 +4833,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 7579: General Network Element Constraint Encoding for GMPLS-Controlled Networks"; - - - -Busi, et al. Expires 27 May 2024 [Page 86] - -Internet-Draft TE Common YANG Types November 2023 - - uses label-restriction-info; } } @@ -4851,6 +4866,14 @@ Internet-Draft TE Common YANG Types November 2023 when "../metric-type = " + "'te-types:path-metric-optimize-includes'"; description + + + +Busi, et al. Expires 28 July 2024 [Page 87] + +Internet-Draft TE Common YANG Types January 2024 + + "Container for the 'include route' object list."; uses path-route-include-objects; } @@ -4866,14 +4889,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf link-protection { type identityref { - - - -Busi, et al. Expires 27 May 2024 [Page 87] - -Internet-Draft TE Common YANG Types November 2023 - - base link-protection-type; } default "te-types:link-protection-unprotected"; @@ -4907,6 +4922,14 @@ Internet-Draft TE Common YANG Types November 2023 leaf signaling-type { type identityref { base path-signaling-type; + + + +Busi, et al. Expires 28 July 2024 [Page 88] + +Internet-Draft TE Common YANG Types January 2024 + + } default "te-types:path-setup-rsvp"; description @@ -4922,14 +4945,6 @@ Internet-Draft TE Common YANG Types November 2023 type nw:network-id; description "The network topology identifier."; - - - -Busi, et al. Expires 27 May 2024 [Page 88] - -Internet-Draft TE Common YANG Types November 2023 - - } uses te-topology-identifier; uses common-constraints; @@ -4939,7 +4954,7 @@ Internet-Draft TE Common YANG Types November 2023 description "List of route entries to be included or excluded when performing the path computation."; - container explicit-route-objects-always { + container explicit-route-objects { description "Container for the 'exclude route' object list."; list route-object-exclude-always { @@ -4963,6 +4978,14 @@ Internet-Draft TE Common YANG Types November 2023 description "List of route objects to include or exclude in the path computation."; + + + +Busi, et al. Expires 28 July 2024 [Page 89] + +Internet-Draft TE Common YANG Types January 2024 + + leaf explicit-route-usage { type identityref { base route-usage-type; @@ -4978,14 +5001,6 @@ Internet-Draft TE Common YANG Types November 2023 "Route object include-exclude index. The index is used to identify an entry in the list. The order of entries is defined by the user without relying on key values."; - - - -Busi, et al. Expires 27 May 2024 [Page 89] - -Internet-Draft TE Common YANG Types November 2023 - - } uses explicit-route-hop { augment "type" { @@ -5019,6 +5034,14 @@ Internet-Draft TE Common YANG Types November 2023 key "index"; ordered-by user; description + + + +Busi, et al. Expires 28 July 2024 [Page 90] + +Internet-Draft TE Common YANG Types January 2024 + + "List of Explicit Route Objects to be included in the path computation."; leaf index { @@ -5034,14 +5057,6 @@ Internet-Draft TE Common YANG Types November 2023 grouping path-route-exclude-objects { description - - - -Busi, et al. Expires 27 May 2024 [Page 90] - -Internet-Draft TE Common YANG Types November 2023 - - "List of route objects to be excluded when performing the path computation."; list route-object-exclude-object { @@ -5075,6 +5090,14 @@ Internet-Draft TE Common YANG Types November 2023 description "Augmentation for a generic explicit route for SRLG exclusion."; + + + +Busi, et al. Expires 28 July 2024 [Page 91] + +Internet-Draft TE Common YANG Types January 2024 + + } } } @@ -5090,14 +5113,6 @@ Internet-Draft TE Common YANG Types November 2023 key "metric-type"; description "List of TE path metric bounds."; - - - -Busi, et al. Expires 27 May 2024 [Page 91] - -Internet-Draft TE Common YANG Types November 2023 - - leaf metric-type { type identityref { base path-metric-type; @@ -5131,6 +5146,14 @@ Internet-Draft TE Common YANG Types November 2023 attributes to impose when computing a TE path."; choice algorithm { description + + + +Busi, et al. Expires 28 July 2024 [Page 92] + +Internet-Draft TE Common YANG Types January 2024 + + "Optimizations algorithm."; case metric { if-feature "path-optimization-metric"; @@ -5146,14 +5169,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Container for the list of tiebreakers."; list tiebreaker { - - - -Busi, et al. Expires 27 May 2024 [Page 92] - -Internet-Draft TE Common YANG Types November 2023 - - key "tiebreaker-type"; description "The list of tiebreaker criteria to apply on an @@ -5187,6 +5202,14 @@ Internet-Draft TE Common YANG Types November 2023 } } } + + + +Busi, et al. Expires 28 July 2024 [Page 93] + +Internet-Draft TE Common YANG Types January 2024 + + } } @@ -5202,14 +5225,6 @@ Internet-Draft TE Common YANG Types November 2023 "List of named affinity constraints."; leaf usage { type identityref { - - - -Busi, et al. Expires 27 May 2024 [Page 93] - -Internet-Draft TE Common YANG Types November 2023 - - base resource-affinities-type; } description @@ -5243,6 +5258,14 @@ Internet-Draft TE Common YANG Types November 2023 key "name"; leaf name { type string; + + + +Busi, et al. Expires 28 July 2024 [Page 94] + +Internet-Draft TE Common YANG Types January 2024 + + description "Identifies a named affinity entry."; } @@ -5258,14 +5281,6 @@ Internet-Draft TE Common YANG Types November 2023 "Path SRLG grouping."; container path-srlgs-lists { description - - - -Busi, et al. Expires 27 May 2024 [Page 94] - -Internet-Draft TE Common YANG Types November 2023 - - "Path SRLG properties container."; list path-srlgs-list { key "usage"; @@ -5299,6 +5314,14 @@ Internet-Draft TE Common YANG Types November 2023 } description "Identifies an entry in a list of named SRLGs to either + + + +Busi, et al. Expires 28 July 2024 [Page 95] + +Internet-Draft TE Common YANG Types January 2024 + + include or exclude."; } leaf-list names { @@ -5314,14 +5337,6 @@ Internet-Draft TE Common YANG Types November 2023 description "Path disjointness grouping."; leaf disjointness { - - - -Busi, et al. Expires 27 May 2024 [Page 95] - -Internet-Draft TE Common YANG Types November 2023 - - type te-path-disjointness; description "The type of resource disjointness. @@ -5355,6 +5370,14 @@ Internet-Draft TE Common YANG Types November 2023 grouping generic-path-properties { description "TE generic path properties grouping."; + + + +Busi, et al. Expires 28 July 2024 [Page 96] + +Internet-Draft TE Common YANG Types January 2024 + + container path-properties { config false; description @@ -5370,14 +5393,6 @@ Internet-Draft TE Common YANG Types November 2023 description "TE path metric type."; } - - - -Busi, et al. Expires 27 May 2024 [Page 96] - -Internet-Draft TE Common YANG Types November 2023 - - leaf accumulative-value { type uint64; description @@ -5411,6 +5426,14 @@ Internet-Draft TE Common YANG Types November 2023 } // NOTE: The grouping encoding-and-switching-type below has been + + + +Busi, et al. Expires 28 July 2024 [Page 97] + +Internet-Draft TE Common YANG Types January 2024 + + // added in this module revision // RFC Editor: remove the note above and this note grouping encoding-and-switching-type { @@ -5426,14 +5449,6 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC3945"; } - - - -Busi, et al. Expires 27 May 2024 [Page 97] - -Internet-Draft TE Common YANG Types November 2023 - - leaf switching-type { type identityref { base te-types:switching-capabilities; @@ -5467,6 +5482,14 @@ Internet-Draft TE Common YANG Types November 2023 /* Import TE generic types */ + + + +Busi, et al. Expires 28 July 2024 [Page 98] + +Internet-Draft TE Common YANG Types January 2024 + + import ietf-te-types { prefix te-types; reference @@ -5482,14 +5505,6 @@ Internet-Draft TE Common YANG Types November 2023 "WG Web: WG List: - - - -Busi, et al. Expires 27 May 2024 [Page 98] - -Internet-Draft TE Common YANG Types November 2023 - - Editor: Tarek Saad @@ -5523,6 +5538,14 @@ Internet-Draft TE Common YANG Types November 2023 This version of this YANG module is part of RFC XXXX (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself + + + +Busi, et al. Expires 28 July 2024 [Page 99] + +Internet-Draft TE Common YANG Types January 2024 + + for full legal notices."; revision 2023-11-16 { description @@ -5538,14 +5561,6 @@ Internet-Draft TE Common YANG Types November 2023 Updated module description."; reference "RFC XXXX: Common YANG Data Types for Traffic Engineering"; - - - -Busi, et al. Expires 27 May 2024 [Page 99] - -Internet-Draft TE Common YANG Types November 2023 - - } // RFC Editor: replace XXXX with actual RFC number, update date // information and remove this note @@ -5579,6 +5594,14 @@ Internet-Draft TE Common YANG Types November 2023 } identity rfc-2697-bwp { + + + +Busi, et al. Expires 28 July 2024 [Page 100] + +Internet-Draft TE Common YANG Types January 2024 + + base bandwidth-profile-type; description "RFC 2697 Bandwidth Profile"; @@ -5594,14 +5617,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC2698: A Two Rate Three Color Marker"; } - - - -Busi, et al. Expires 27 May 2024 [Page 100] - -Internet-Draft TE Common YANG Types November 2023 - - identity rfc-4115-bwp { base bandwidth-profile-type; description @@ -5635,6 +5650,14 @@ Internet-Draft TE Common YANG Types November 2023 RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + + + +Busi, et al. Expires 28 July 2024 [Page 101] + +Internet-Draft TE Common YANG Types January 2024 + + } // CHANGE NOTE: The identity path-metric-delay-variation below has @@ -5651,13 +5674,6 @@ Internet-Draft TE Common YANG Types November 2023 maximum value of the path delay variation that can be expressed. - - -Busi, et al. Expires 27 May 2024 [Page 101] - -Internet-Draft TE Common YANG Types November 2023 - - Values that are larger than the maximum value SHOULD be encoded as the maximum value."; reference @@ -5690,6 +5706,14 @@ Internet-Draft TE Common YANG Types November 2023 explicitly specified or automatically computed."; } + + + +Busi, et al. Expires 28 July 2024 [Page 102] + +Internet-Draft TE Common YANG Types January 2024 + + typedef te-class-type { type uint8; description @@ -5706,14 +5730,6 @@ Internet-Draft TE Common YANG Types November 2023 typedef bc-type { type uint8 { range "0..7"; - - - -Busi, et al. Expires 27 May 2024 [Page 102] - -Internet-Draft TE Common YANG Types November 2023 - - } description "Diffserv-TE bandwidth constraints as defined in RFC 4124."; @@ -5746,11 +5762,19 @@ Internet-Draft TE Common YANG Types November 2023 identity backup-protection-type { description "Base identity for the backup protection type."; - } - identity backup-protection-link { - base backup-protection-type; - description + + +Busi, et al. Expires 28 July 2024 [Page 103] + +Internet-Draft TE Common YANG Types January 2024 + + + } + + identity backup-protection-link { + base backup-protection-type; + description "Backup provides link protection only."; } @@ -5762,14 +5786,6 @@ Internet-Draft TE Common YANG Types November 2023 identity bc-model-type { description - - - -Busi, et al. Expires 27 May 2024 [Page 103] - -Internet-Draft TE Common YANG Types November 2023 - - "Base identity for the Diffserv-TE Bandwidth Constraints Model type."; reference @@ -5802,6 +5818,14 @@ Internet-Draft TE Common YANG Types November 2023 Model type."; reference "RFC 4126: Max Allocation with Reservation Bandwidth + + + +Busi, et al. Expires 28 July 2024 [Page 104] + +Internet-Draft TE Common YANG Types January 2024 + + Constraints Model for Diffserv-aware MPLS Traffic Engineering & Performance Comparisons"; } @@ -5818,14 +5842,6 @@ Internet-Draft TE Common YANG Types November 2023 leaf one-way-min-delay { type uint32 { range "0..16777215"; - - - -Busi, et al. Expires 27 May 2024 [Page 104] - -Internet-Draft TE Common YANG Types November 2023 - - } description "One-way minimum delay or latency in microseconds."; @@ -5858,6 +5874,14 @@ Internet-Draft TE Common YANG Types November 2023 reference "RFC 5481: Packet Delay Variation Applicability Statement, Section 4.2"; + + + +Busi, et al. Expires 28 July 2024 [Page 105] + +Internet-Draft TE Common YANG Types January 2024 + + } leaf one-way-delay-variation-normality { type te-types:performance-metrics-normality; @@ -5874,14 +5898,6 @@ Internet-Draft TE Common YANG Types November 2023 Extensions"; } leaf one-way-packet-loss { - - - -Busi, et al. Expires 27 May 2024 [Page 105] - -Internet-Draft TE Common YANG Types November 2023 - - type decimal64 { fraction-digits 6; range "0..50.331642"; @@ -5914,6 +5930,14 @@ Internet-Draft TE Common YANG Types November 2023 } augment "performance-metrics-two-way" { leaf two-way-min-delay { + + + +Busi, et al. Expires 28 July 2024 [Page 106] + +Internet-Draft TE Common YANG Types January 2024 + + type uint32 { range "0..16777215"; } @@ -5930,14 +5954,6 @@ Internet-Draft TE Common YANG Types November 2023 "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions RFC 7823: Performance-Based Path Selection for - - - -Busi, et al. Expires 27 May 2024 [Page 106] - -Internet-Draft TE Common YANG Types November 2023 - - Explicitly Routed Label Switched Paths (LSPs) Using TE Metric Extensions RFC 8570: IS-IS Traffic Engineering (TE) Metric @@ -5970,6 +5986,14 @@ Internet-Draft TE Common YANG Types November 2023 range "0..16777215"; } default "0"; + + + +Busi, et al. Expires 28 July 2024 [Page 107] + +Internet-Draft TE Common YANG Types January 2024 + + description "Two-way delay variation in microseconds."; reference @@ -5986,14 +6010,6 @@ Internet-Draft TE Common YANG Types November 2023 Extensions RFC 7823: Performance-Based Path Selection for Explicitly Routed Label Switched Paths (LSPs) Using - - - -Busi, et al. Expires 27 May 2024 [Page 107] - -Internet-Draft TE Common YANG Types November 2023 - - TE Metric Extensions RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; @@ -6026,6 +6042,14 @@ Internet-Draft TE Common YANG Types November 2023 RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; } + + + +Busi, et al. Expires 28 July 2024 [Page 108] + +Internet-Draft TE Common YANG Types January 2024 + + } } @@ -6042,14 +6066,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf one-way-max-delay { type uint32 { - - - -Busi, et al. Expires 27 May 2024 [Page 108] - -Internet-Draft TE Common YANG Types November 2023 - - range "0..16777215"; } default "0"; @@ -6082,6 +6098,14 @@ Internet-Draft TE Common YANG Types November 2023 "Two-way packet PM throttle grouping."; leaf two-way-min-delay { type uint32 { + + + +Busi, et al. Expires 28 July 2024 [Page 109] + +Internet-Draft TE Common YANG Types January 2024 + + range "0..16777215"; } default "0"; @@ -6098,14 +6122,6 @@ Internet-Draft TE Common YANG Types November 2023 } leaf two-way-delay-variation { type uint32 { - - - -Busi, et al. Expires 27 May 2024 [Page 109] - -Internet-Draft TE Common YANG Types November 2023 - - range "0..16777215"; } default "0"; @@ -6138,6 +6154,14 @@ Internet-Draft TE Common YANG Types November 2023 } augment "throttle/threshold-in" { uses one-way-performance-metrics-packet; + + + +Busi, et al. Expires 28 July 2024 [Page 110] + +Internet-Draft TE Common YANG Types January 2024 + + uses two-way-performance-metrics-packet; description "PM threshold-in packet augmentation for a @@ -6154,14 +6178,6 @@ Internet-Draft TE Common YANG Types November 2023 } // CHANGE NOTE: The te-packet-path-bandwidth below has been - - - -Busi, et al. Expires 27 May 2024 [Page 110] - -Internet-Draft TE Common YANG Types November 2023 - - // added in this module revision // RFC Editor: remove the note above and this note grouping te-packet-path-bandwidth { @@ -6194,6 +6210,14 @@ Internet-Draft TE Common YANG Types November 2023 leaf eir { type uint64; units "bits/second"; + + + +Busi, et al. Expires 28 July 2024 [Page 111] + +Internet-Draft TE Common YANG Types January 2024 + + description "Excess Information Rate (EIR)."; } @@ -6210,14 +6234,6 @@ Internet-Draft TE Common YANG Types November 2023 "Peak Information Rate (PIR)."; } leaf pbs { - - - -Busi, et al. Expires 27 May 2024 [Page 111] - -Internet-Draft TE Common YANG Types November 2023 - - type uint64; units "bytes"; description @@ -6248,6 +6264,16 @@ Internet-Draft TE Common YANG Types November 2023 For the following URIs in the "IETF XML Registry" [RFC3688], IANA has updated the reference field to refer to this document: + + + + + +Busi, et al. Expires 28 July 2024 [Page 112] + +Internet-Draft TE Common YANG Types January 2024 + + URI: urn:ietf:params:xml:ns:yang:ietf-te-types Registrant Contact: The IESG. XML: N/A, the requested URI is an XML namespace. @@ -6259,21 +6285,6 @@ Internet-Draft TE Common YANG Types November 2023 This document also adds updated YANG modules to the "YANG Module Names" registry [RFC7950]: - - - - - - - - - - -Busi, et al. Expires 27 May 2024 [Page 112] - -Internet-Draft TE Common YANG Types November 2023 - - name: ietf-te-types namespace: urn:ietf:params:xml:ns:yang:ietf-te-types prefix: te-types @@ -6311,6 +6322,14 @@ Internet-Draft TE Common YANG Types November 2023 operations (e.g., edit-config) to these data nodes without proper protection can have a negative effect on network operations. + + + +Busi, et al. Expires 28 July 2024 [Page 113] + +Internet-Draft TE Common YANG Types January 2024 + + The security considerations spelled out in the YANG 1.1 specification [RFC7950] apply for this document as well. @@ -6323,13 +6342,6 @@ Internet-Draft TE Common YANG Types November 2023 switching - Linear trail and subnetwork protection", ITU-T G.808.1 , May 2014. - - -Busi, et al. Expires 27 May 2024 [Page 113] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, @@ -6365,6 +6377,15 @@ Internet-Draft TE Common YANG Types November 2023 Concurrent Optimization", RFC 5557, DOI 10.17487/RFC5557, July 2009, . + + + + +Busi, et al. Expires 28 July 2024 [Page 114] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC6020] Bjorklund, M., Ed., "YANG - A Data Modeling Language for the Network Configuration Protocol (NETCONF)", RFC 6020, DOI 10.17487/RFC6020, October 2010, @@ -6379,13 +6400,6 @@ Internet-Draft TE Common YANG Types November 2023 Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011, . - - -Busi, et al. Expires 27 May 2024 [Page 114] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC6991] Schoenwaelder, J., Ed., "Common YANG Data Types", RFC 6991, DOI 10.17487/RFC6991, July 2013, . @@ -6419,6 +6433,15 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC8341, March 2018, . + + + + +Busi, et al. Expires 28 July 2024 [Page 115] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N., Ananthakrishnan, H., and X. Liu, "A YANG Data Model for Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March @@ -6435,13 +6458,6 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC8685, December 2019, . - - -Busi, et al. Expires 27 May 2024 [Page 115] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC8776] Saad, T., Gandhi, R., Liu, X., Beeram, V., and I. Bryskin, "Common YANG Data Types for Traffic Engineering", RFC 8776, DOI 10.17487/RFC8776, June 2020, @@ -6468,21 +6484,7 @@ Internet-Draft TE Common YANG Types November 2023 . - [I-D.ietf-teas-yang-path-computation] - Busi, I., Belotti, S., de Dios, O. G., Sharma, A., and Y. - Shi, "A YANG Data Model for requesting path computation", - Work in Progress, Internet-Draft, draft-ietf-teas-yang- - path-computation-21, 7 July 2023, - . - [I-D.ietf-teas-yang-te] - Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. - Bryskin, "A YANG Data Model for Traffic Engineering - Tunnels, Label Switched Paths and Interfaces", Work in - Progress, Internet-Draft, draft-ietf-teas-yang-te-34, 1 - October 2023, . @@ -6491,12 +6493,26 @@ Internet-Draft TE Common YANG Types November 2023 +Busi, et al. Expires 28 July 2024 [Page 116] + +Internet-Draft TE Common YANG Types January 2024 -Busi, et al. Expires 27 May 2024 [Page 116] - -Internet-Draft TE Common YANG Types November 2023 + [I-D.ietf-teas-yang-path-computation] + Busi, I., Belotti, S., de Dios, O. G., Sharma, A., and Y. + Shi, "A YANG Data Model for requesting path computation", + Work in Progress, Internet-Draft, draft-ietf-teas-yang- + path-computation-21, 7 July 2023, + . + [I-D.ietf-teas-yang-te] + Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. + Bryskin, "A YANG Data Model for Traffic Engineering + Tunnels, Label Switched Paths and Interfaces", Work in + Progress, Internet-Draft, draft-ietf-teas-yang-te-35, 12 + January 2024, . [I-D.ietf-teas-yang-te-mpls] Saad, T., Gandhi, R., Liu, X., Beeram, V. P., and I. @@ -6531,6 +6547,13 @@ Internet-Draft TE Common YANG Types November 2023 Tunnels", RFC 3209, DOI 10.17487/RFC3209, December 2001, . + + +Busi, et al. Expires 28 July 2024 [Page 117] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC3272] Awduche, D., Chiu, A., Elwalid, A., Widjaja, I., and X. Xiao, "Overview and Principles of Internet Traffic Engineering", RFC 3272, DOI 10.17487/RFC3272, May 2002, @@ -6546,14 +6569,6 @@ Internet-Draft TE Common YANG Types November 2023 (RSVP-TE)", RFC 3477, DOI 10.17487/RFC3477, January 2003, . - - - -Busi, et al. Expires 27 May 2024 [Page 117] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC3630] Katz, D., Kompella, K., and D. Yeung, "Traffic Engineering (TE) Extensions to OSPF Version 2", RFC 3630, DOI 10.17487/RFC3630, September 2003, @@ -6584,6 +6599,17 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC4124, June 2005, . + + + + + + +Busi, et al. Expires 28 July 2024 [Page 118] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC4125] Le Faucheur, F. and W. Lai, "Maximum Allocation Bandwidth Constraints Model for Diffserv-aware MPLS Traffic Engineering", RFC 4125, DOI 10.17487/RFC4125, June 2005, @@ -6600,16 +6626,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 4127, DOI 10.17487/RFC4127, June 2005, . - - - - - -Busi, et al. Expires 27 May 2024 [Page 118] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC4202] Kompella, K., Ed. and Y. Rekhter, Ed., "Routing Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 4202, DOI 10.17487/RFC4202, October 2005, @@ -6642,6 +6658,14 @@ Internet-Draft TE Common YANG Types November 2023 Requirements", RFC 4657, DOI 10.17487/RFC4657, September 2006, . + + + +Busi, et al. Expires 28 July 2024 [Page 119] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC4736] Vasseur, JP., Ed., Ikejiri, Y., and R. Zhang, "Reoptimization of Multiprotocol Label Switching (MPLS) Traffic Engineering (TE) Loosely Routed Label Switched @@ -6658,14 +6682,6 @@ Internet-Draft TE Common YANG Types November 2023 "GMPLS Segment Recovery", RFC 4873, DOI 10.17487/RFC4873, May 2007, . - - - -Busi, et al. Expires 27 May 2024 [Page 119] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC4875] Aggarwal, R., Ed., Papadimitriou, D., Ed., and S. Yasukawa, Ed., "Extensions to Resource Reservation Protocol - Traffic Engineering (RSVP-TE) for Point-to- @@ -6699,6 +6715,13 @@ Internet-Draft TE Common YANG Types November 2023 Engineering", RFC 5305, DOI 10.17487/RFC5305, October 2008, . + + +Busi, et al. Expires 28 July 2024 [Page 120] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC5307] Kompella, K., Ed. and Y. Rekhter, Ed., "IS-IS Extensions in Support of Generalized Multi-Protocol Label Switching (GMPLS)", RFC 5307, DOI 10.17487/RFC5307, October 2008, @@ -6715,13 +6738,6 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC5712, January 2010, . - - -Busi, et al. Expires 27 May 2024 [Page 120] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC6001] Papadimitriou, D., Vigoureux, M., Shiomoto, K., Brungard, D., and JL. Le Roux, "Generalized MPLS (GMPLS) Protocol Extensions for Multi-Layer and Multi-Region Networks (MLN/ @@ -6752,6 +6768,16 @@ Internet-Draft TE Common YANG Types November 2023 Label Switched Paths", RFC 6511, DOI 10.17487/RFC6511, February 2012, . + + + + + +Busi, et al. Expires 28 July 2024 [Page 121] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC6780] Berger, L., Le Faucheur, F., and A. Narayanan, "RSVP ASSOCIATION Object Extensions", RFC 6780, DOI 10.17487/RFC6780, October 2012, @@ -6768,16 +6794,6 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC6827, January 2013, . - - - - - -Busi, et al. Expires 27 May 2024 [Page 121] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., and K. Pithewan, "GMPLS Signaling Extensions for Control of Evolving G.709 Optical Transport Networks", RFC 7139, @@ -6810,6 +6826,14 @@ Internet-Draft TE Common YANG Types November 2023 DOI 10.17487/RFC7570, July 2015, . + + + +Busi, et al. Expires 28 July 2024 [Page 122] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC7571] Dong, J., Chen, M., Li, Z., and D. Ceccarelli, "GMPLS RSVP-TE Extensions for Lock Instruct and Loopback", RFC 7571, DOI 10.17487/RFC7571, July 2015, @@ -6827,13 +6851,6 @@ Internet-Draft TE Common YANG Types November 2023 RFC 7823, DOI 10.17487/RFC7823, May 2016, . - - -Busi, et al. Expires 27 May 2024 [Page 122] - -Internet-Draft TE Common YANG Types November 2023 - - [RFC8001] Zhang, F., Ed., Gonzalez de Dios, O., Ed., Margaria, C., Hartley, M., and Z. Ali, "RSVP-TE Extensions for Collecting Shared Risk Link Group (SRLG) Information", @@ -6862,6 +6879,17 @@ Internet-Draft TE Common YANG Types November 2023 Metric Extensions", RFC 8570, DOI 10.17487/RFC8570, March 2019, . + + + + + + +Busi, et al. Expires 28 July 2024 [Page 123] + +Internet-Draft TE Common YANG Types January 2024 + + [RFC9314] Jethanandani, M., Ed., Rahman, R., Ed., Zheng, L., Ed., Pallagatti, S., and G. Mirsky, "YANG Data Model for Bidirectional Forwarding Detection (BFD)", RFC 9314, @@ -6883,13 +6911,6 @@ A.1. TE Types YANG Diffs of the YANG model in Section 4 to the changes compared with the YANG model in [RFC8776]. - - -Busi, et al. Expires 27 May 2024 [Page 123] - -Internet-Draft TE Common YANG Types November 2023 - - This diff has been generated using the following UNIX commands to compare the YANG module revisions in section 3.1 of [RFC8776] and in Section 4: @@ -6917,6 +6938,14 @@ Internet-Draft TE Common YANG Types November 2023 < --- > + + + +Busi, et al. Expires 28 July 2024 [Page 124] + +Internet-Draft TE Common YANG Types January 2024 + + 55c65 < Copyright (c) 2020 IETF Trust and the persons identified as --- @@ -6938,14 +6967,6 @@ Internet-Draft TE Common YANG Types November 2023 > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; - - - -Busi, et al. Expires 27 May 2024 [Page 124] - -Internet-Draft TE Common YANG Types November 2023 - - > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; > - base identity path-computation-error-reason and @@ -6973,6 +6994,14 @@ Internet-Draft TE Common YANG Types November 2023 > // information and remove this note 545a588,615 > // CHANGE NOTE: The typedef path-type below has been + + + +Busi, et al. Expires 28 July 2024 [Page 125] + +Internet-Draft TE Common YANG Types January 2024 + + > // added in this module revision > // RFC Editor: remove the note above and this note > typedef path-type { @@ -6994,14 +7023,6 @@ Internet-Draft TE Common YANG Types November 2023 > "Indicates that the TE path is a secondary reverse path."; > } > } - - - -Busi, et al. Expires 27 May 2024 [Page 125] - -Internet-Draft TE Common YANG Types November 2023 - - > description > "The type of TE path, indicating whether a path is a primary, > or a reverse primary, or a secondary, or a reverse secondary @@ -7029,6 +7050,14 @@ Internet-Draft TE Common YANG Types November 2023 > reference > "RFC8800: Path Computation Element Communication Protocol > (PCEP) Extension for Label Switched Path (LSP) Diversity + + + +Busi, et al. Expires 28 July 2024 [Page 126] + +Internet-Draft TE Common YANG Types January 2024 + + > Constraint Signaling"; > } > @@ -7050,14 +7079,6 @@ Internet-Draft TE Common YANG Types November 2023 < consumption."; --- > consumption."; - - - -Busi, et al. Expires 27 May 2024 [Page 126] - -Internet-Draft TE Common YANG Types November 2023 - - 1023c1123 < Computation Element Communication Protocol (PCEP)"; --- @@ -7085,6 +7106,14 @@ Internet-Draft TE Common YANG Types November 2023 1216a1325,1336 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision + + + +Busi, et al. Expires 28 July 2024 [Page 127] + +Internet-Draft TE Common YANG Types January 2024 + + > // RFC Editor: remove the note above and this note > identity tunnel-admin-state-auto { > base tunnel-admin-state-type; @@ -7106,14 +7135,6 @@ Internet-Draft TE Common YANG Types November 2023 > } > 1628a1758,1761 - - - -Busi, et al. Expires 27 May 2024 [Page 127] - -Internet-Draft TE Common YANG Types November 2023 - - > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision @@ -7141,6 +7162,14 @@ Internet-Draft TE Common YANG Types November 2023 > "Base identity for path computation error reasons."; > } > + + + +Busi, et al. Expires 28 July 2024 [Page 128] + +Internet-Draft TE Common YANG Types January 2024 + + > identity path-computation-error-path-not-found { > base path-computation-error-reason; > description @@ -7162,14 +7191,6 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Path computation has failed because one or more dependent > path computation servers are unavailable. - - - -Busi, et al. Expires 27 May 2024 [Page 128] - -Internet-Draft TE Common YANG Types November 2023 - - > > The dependent path computation server could be > a Backward-Recursive Path Computation (BRPC) downstream @@ -7197,6 +7218,14 @@ Internet-Draft TE Common YANG Types November 2023 > "Path computation has failed because there is no > node or link provided by one or more inclusion hops."; > } + + + +Busi, et al. Expires 28 July 2024 [Page 129] + +Internet-Draft TE Common YANG Types January 2024 + + > > identity path-computation-error-destination-unknown-in-domain { > base path-computation-error-reason; @@ -7218,14 +7247,6 @@ Internet-Draft TE Common YANG Types November 2023 > "Path computation has failed because there is no > available resource in one or more domains. > - - - -Busi, et al. Expires 27 May 2024 [Page 129] - -Internet-Draft TE Common YANG Types November 2023 - - > It corresponds to bit 20 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference @@ -7253,6 +7274,14 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Path computation has failed because the destination domain > was unknown. + + + +Busi, et al. Expires 28 July 2024 [Page 130] + +Internet-Draft TE Common YANG Types January 2024 + + > > It corresponds to bit 22 of the Flags field of the > NO-PATH-VECTOR TLV."; @@ -7274,14 +7303,6 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC8306; > > https://www.iana.org/assignments/pcep/pcep.xhtml"; - - - -Busi, et al. Expires 27 May 2024 [Page 130] - -Internet-Draft TE Common YANG Types November 2023 - - > } > > identity path-computation-error-no-gco-migration { @@ -7309,6 +7330,14 @@ Internet-Draft TE Common YANG Types November 2023 > reference > "RFC5557; > + + + +Busi, et al. Expires 28 July 2024 [Page 131] + +Internet-Draft TE Common YANG Types January 2024 + + > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } > @@ -7330,14 +7359,6 @@ Internet-Draft TE Common YANG Types November 2023 > base path-computation-error-no-dependent-server; > description > "Path computation has failed because PCE BRPC chain - - - -Busi, et al. Expires 27 May 2024 [Page 131] - -Internet-Draft TE Common YANG Types November 2023 - - > unavailable. > > It corresponds to bit 28 of the Flags field of the @@ -7365,6 +7386,14 @@ Internet-Draft TE Common YANG Types November 2023 > identity path-computation-error-destination-unknown { > base path-computation-error-reason; > description + + + +Busi, et al. Expires 28 July 2024 [Page 132] + +Internet-Draft TE Common YANG Types January 2024 + + > "Path computation has failed because destination node is > unknown. > @@ -7386,14 +7415,6 @@ Internet-Draft TE Common YANG Types November 2023 > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } - - - -Busi, et al. Expires 27 May 2024 [Page 132] - -Internet-Draft TE Common YANG Types November 2023 - - > > // CHANGE NOTE: The base identity protocol-origin-type and > // its derived identities below have been @@ -7421,6 +7442,14 @@ Internet-Draft TE Common YANG Types November 2023 > > identity protocol-origin-bgp { > base protocol-origin-type; + + + +Busi, et al. Expires 28 July 2024 [Page 133] + +Internet-Draft TE Common YANG Types January 2024 + + > description > "Protocol origin is Border Gateway Protocol (BGP)."; > reference "RFC9012"; @@ -7442,14 +7471,6 @@ Internet-Draft TE Common YANG Types November 2023 > base svec-objective-function-type; > description > "Objective function for minimizing aggregate bandwidth - - - -Busi, et al. Expires 27 May 2024 [Page 133] - -Internet-Draft TE Common YANG Types November 2023 - - > consumption (MBC)."; > reference > "RFC5541: Encoding of Objective Functions in the Path @@ -7477,6 +7498,14 @@ Internet-Draft TE Common YANG Types November 2023 > } > > identity svec-of-minimize-common-transit-domain { + + + +Busi, et al. Expires 28 July 2024 [Page 134] + +Internet-Draft TE Common YANG Types January 2024 + + > base svec-objective-function-type; > description > "Objective function for minimizing the number of common @@ -7498,14 +7527,6 @@ Internet-Draft TE Common YANG Types November 2023 > Element (H-PCE) Architecture."; > } > - - - -Busi, et al. Expires 27 May 2024 [Page 134] - -Internet-Draft TE Common YANG Types November 2023 - - > identity svec-of-minimize-shared-srlg { > base svec-objective-function-type; > description @@ -7533,6 +7554,14 @@ Internet-Draft TE Common YANG Types November 2023 > // added in this module revision > // RFC Editor: remove the note above and this note > identity svec-metric-type { + + + +Busi, et al. Expires 28 July 2024 [Page 135] + +Internet-Draft TE Common YANG Types January 2024 + + > description > "Base identity for SVEC metric type."; > reference @@ -7554,14 +7583,6 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Cumulative IGP cost."; > reference - - - -Busi, et al. Expires 27 May 2024 [Page 135] - -Internet-Draft TE Common YANG Types November 2023 - - > "RFC5541: Encoding of Objective Functions in the Path > Computation Element Communication Protocol (PCEP)."; > } @@ -7589,6 +7610,14 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Load of the most loaded link."; > reference + + + +Busi, et al. Expires 28 July 2024 [Page 136] + +Internet-Draft TE Common YANG Types January 2024 + + > "RFC5541: Encoding of Objective Functions in the Path > Computation Element Communication Protocol (PCEP)."; > } @@ -7610,14 +7639,6 @@ Internet-Draft TE Common YANG Types November 2023 > "(node-id-uri or node-id)" { > description > "At least one node identifier and at least one Link - - - -Busi, et al. Expires 27 May 2024 [Page 136] - -Internet-Draft TE Common YANG Types November 2023 - - > Termination Point (LTP) identifier MUST be present."; > } > leaf link-tp-id-uri { @@ -7645,6 +7666,14 @@ Internet-Draft TE Common YANG Types November 2023 > type nw:node-id; > description > "The identifier of a node in the topology."; + + + +Busi, et al. Expires 28 July 2024 [Page 137] + +Internet-Draft TE Common YANG Types January 2024 + + > } 2651d3212 < mandatory true; @@ -7666,14 +7695,6 @@ Internet-Draft TE Common YANG Types November 2023 > leaf node-id-uri { > type nw:node-id; > description - - - -Busi, et al. Expires 27 May 2024 [Page 137] - -Internet-Draft TE Common YANG Types November 2023 - - > "The identifier of a node in the topology."; > } 2968a3545,3549 @@ -7701,6 +7722,14 @@ Internet-Draft TE Common YANG Types November 2023 > description > "LSP encoding type."; > reference + + + +Busi, et al. Expires 28 July 2024 [Page 138] + +Internet-Draft TE Common YANG Types January 2024 + + > "RFC3945"; > } > leaf switching-type { @@ -7722,14 +7751,6 @@ A.2. Packet TE Types YANG Diffs This section provides the diff between the YANG module in section 3.2 of [RFC8776] and the YANG model revision in Section 5. - - - -Busi, et al. Expires 27 May 2024 [Page 138] - -Internet-Draft TE Common YANG Types November 2023 - - The intention of this appendix is to facilitate focusing the review of the YANG model in Section 5 to the changes compared with the YANG model in [RFC8776]. @@ -7757,6 +7778,14 @@ Internet-Draft TE Common YANG Types November 2023 22c25 < --- + + + +Busi, et al. Expires 28 July 2024 [Page 139] + +Internet-Draft TE Common YANG Types January 2024 + + > 41c44 < Copyright (c) 2020 IETF Trust and the persons identified as @@ -7778,14 +7807,6 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Added common TE packet identities: > - bandwidth-profile-type. - - - -Busi, et al. Expires 27 May 2024 [Page 139] - -Internet-Draft TE Common YANG Types November 2023 - - > > Added common TE packet groupings: > - te-packet-path-bandwidth; @@ -7813,6 +7834,14 @@ Internet-Draft TE Common YANG Types November 2023 > } > > identity mef-10-bwp { + + + +Busi, et al. Expires 28 July 2024 [Page 140] + +Internet-Draft TE Common YANG Types January 2024 + + > base bandwidth-profile-type; > description > "MEF 10 Bandwidth Profile"; @@ -7834,14 +7863,6 @@ Internet-Draft TE Common YANG Types November 2023 > "RFC 2698 Bandwidth Profile"; > reference > "RFC2698: A Two Rate Three Color Marker"; - - - -Busi, et al. Expires 27 May 2024 [Page 140] - -Internet-Draft TE Common YANG Types November 2023 - - > } > > identity rfc-4115-bwp { @@ -7869,6 +7890,14 @@ Internet-Draft TE Common YANG Types November 2023 > grouping te-packet-path-bandwidth { > description > "Path bandwidth for Packet. "; + + + +Busi, et al. Expires 28 July 2024 [Page 141] + +Internet-Draft TE Common YANG Types January 2024 + + > leaf bandwidth-profile-name { > type string; > description "Name of Bandwidth Profile."; @@ -7890,14 +7919,6 @@ Internet-Draft TE Common YANG Types November 2023 > type uint64; > units "bits/second"; > mandatory true; - - - -Busi, et al. Expires 27 May 2024 [Page 141] - -Internet-Draft TE Common YANG Types November 2023 - - > description > "Committed Burst Size (CBS)."; > } @@ -7925,6 +7946,14 @@ Internet-Draft TE Common YANG Types November 2023 > description > "Peak Burst Size (PBS)."; > } + + + +Busi, et al. Expires 28 July 2024 [Page 142] + +Internet-Draft TE Common YANG Types January 2024 + + > } > > // CHANGE NOTE: The te-packet-path-bandwidth below has been @@ -7947,13 +7976,6 @@ Appendix B. Option Considered for updating RFC8776 published in [RFC8776] without delaying too much the progress of the mature WG documents. - - -Busi, et al. Expires 27 May 2024 [Page 142] - -Internet-Draft TE Common YANG Types November 2023 - - Three possible options have been identified to address this concern. One option is to keep these definitions in the YANG modules where @@ -7981,6 +8003,13 @@ Internet-Draft TE Common YANG Types November 2023 * describe within the document only the updates to the ietf-te-types YANG module proposed by this document; + + +Busi, et al. Expires 28 July 2024 [Page 143] + +Internet-Draft TE Common YANG Types January 2024 + + * include the whole updated YANG model within the main body; * add some notes, to be removed before publication, within updated @@ -8001,15 +8030,6 @@ Internet-Draft TE Common YANG Types November 2023 Future updates of this document could align with the proposed approach. - - - - -Busi, et al. Expires 27 May 2024 [Page 143] - -Internet-Draft TE Common YANG Types November 2023 - - Acknowledgements The authors would like to thank Robert Wilton, Lou Berger, Mahesh @@ -8038,6 +8058,14 @@ Authors' Addresses Email: italo.busi@huawei.com + + + +Busi, et al. Expires 28 July 2024 [Page 144] + +Internet-Draft TE Common YANG Types January 2024 + + Aihua Guo Futurewei Technologies Email: aihuaguo.ietf@gmail.com @@ -8061,4 +8089,32 @@ Authors' Addresses -Busi, et al. Expires 27 May 2024 [Page 144] + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Busi, et al. Expires 28 July 2024 [Page 145] diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml index 2de7fc2..7a17078 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml @@ -48,7 +48,7 @@ - + TEAS Working Group @@ -616,7 +616,7 @@ appear in all capitals, as shown here. RFC Editor: remove the CHANGE NOTE above and this note -
    : - + A YANG Data Model for Traffic Engineering Tunnels, Label Switched Paths and Interfaces @@ -5815,7 +5830,7 @@ Names" registry : Individual - + This document defines a YANG data model for the provisioning and management of Traffic Engineering (TE) tunnels, Label Switched Paths @@ -5829,7 +5844,7 @@ Names" registry : - + @@ -7850,769 +7865,772 @@ about the process to follow to provide tiny updates to a YANG module already pub diff --git a/ietf-te-types.yang b/ietf-te-types.yang index 51bd4c5..0cba2bf 100644 --- a/ietf-te-types.yang +++ b/ietf-te-types.yang @@ -75,7 +75,7 @@ module ietf-te-types { 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."; - revision 2023-11-24 { + revision 2023-11-25e { description "Added: - base identity lsp-provisioning-error-reason; @@ -102,7 +102,10 @@ module ietf-te-types { - identity of-minimize-load-most-loaded-link; - identity of-minimize-cost-path-set; - identity lsp-protection-reroute-extra; - - identity lsp-protection-reroute."; + - identity lsp-protection-reroute. + + Container explicit-route-objects-always renamed as + explicit-route-objects."; reference "RFC XXXX: Common YANG Data Types for Traffic Engineering"; } @@ -3619,7 +3622,7 @@ module ietf-te-types { description "List of route entries to be included or excluded when performing the path computation."; - container explicit-route-objects-always { + container explicit-route-objects { description "Container for the 'exclude route' object list."; list route-object-exclude-always { From b811f88288b197b421431143cb5218ed8c0d1dc2 Mon Sep 17 00:00:00 2001 From: italobusi Date: Thu, 25 Jan 2024 18:07:38 +0100 Subject: [PATCH 09/10] Fix compilation errors --- .../diffs/te-pkt-types/model-diff-spaces.txt | 105 +- .../diffs/te-pkt-types/model-diff.txt | 105 +- .../diffs/te-pkt-types/model-updates.txt | 105 +- .../diffs/te-types/model-diff-spaces.txt | 221 +- .../diffs/te-types/model-diff-spaces.txt\r" | 700 ------ .../diffs/te-types/model-diff.txt | 221 +- .../diffs/te-types/model-diff.txt\r" | 785 ------- .../diffs/te-types/model-updates.txt | 221 +- .../diffs/te-types/model-updates.txt\r" | 700 ------ .../draft-ietf-teas-rfc8776-update.md | 2 +- .../draft-ietf-teas-rfc8776-update.txt | 1158 ++++++---- .../draft-ietf-teas-rfc8776-update.xml | 1927 ++++++++++------- ietf-te-packet-types.yang | 17 +- 13 files changed, 2569 insertions(+), 3698 deletions(-) delete mode 100644 "drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" delete mode 100644 "drafts/te-types-update/diffs/te-types/model-diff.txt\r" delete mode 100644 "drafts/te-types-update/diffs/te-types/model-updates.txt\r" diff --git a/drafts/te-types-update/diffs/te-pkt-types/model-diff-spaces.txt b/drafts/te-types-update/diffs/te-pkt-types/model-diff-spaces.txt index ff9c424..52b68aa 100644 --- a/drafts/te-types-update/diffs/te-pkt-types/model-diff-spaces.txt +++ b/drafts/te-types-update/diffs/te-pkt-types/model-diff-spaces.txt @@ -1,46 +1,63 @@ - 11c11,12 + 11c11 < "RFC 8776: Common YANG Data Types for Traffic Engineering"; --- - > "RFCXXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - 12a14,15 + > "RFCXXXX: Common YANG Data Types for Traffic Engineering"; + 12a13,14 > // RFC Editor: replace XXXX with actual RFC number > // and remove this note - 22c25 + 22c24 < --- > - 41c44 + 37,39c39,49 + < data type definitions specific to MPLS TE. The model fully + < conforms to the Network Management Datastore Architecture + < (NMDA). + --- + > data type definitions specific to Packet Traffic Enginnering + > (TE). + > + > The model fully conforms to the Network Management Datastore + > Architecture (NMDA). + > + > 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. + 41c51 < Copyright (c) 2020 IETF Trust and the persons identified as --- - > Copyright (c) 2023 IETF Trust and the persons identified as - 46c49 + > Copyright (c) 2024 IETF Trust and the persons identified as + 46c56 < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set - 51,52c54,71 + 51,52c61,80 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; - > - > revision 2023-07-10 { + > revision 2024-01-25 { > description > "Added common TE packet identities: - > - bandwidth-profile-type. + > - bandwidth-profile-type; + > - path-metric-loss; + > - path-metric-delay-variation. > > Added common TE packet groupings: > - te-packet-path-bandwidth; - > - te-packet-link-bandwidth."; + > - te-packet-link-bandwidth. + > + > Updated module description."; > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note - 61c80,126 + 61c89,187 < /** --- > /* @@ -89,13 +106,65 @@ > Marker with Efficient Handling of in-Profile Traffic"; > } > + > // CHANGE NOTE: The identity path-metric-loss below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-loss { + > base te-types:path-metric-type; + > description + > "The path loss (as a packet percentage) metric type + > encodes a function of the unidirectional loss metrics of all + > links traversed by a P2P path. + > + > The basic unit is 0.000003%, + > where (2^24 - 2) or 50.331642% is the maximum value of the + > path loss percentage that can be expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > + > // CHANGE NOTE: The identity path-metric-delay-variation below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-delay-variation { + > base te-types:path-metric-type; + > description + > "The path delay variation encodes the sum of the unidirectional + > delay variation metrics of all links traversed by a P2P path. + > + > The path delay variation metric unit is in microseconds, where + > (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + > maximum value of the path delay variation that can be + > expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > > /* - 180a246,249 + 180a307,310 > /* > * Groupings > */ > - 472a542,611 + 472a603,672 > } > } > diff --git a/drafts/te-types-update/diffs/te-pkt-types/model-diff.txt b/drafts/te-types-update/diffs/te-pkt-types/model-diff.txt index c93abf9..fe0b68b 100644 --- a/drafts/te-types-update/diffs/te-pkt-types/model-diff.txt +++ b/drafts/te-types-update/diffs/te-pkt-types/model-diff.txt @@ -1,46 +1,63 @@ -11c11,12 +11c11 < "RFC 8776: Common YANG Data Types for Traffic Engineering"; --- -> "RFCXXXX: Updated Common YANG Data Types for Traffic -> Engineering"; -12a14,15 +> "RFCXXXX: Common YANG Data Types for Traffic Engineering"; +12a13,14 > // RFC Editor: replace XXXX with actual RFC number > // and remove this note -22c25 +22c24 < --- > -41c44 +37,39c39,49 +< data type definitions specific to MPLS TE. The model fully +< conforms to the Network Management Datastore Architecture +< (NMDA). +--- +> data type definitions specific to Packet Traffic Enginnering +> (TE). +> +> The model fully conforms to the Network Management Datastore +> Architecture (NMDA). +> +> 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. +41c51 < Copyright (c) 2020 IETF Trust and the persons identified as --- -> Copyright (c) 2023 IETF Trust and the persons identified as -46c49 +> Copyright (c) 2024 IETF Trust and the persons identified as +46c56 < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set -51,52c54,71 +51,52c61,80 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; -> -> revision 2023-07-10 { +> revision 2024-01-25 { > description > "Added common TE packet identities: -> - bandwidth-profile-type. +> - bandwidth-profile-type; +> - path-metric-loss; +> - path-metric-delay-variation. > > Added common TE packet groupings: > - te-packet-path-bandwidth; -> - te-packet-link-bandwidth."; +> - te-packet-link-bandwidth. +> +> Updated module description."; > reference -> "RFC XXXX: Updated Common YANG Data Types for Traffic -> Engineering"; +> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note -61c80,126 +61c89,187 < /** --- > /* @@ -89,13 +106,65 @@ > Marker with Efficient Handling of in-Profile Traffic"; > } > +> // CHANGE NOTE: The identity path-metric-loss below has +> // been added in this module revision +> // RFC Editor: remove the note above and this note +> identity path-metric-loss { +> base te-types:path-metric-type; +> description +> "The path loss (as a packet percentage) metric type +> encodes a function of the unidirectional loss metrics of all +> links traversed by a P2P path. +> +> The basic unit is 0.000003%, +> where (2^24 - 2) or 50.331642% is the maximum value of the +> path loss percentage that can be expressed. +> +> Values that are larger than the maximum value SHOULD be +> encoded as the maximum value."; +> reference +> "RFC8233: Extensions to the Path Computation Element +> Communication Protocol (PCEP) to Compute Service-Aware Label +> Switched Paths (LSPs); +> +> RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; +> +> RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; +> } +> +> // CHANGE NOTE: The identity path-metric-delay-variation below has +> // been added in this module revision +> // RFC Editor: remove the note above and this note +> identity path-metric-delay-variation { +> base te-types:path-metric-type; +> description +> "The path delay variation encodes the sum of the unidirectional +> delay variation metrics of all links traversed by a P2P path. +> +> The path delay variation metric unit is in microseconds, where +> (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the +> maximum value of the path delay variation that can be +> expressed. +> +> Values that are larger than the maximum value SHOULD be +> encoded as the maximum value."; +> reference +> "RFC8233: Extensions to the Path Computation Element +> Communication Protocol (PCEP) to Compute Service-Aware Label +> Switched Paths (LSPs); +> +> RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; +> +> RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; +> } +> > /* -180a246,249 +180a307,310 > /* > * Groupings > */ > -472a542,611 +472a603,672 > } > } > diff --git a/drafts/te-types-update/diffs/te-pkt-types/model-updates.txt b/drafts/te-types-update/diffs/te-pkt-types/model-updates.txt index ff9c424..52b68aa 100644 --- a/drafts/te-types-update/diffs/te-pkt-types/model-updates.txt +++ b/drafts/te-types-update/diffs/te-pkt-types/model-updates.txt @@ -1,46 +1,63 @@ - 11c11,12 + 11c11 < "RFC 8776: Common YANG Data Types for Traffic Engineering"; --- - > "RFCXXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - 12a14,15 + > "RFCXXXX: Common YANG Data Types for Traffic Engineering"; + 12a13,14 > // RFC Editor: replace XXXX with actual RFC number > // and remove this note - 22c25 + 22c24 < --- > - 41c44 + 37,39c39,49 + < data type definitions specific to MPLS TE. The model fully + < conforms to the Network Management Datastore Architecture + < (NMDA). + --- + > data type definitions specific to Packet Traffic Enginnering + > (TE). + > + > The model fully conforms to the Network Management Datastore + > Architecture (NMDA). + > + > 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. + 41c51 < Copyright (c) 2020 IETF Trust and the persons identified as --- - > Copyright (c) 2023 IETF Trust and the persons identified as - 46c49 + > Copyright (c) 2024 IETF Trust and the persons identified as + 46c56 < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set - 51,52c54,71 + 51,52c61,80 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; - > - > revision 2023-07-10 { + > revision 2024-01-25 { > description > "Added common TE packet identities: - > - bandwidth-profile-type. + > - bandwidth-profile-type; + > - path-metric-loss; + > - path-metric-delay-variation. > > Added common TE packet groupings: > - te-packet-path-bandwidth; - > - te-packet-link-bandwidth."; + > - te-packet-link-bandwidth. + > + > Updated module description."; > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note - 61c80,126 + 61c89,187 < /** --- > /* @@ -89,13 +106,65 @@ > Marker with Efficient Handling of in-Profile Traffic"; > } > + > // CHANGE NOTE: The identity path-metric-loss below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-loss { + > base te-types:path-metric-type; + > description + > "The path loss (as a packet percentage) metric type + > encodes a function of the unidirectional loss metrics of all + > links traversed by a P2P path. + > + > The basic unit is 0.000003%, + > where (2^24 - 2) or 50.331642% is the maximum value of the + > path loss percentage that can be expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > + > // CHANGE NOTE: The identity path-metric-delay-variation below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-delay-variation { + > base te-types:path-metric-type; + > description + > "The path delay variation encodes the sum of the unidirectional + > delay variation metrics of all links traversed by a P2P path. + > + > The path delay variation metric unit is in microseconds, where + > (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + > maximum value of the path delay variation that can be + > expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > > /* - 180a246,249 + 180a307,310 > /* > * Groupings > */ > - 472a542,611 + 472a603,672 > } > } > diff --git a/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt b/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt index df17eab..55cc508 100644 --- a/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt +++ b/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt @@ -21,21 +21,21 @@ < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set - 65,66c75,108 + 65,66c75,113 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; - > - > revision 2023-06-27 { + > revision 2023-11-25e { > description > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; + > - identity restoration-scheme-rerouting; > - base identity path-computation-error-reason and > its derived identities; > - base identity protocol-origin-type and @@ -47,19 +47,54 @@ > > Updated: > - description of the base identity objective-function-type; - > - description and reference of identity action-exercise. + > - description and reference of identity action-exercise; + > - typedef te-node-id to support also 16 octects TE identifiers. > > Obsoleted: - > - identity of-minimize-agg-bandwidth-consumption - > - identity of-minimize-load-most-loaded-link - > - identity of-minimize-cost-path-set"; + > - identity of-minimize-agg-bandwidth-consumption; + > - identity of-minimize-load-most-loaded-link; + > - identity of-minimize-cost-path-set; + > - identity lsp-protection-reroute-extra; + > - identity lsp-protection-reroute. + > + > Container explicit-route-objects-always renamed as + > explicit-route-objects."; > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note - 545a588,615 + 353c400,403 + < type yang:dotted-quad; + --- + > type union { + > type yang:dotted-quad; + > type inet:ipv6-address-no-zone; + > } + 357,358c407,411 + < The identifier is represented as 4 octets in dotted-quad + < notation. + --- + > + > The identifier is represented either as 4 octets in + > dotted-quad notation or 16 octets in full, mixed, shortened, + > or shortened-mixed IPv6 address notation. + > + 362,363c415,418 + < Router ID TLV described in Section 4.3 of RFC 5305, or the + < TE Router ID TLV described in Section 3.2.1 of RFC 6119. + --- + > Router ID TLV described in Section 4.3 of RFC 5305, the TE + > Router ID TLV described in Section 3.2.1 of RFC 6119, or the + > IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. + > + 368a424 + > + 370a427 + > + 371a429 + > + 545a604,631 > // CHANGE NOTE: The typedef path-type below has been > // added in this module revision > // RFC Editor: remove the note above and this note @@ -88,7 +123,7 @@ > path."; > } > - 606a677,684 + 606a693,700 > // CHANGE NOTE: The base identity lsp-provisioning-error-reason > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -97,7 +132,7 @@ > "Base identity for LSP provisioning errors."; > } > - 982a1061,1078 + 982a1077,1094 > // CHANGE NOTE: The identity association-type-diversity below has > // been added in this module revision > // RFC Editor: remove the note above and this note @@ -116,45 +151,45 @@ > // objective-function-type has been updated > // in this module revision > // RFC Editor: remove the note above and this note - 985c1081 + 985c1097 < "Base objective function type."; --- > "Base identity for path objective function type."; - 1015a1112,1114 + 1015a1128,1130 > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1017a1117 + 1017a1133 > status obsolete; - 1020c1120 + 1020c1136 < consumption."; --- > consumption."; - 1023c1123 + 1023c1139 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1025a1126,1128 + 1025a1142,1144 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1027a1131 + 1027a1147 > status obsolete; - 1030c1134 + 1030c1150 < is carrying the highest load."; --- > is carrying the highest load."; - 1033c1137 + 1033c1153 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1035a1140,1142 + 1035a1156,1158 > // CHANGE NOTE: The identity of-minimize-cost-path-set > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1037a1145 + 1037a1161 > status obsolete; - 1216a1325,1336 + 1216a1341,1352 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -167,7 +202,7 @@ > when it is not used by the client layer."; > } > - 1321a1442,1450 + 1321a1458,1466 > // CHANGE NOTE: The identity lsp-restoration-restore-none > // below has been added in this module revision > // RFC Editor: remove the note above and this note @@ -177,25 +212,90 @@ > "No LSP affected by a failure is restored."; > } > - 1628a1758,1761 + 1339a1485,1499 + > // CHANGE NOTE: The identity restoration-scheme-rerouting + > // below has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity restoration-scheme-rerouting { + > base restoration-scheme-type; + > description + > "Restoration LSP is computed after the failure detection. + > + > This restoration scheme is also known as + > 'Full LSP Re-routing.'"; + > reference + > "RFC 4427: Recovery (Protection and Restoration) Terminology + > for Generalized Multi-Protocol Label Switching (GMPLS)"; + > } + > + 1383a1544,1546 + > // CHANGE NOTE: The identity lsp-protection-reroute-extra + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1385a1549 + > status obsolete; + 1387c1551,1555 + < "'(Full) Rerouting' LSP protection type."; + --- + > "'(Full) Rerouting' LSP protection type. + > + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1392a1561,1563 + > // CHANGE NOTE: The identity lsp-protection-reroute + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1394a1566 + > status obsolete; + 1396c1568,1572 + < "'Rerouting without Extra-Traffic' LSP protection type."; + --- + > "'Rerouting without Extra-Traffic' LSP protection type. + > + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1628a1805,1808 > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision > // RFC Editor: remove the note above and this note - 1632,1633c1765,1767 + 1632,1633c1812,1814 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any --- > "An action that starts testing whether or not Automatic > Protection Switching (APS) communication is operating > correctly. It is of lower priority than any - 1636,1637c1770,1771 + 1636,1637c1817,1818 < "RFC 4427: Recovery (Protection and Restoration) Terminology < for Generalized Multi-Protocol Label Switching (GMPLS)"; --- > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - > Linear trail and subnetwork protection"; - 2110a2245,2641 + 1916a2098,2100 + > // CHANGE NOTE: The description of the identity path-metric-type + > // has been updated in this module revision + > // RFC Editor: remove the note above and this note + 1919c2103,2106 + < "Base identity for the path metric type."; + --- + > "Base identity for the path metric type. + > + > Derived identities SHOULD describe the unit and maximum value + > of the path metric types they define."; + 1939a2127,2129 + > // CHANGE NOTE: The reference for the identity path-metric-hop + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + 1943a2134,2136 + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; + 1945a2139 + > + 2110a2305,2708 > // CHANGE NOTE: The base identity path-computation-error-reason > // and its derived identities below have been > // added in this module revision @@ -211,7 +311,8 @@ > "Path computation has failed because of an unspecified > reason."; > reference - > "Section 7.5 of RFC5440"; + > "Section 7.5 of RFC5440: Path Computation Element (PCE) + > Communication Protocol (PCEP)"; > } > > identity path-computation-error-no-topology { @@ -242,7 +343,8 @@ > It corresponds to bit 31 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -389,7 +491,8 @@ > It corresponds to bit 29 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -403,7 +506,8 @@ > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -414,7 +518,8 @@ > "Path computation has failed because path computation > server is unavailable."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -440,7 +545,9 @@ > description > "Protocol origin is Path Computation Engine Protocol > (PCEP)."; - > reference "RFC5440"; + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; > } > > identity protocol-origin-bgp { @@ -593,7 +700,7 @@ > Computation Element Communication Protocol (PCEP)."; > } > - 2514a3046,3054 + 2514a3113,3121 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; @@ -603,9 +710,9 @@ > description > "The identifier of a node in the topology."; > } - 2517d3056 + 2517d3123 < mandatory true; - 2566a3106,3116 + 2566a3173,3183 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -617,30 +724,30 @@ > description > "Link Termination Point (LTP) identifier."; > } - 2569d3118 + 2569d3185 < mandatory true; - 2574a3124,3128 + 2574a3191,3195 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2577d3130 + 2577d3197 < mandatory true; - 2646a3200,3203 + 2646a3267,3270 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; > } - 2648a3206,3210 + 2648a3273,3277 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2651d3212 + 2651d3279 < mandatory true; - 2696a3258,3268 + 2696a3325,3335 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -652,21 +759,37 @@ > description > "Link Termination Point (LTP) identifier."; > } - 2699d3270 + 2699d3337 < mandatory true; - 2704a3276,3280 + 2704a3343,3347 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2968a3545,3549 + 2968a3612,3616 > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; > } - 3379c3960,3987 + 2977c3625 + < container explicit-route-objects-always { + --- + > container explicit-route-objects { + 3124,3126c3772,3778 + < "Upper bound on the end-to-end TE path metric. A zero + < indicates an unbounded upper limit for the specific + < 'metric-type'."; + --- + > "Upper bound on the end-to-end TE path metric. + > + > A zero indicates an unbounded upper limit for the + > specific 'metric-type'. + > + > The unit of is interpreted in the context of the + > path-metric-type."; + 3379c4031,4058 < } \ No newline at end of file --- diff --git "a/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" "b/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" deleted file mode 100644 index df17eab..0000000 --- "a/drafts/te-types-update/diffs/te-types/model-diff-spaces.txt\r" +++ /dev/null @@ -1,700 +0,0 @@ - 21a22,31 - > import ietf-network { - > prefix "nw"; - > reference "RFC 8345: A YANG Data Model for Network Topologies"; - > } - > - > import ietf-network-topology { - > prefix "nt"; - > reference "RFC 8345: A YANG Data Model for Network Topologies"; - > } - > - 30c40 - < - --- - > - 55c65 - < Copyright (c) 2020 IETF Trust and the persons identified as - --- - > Copyright (c) 2023 IETF Trust and the persons identified as - 60c70 - < the license terms contained in, the Simplified BSD License set - --- - > the license terms contained in, the Revised BSD License set - 65,66c75,108 - < This version of this YANG module is part of RFC 8776; see the - < RFC itself for full legal notices."; - --- - > 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."; - > - > revision 2023-06-27 { - > description - > "Added: - > - base identity lsp-provisioning-error-reason; - > - identity association-type-diversity; - > - identity tunnel-admin-state-auto; - > - identity lsp-restoration-restore-none; - > - base identity path-computation-error-reason and - > its derived identities; - > - base identity protocol-origin-type and - > its derived identities; - > - base identity svec-objective-function-type and its derived - > identities; - > - base identity svec-metric-type and its derived identities; - > - grouping encoding-and-switching-type. - > - > Updated: - > - description of the base identity objective-function-type; - > - description and reference of identity action-exercise. - > - > Obsoleted: - > - identity of-minimize-agg-bandwidth-consumption - > - identity of-minimize-load-most-loaded-link - > - identity of-minimize-cost-path-set"; - > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - > } - > // RFC Editor: replace XXXX with actual RFC number, update date - > // information and remove this note - 545a588,615 - > // CHANGE NOTE: The typedef path-type below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > typedef path-type { - > type enumeration { - > enum primary-path { - > description - > "Indicates that the TE path is a primary path."; - > } - > enum secondary-path { - > description - > "Indicates that the TE path is a secondary path."; - > } - > enum primary-reverse-path { - > description - > "Indicates that the TE path is a primary reverse path."; - > } - > enum secondary-reverse-path { - > description - > "Indicates that the TE path is a secondary reverse path."; - > } - > } - > description - > "The type of TE path, indicating whether a path is a primary, - > or a reverse primary, or a secondary, or a reverse secondary - > path."; - > } - > - 606a677,684 - > // CHANGE NOTE: The base identity lsp-provisioning-error-reason - > // has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity lsp-provisioning-error-reason { - > description - > "Base identity for LSP provisioning errors."; - > } - > - 982a1061,1078 - > // CHANGE NOTE: The identity association-type-diversity below has - > // been added in this module revision - > // RFC Editor: remove the note above and this note - > identity association-type-diversity { - > base association-type; - > description - > "Association Type diversity used to associate LSPs whose - > paths are to be diverse from each other."; - > reference - > "RFC8800: Path Computation Element Communication Protocol - > (PCEP) Extension for Label Switched Path (LSP) Diversity - > Constraint Signaling"; - > } - > - > // CHANGE NOTE: The description of the base identity - > // objective-function-type has been updated - > // in this module revision - > // RFC Editor: remove the note above and this note - 985c1081 - < "Base objective function type."; - --- - > "Base identity for path objective function type."; - 1015a1112,1114 - > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1017a1117 - > status obsolete; - 1020c1120 - < consumption."; - --- - > consumption."; - 1023c1123 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; - 1025a1126,1128 - > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1027a1131 - > status obsolete; - 1030c1134 - < is carrying the highest load."; - --- - > is carrying the highest load."; - 1033c1137 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; - 1035a1140,1142 - > // CHANGE NOTE: The identity of-minimize-cost-path-set - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1037a1145 - > status obsolete; - 1216a1325,1336 - > // CHANGE NOTE: The identity tunnel-admin-state-auto below - > // has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity tunnel-admin-state-auto { - > base tunnel-admin-state-type; - > description - > "Tunnel administrative auto state. The administrative status - > in state datastore transitions to 'tunnel-admin-up' when the - > tunnel used by the client layer, and to 'tunnel-admin-down' - > when it is not used by the client layer."; - > } - > - 1321a1442,1450 - > // CHANGE NOTE: The identity lsp-restoration-restore-none - > // below has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity lsp-restoration-restore-none { - > base lsp-restoration-type; - > description - > "No LSP affected by a failure is restored."; - > } - > - 1628a1758,1761 - > // cCHANGE NOTE: The description and reference of the - > // identity action-exercise have been updated in this module - > // revision - > // RFC Editor: remove the note above and this note - 1632,1633c1765,1767 - < "An action that starts testing whether or not APS communication - < is operating correctly. It is of lower priority than any - --- - > "An action that starts testing whether or not Automatic - > Protection Switching (APS) communication is operating - > correctly. It is of lower priority than any - 1636,1637c1770,1771 - < "RFC 4427: Recovery (Protection and Restoration) Terminology - < for Generalized Multi-Protocol Label Switching (GMPLS)"; - --- - > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - - > Linear trail and subnetwork protection"; - 2110a2245,2641 - > // CHANGE NOTE: The base identity path-computation-error-reason - > // and its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity path-computation-error-reason { - > description - > "Base identity for path computation error reasons."; - > } - > - > identity path-computation-error-path-not-found { - > base path-computation-error-reason; - > description - > "Path computation has failed because of an unspecified - > reason."; - > reference - > "Section 7.5 of RFC5440"; - > } - > - > identity path-computation-error-no-topology { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no topology - > with the provided topology-identifier."; - > } - > - > identity path-computation-error-no-dependent-server { - > base path-computation-error-reason; - > description - > "Path computation has failed because one or more dependent - > path computation servers are unavailable. - > - > The dependent path computation server could be - > a Backward-Recursive Path Computation (BRPC) downstream - > PCE or a child PCE."; - > reference - > "RFC5441, RFC8685"; - > } - > - > identity path-computation-error-pce-unavailable { - > base path-computation-error-reason; - > description - > "Path computation has failed because PCE is not available. - > - > It corresponds to bit 31 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-inclusion-hop { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no - > node or link provided by one or more inclusion hops."; - > } - > - > identity path-computation-error-destination-unknown-in-domain { - > base path-computation-error-reason; - > description - > "Path computation has failed because the destination node is - > unknown in indicated destination domain. - > - > It corresponds to bit 19 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-resource { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no - > available resource in one or more domains. - > - > It corresponds to bit 20 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-child-pce-unresponsive { - > base path-computation-error-no-dependent-server; - > description - > "Path computation has failed because child PCE is not - > responsive. - > - > It corresponds to bit 21 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-destination-domain-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because the destination domain - > was unknown. - > - > It corresponds to bit 22 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-p2mp { - > base path-computation-error-reason; - > description - > "Path computation has failed because of P2MP reachability - > problem. - > - > It corresponds to bit 24 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8306; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-gco-migration { - > base path-computation-error-reason; - > description - > "Path computation has failed because of no Global Concurrent - > Optimization (GCO) migration path found. - > - > It corresponds to bit 26 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5557; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-gco-solution { - > base path-computation-error-reason; - > description - > "Path computation has failed because of no GCO solution - > found. - > - > It corresponds to bit 25 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5557; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-pks-expansion { - > base path-computation-error-reason; - > description - > "Path computation has failed because of Path-Key Subobject - > (PKS) expansion failure. - > - > It corresponds to bit 27 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5520; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-brpc-chain-unavailable { - > base path-computation-error-no-dependent-server; - > description - > "Path computation has failed because PCE BRPC chain - > unavailable. - > - > It corresponds to bit 28 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5441; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-source-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because source node is - > unknown. - > - > It corresponds to bit 29 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-destination-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because destination node is - > unknown. - > - > It corresponds to bit 30 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-server { - > base path-computation-error-reason; - > description - > "Path computation has failed because path computation - > server is unavailable."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > // CHANGE NOTE: The base identity protocol-origin-type and - > // its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity protocol-origin-type { - > description - > "Base identity for protocol origin type."; - > } - > - > identity protocol-origin-api { - > base protocol-origin-type; - > description - > "Protocol origin is via Application Programmable Interface - > (API)."; - > } - > - > identity protocol-origin-pcep { - > base protocol-origin-type; - > description - > "Protocol origin is Path Computation Engine Protocol - > (PCEP)."; - > reference "RFC5440"; - > } - > - > identity protocol-origin-bgp { - > base protocol-origin-type; - > description - > "Protocol origin is Border Gateway Protocol (BGP)."; - > reference "RFC9012"; - > } - > - > // CHANGE NOTE: The base identity svec-objective-function-type - > // and its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity svec-objective-function-type { - > description - > "Base identity for SVEC objective function type."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-agg-bandwidth-consumption { - > base svec-objective-function-type; - > description - > "Objective function for minimizing aggregate bandwidth - > consumption (MBC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-load-most-loaded-link { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the load on the link that - > is carrying the highest load (MLL)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-cost-path-set { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the cost on a path set - > (MCC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-common-transit-domain { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of common - > transit domains (MCTD)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-link { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > links (MSL)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-srlg { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > Shared Risk Link Groups (SRLG) (MSS)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-nodes { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > nodes (MSN)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > // CHANGE NOTE: The base identity svec-metric-type and - > // its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity svec-metric-type { - > description - > "Base identity for SVEC metric type."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-te { - > base svec-metric-type; - > description - > "Cumulative TE cost."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-igp { - > base svec-metric-type; - > description - > "Cumulative IGP cost."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-hop { - > base svec-metric-type; - > description - > "Cumulative Hop path metric."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-aggregate-bandwidth-consumption { - > base svec-metric-type; - > description - > "Aggregate bandwidth consumption."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-load-of-the-most-loaded-link { - > base svec-metric-type; - > description - > "Load of the most loaded link."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - 2514a3046,3054 - > must "node-id-uri or node-id" { - > description - > "At least one node identifier MUST be present."; - > } - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2517d3056 - < mandatory true; - 2566a3106,3116 - > must "(link-tp-id-uri or link-tp-id) and " + - > "(node-id-uri or node-id)" { - > description - > "At least one node identifier and at least one Link - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; - > description - > "Link Termination Point (LTP) identifier."; - > } - 2569d3118 - < mandatory true; - 2574a3124,3128 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2577d3130 - < mandatory true; - 2646a3200,3203 - > must "node-id-uri or node-id" { - > description - > "At least one node identifier MUST be present."; - > } - 2648a3206,3210 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2651d3212 - < mandatory true; - 2696a3258,3268 - > must "(link-tp-id-uri or link-tp-id) and " + - > "(node-id-uri or node-id)" { - > description - > "At least one node identifier and at least one Link - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; - > description - > "Link Termination Point (LTP) identifier."; - > } - 2699d3270 - < mandatory true; - 2704a3276,3280 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2968a3545,3549 - > leaf network-id { - > type nw:network-id; - > description - > "The network topology identifier."; - > } - 3379c3960,3987 - < } - \ No newline at end of file - --- - > - > // NOTE: The grouping encoding-and-switching-type below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > grouping encoding-and-switching-type { - > description - > "Common grouping to define the LSP encoding and - > switching types"; - > leaf encoding { - > type identityref { - > base te-types:lsp-encoding-types; - > } - > description - > "LSP encoding type."; - > reference - > "RFC3945"; - > } - > leaf switching-type { - > type identityref { - > base te-types:switching-capabilities; - > } - > description - > "LSP switching type."; - > reference - > "RFC3945"; - > } - > } - > } diff --git a/drafts/te-types-update/diffs/te-types/model-diff.txt b/drafts/te-types-update/diffs/te-types/model-diff.txt index 71e3825..12d4791 100644 --- a/drafts/te-types-update/diffs/te-types/model-diff.txt +++ b/drafts/te-types-update/diffs/te-types/model-diff.txt @@ -21,21 +21,21 @@ < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set -65,66c75,108 +65,66c75,113 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; -> -> revision 2023-06-27 { +> revision 2023-11-25e { > description > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; +> - identity restoration-scheme-rerouting; > - base identity path-computation-error-reason and > its derived identities; > - base identity protocol-origin-type and @@ -47,19 +47,54 @@ > > Updated: > - description of the base identity objective-function-type; -> - description and reference of identity action-exercise. +> - description and reference of identity action-exercise; +> - typedef te-node-id to support also 16 octects TE identifiers. > > Obsoleted: -> - identity of-minimize-agg-bandwidth-consumption -> - identity of-minimize-load-most-loaded-link -> - identity of-minimize-cost-path-set"; +> - identity of-minimize-agg-bandwidth-consumption; +> - identity of-minimize-load-most-loaded-link; +> - identity of-minimize-cost-path-set; +> - identity lsp-protection-reroute-extra; +> - identity lsp-protection-reroute. +> +> Container explicit-route-objects-always renamed as +> explicit-route-objects."; > reference -> "RFC XXXX: Updated Common YANG Data Types for Traffic -> Engineering"; +> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note -545a588,615 +353c400,403 +< type yang:dotted-quad; +--- +> type union { +> type yang:dotted-quad; +> type inet:ipv6-address-no-zone; +> } +357,358c407,411 +< The identifier is represented as 4 octets in dotted-quad +< notation. +--- +> +> The identifier is represented either as 4 octets in +> dotted-quad notation or 16 octets in full, mixed, shortened, +> or shortened-mixed IPv6 address notation. +> +362,363c415,418 +< Router ID TLV described in Section 4.3 of RFC 5305, or the +< TE Router ID TLV described in Section 3.2.1 of RFC 6119. +--- +> Router ID TLV described in Section 4.3 of RFC 5305, the TE +> Router ID TLV described in Section 3.2.1 of RFC 6119, or the +> IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. +> +368a424 +> +370a427 +> +371a429 +> +545a604,631 > // CHANGE NOTE: The typedef path-type below has been > // added in this module revision > // RFC Editor: remove the note above and this note @@ -88,7 +123,7 @@ > path."; > } > -606a677,684 +606a693,700 > // CHANGE NOTE: The base identity lsp-provisioning-error-reason > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -97,7 +132,7 @@ > "Base identity for LSP provisioning errors."; > } > -982a1061,1078 +982a1077,1094 > // CHANGE NOTE: The identity association-type-diversity below has > // been added in this module revision > // RFC Editor: remove the note above and this note @@ -116,45 +151,45 @@ > // objective-function-type has been updated > // in this module revision > // RFC Editor: remove the note above and this note -985c1081 +985c1097 < "Base objective function type."; --- > "Base identity for path objective function type."; -1015a1112,1114 +1015a1128,1130 > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1017a1117 +1017a1133 > status obsolete; -1020c1120 +1020c1136 < consumption."; --- > consumption."; -1023c1123 +1023c1139 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; -1025a1126,1128 +1025a1142,1144 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1027a1131 +1027a1147 > status obsolete; -1030c1134 +1030c1150 < is carrying the highest load."; --- > is carrying the highest load."; -1033c1137 +1033c1153 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; -1035a1140,1142 +1035a1156,1158 > // CHANGE NOTE: The identity of-minimize-cost-path-set > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1037a1145 +1037a1161 > status obsolete; -1216a1325,1336 +1216a1341,1352 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -167,7 +202,7 @@ > when it is not used by the client layer."; > } > -1321a1442,1450 +1321a1458,1466 > // CHANGE NOTE: The identity lsp-restoration-restore-none > // below has been added in this module revision > // RFC Editor: remove the note above and this note @@ -177,25 +212,90 @@ > "No LSP affected by a failure is restored."; > } > -1628a1758,1761 +1339a1485,1499 +> // CHANGE NOTE: The identity restoration-scheme-rerouting +> // below has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity restoration-scheme-rerouting { +> base restoration-scheme-type; +> description +> "Restoration LSP is computed after the failure detection. +> +> This restoration scheme is also known as +> 'Full LSP Re-routing.'"; +> reference +> "RFC 4427: Recovery (Protection and Restoration) Terminology +> for Generalized Multi-Protocol Label Switching (GMPLS)"; +> } +> +1383a1544,1546 +> // CHANGE NOTE: The identity lsp-protection-reroute-extra +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1385a1549 +> status obsolete; +1387c1551,1555 +< "'(Full) Rerouting' LSP protection type."; +--- +> "'(Full) Rerouting' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1392a1561,1563 +> // CHANGE NOTE: The identity lsp-protection-reroute +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1394a1566 +> status obsolete; +1396c1568,1572 +< "'Rerouting without Extra-Traffic' LSP protection type."; +--- +> "'Rerouting without Extra-Traffic' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1628a1805,1808 > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision > // RFC Editor: remove the note above and this note -1632,1633c1765,1767 +1632,1633c1812,1814 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any --- > "An action that starts testing whether or not Automatic > Protection Switching (APS) communication is operating > correctly. It is of lower priority than any -1636,1637c1770,1771 +1636,1637c1817,1818 < "RFC 4427: Recovery (Protection and Restoration) Terminology < for Generalized Multi-Protocol Label Switching (GMPLS)"; --- > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - > Linear trail and subnetwork protection"; -2110a2245,2641 +1916a2098,2100 +> // CHANGE NOTE: The description of the identity path-metric-type +> // has been updated in this module revision +> // RFC Editor: remove the note above and this note +1919c2103,2106 +< "Base identity for the path metric type."; +--- +> "Base identity for the path metric type. +> +> Derived identities SHOULD describe the unit and maximum value +> of the path metric types they define."; +1939a2127,2129 +> // CHANGE NOTE: The reference for the identity path-metric-hop +> // has been added in this module revision +> // RFC Editor: remove the note above and this note +1943a2134,2136 +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; +1945a2139 +> +2110a2305,2708 > // CHANGE NOTE: The base identity path-computation-error-reason > // and its derived identities below have been > // added in this module revision @@ -211,7 +311,8 @@ > "Path computation has failed because of an unspecified > reason."; > reference -> "Section 7.5 of RFC5440"; +> "Section 7.5 of RFC5440: Path Computation Element (PCE) +> Communication Protocol (PCEP)"; > } > > identity path-computation-error-no-topology { @@ -242,7 +343,8 @@ > It corresponds to bit 31 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -389,7 +491,8 @@ > It corresponds to bit 29 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -403,7 +506,8 @@ > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -414,7 +518,8 @@ > "Path computation has failed because path computation > server is unavailable."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -440,7 +545,9 @@ > description > "Protocol origin is Path Computation Engine Protocol > (PCEP)."; -> reference "RFC5440"; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; > } > > identity protocol-origin-bgp { @@ -593,7 +700,7 @@ > Computation Element Communication Protocol (PCEP)."; > } > -2514a3046,3054 +2514a3113,3121 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; @@ -603,9 +710,9 @@ > description > "The identifier of a node in the topology."; > } -2517d3056 +2517d3123 < mandatory true; -2566a3106,3116 +2566a3173,3183 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -617,30 +724,30 @@ > description > "Link Termination Point (LTP) identifier."; > } -2569d3118 +2569d3185 < mandatory true; -2574a3124,3128 +2574a3191,3195 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2577d3130 +2577d3197 < mandatory true; -2646a3200,3203 +2646a3267,3270 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; > } -2648a3206,3210 +2648a3273,3277 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2651d3212 +2651d3279 < mandatory true; -2696a3258,3268 +2696a3325,3335 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -652,21 +759,37 @@ > description > "Link Termination Point (LTP) identifier."; > } -2699d3270 +2699d3337 < mandatory true; -2704a3276,3280 +2704a3343,3347 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2968a3545,3549 +2968a3612,3616 > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; > } -3379c3960,3987 +2977c3625 +< container explicit-route-objects-always { +--- +> container explicit-route-objects { +3124,3126c3772,3778 +< "Upper bound on the end-to-end TE path metric. A zero +< indicates an unbounded upper limit for the specific +< 'metric-type'."; +--- +> "Upper bound on the end-to-end TE path metric. +> +> A zero indicates an unbounded upper limit for the +> specific 'metric-type'. +> +> The unit of is interpreted in the context of the +> path-metric-type."; +3379c4031,4058 < } \ No newline at end of file --- diff --git "a/drafts/te-types-update/diffs/te-types/model-diff.txt\r" "b/drafts/te-types-update/diffs/te-types/model-diff.txt\r" deleted file mode 100644 index d7b5a77..0000000 --- "a/drafts/te-types-update/diffs/te-types/model-diff.txt\r" +++ /dev/null @@ -1,785 +0,0 @@ -21a22,31 -> import ietf-network { -> prefix "nw"; -> reference "RFC 8345: A YANG Data Model for Network Topologies"; -> } -> -> import ietf-network-topology { -> prefix "nt"; -> reference "RFC 8345: A YANG Data Model for Network Topologies"; -> } -> -30c40 -< ---- -> -55c65 -< Copyright (c) 2020 IETF Trust and the persons identified as ---- -> Copyright (c) 2023 IETF Trust and the persons identified as -60c70 -< the license terms contained in, the Simplified BSD License set ---- -> the license terms contained in, the Revised BSD License set -65,66c75,109 -< This version of this YANG module is part of RFC 8776; see the -< RFC itself for full legal notices."; ---- -> 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."; -> revision 2023-11-24 { -> description -> "Added: -> - base identity lsp-provisioning-error-reason; -> - identity association-type-diversity; -> - identity tunnel-admin-state-auto; -> - identity lsp-restoration-restore-none; -> - identity restoration-scheme-rerouting; -> - base identity path-computation-error-reason and -> its derived identities; -> - base identity protocol-origin-type and -> its derived identities; -> - base identity svec-objective-function-type and its derived -> identities; -> - base identity svec-metric-type and its derived identities; -> - grouping encoding-and-switching-type. -> -> Updated: -> - description of the base identity objective-function-type; -> - description and reference of identity action-exercise. -> -> Obsoleted: -> - identity of-minimize-agg-bandwidth-consumption; -> - identity of-minimize-load-most-loaded-link; -> - identity of-minimize-cost-path-set; -> - identity lsp-protection-reroute-extra; -> - identity lsp-protection-reroute."; -> reference -> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; -> } -> // RFC Editor: replace XXXX with actual RFC number, update date -> // information and remove this note -545a589,616 -> // CHANGE NOTE: The typedef path-type below has been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> typedef path-type { -> type enumeration { -> enum primary-path { -> description -> "Indicates that the TE path is a primary path."; -> } -> enum secondary-path { -> description -> "Indicates that the TE path is a secondary path."; -> } -> enum primary-reverse-path { -> description -> "Indicates that the TE path is a primary reverse path."; -> } -> enum secondary-reverse-path { -> description -> "Indicates that the TE path is a secondary reverse path."; -> } -> } -> description -> "The type of TE path, indicating whether a path is a primary, -> or a reverse primary, or a secondary, or a reverse secondary -> path."; -> } -> -606a678,685 -> // CHANGE NOTE: The base identity lsp-provisioning-error-reason -> // has been added in this module revision -> // RFC Editor: remove the note above and this note -> identity lsp-provisioning-error-reason { -> description -> "Base identity for LSP provisioning errors."; -> } -> -982a1062,1079 -> // CHANGE NOTE: The identity association-type-diversity below has -> // been added in this module revision -> // RFC Editor: remove the note above and this note -> identity association-type-diversity { -> base association-type; -> description -> "Association Type diversity used to associate LSPs whose -> paths are to be diverse from each other."; -> reference -> "RFC8800: Path Computation Element Communication Protocol -> (PCEP) Extension for Label Switched Path (LSP) Diversity -> Constraint Signaling"; -> } -> -> // CHANGE NOTE: The description of the base identity -> // objective-function-type has been updated -> // in this module revision -> // RFC Editor: remove the note above and this note -985c1082 -< "Base objective function type."; ---- -> "Base identity for path objective function type."; -1015a1113,1115 -> // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption -> // below has been obsoleted in this module revision -> // RFC Editor: remove the note above and this note -1017a1118 -> status obsolete; -1020c1121 -< consumption."; ---- -> consumption."; -1023c1124 -< Computation Element Communication Protocol (PCEP)"; ---- -> Computation Element Communication Protocol (PCEP)"; -1025a1127,1129 -> // CHANGE NOTE: The identity of-minimize-load-most-loaded-link -> // below has been obsoleted in this module revision -> // RFC Editor: remove the note above and this note -1027a1132 -> status obsolete; -1030c1135 -< is carrying the highest load."; ---- -> is carrying the highest load."; -1033c1138 -< Computation Element Communication Protocol (PCEP)"; ---- -> Computation Element Communication Protocol (PCEP)"; -1035a1141,1143 -> // CHANGE NOTE: The identity of-minimize-cost-path-set -> // below has been obsoleted in this module revision -> // RFC Editor: remove the note above and this note -1037a1146 -> status obsolete; -1216a1326,1337 -> // CHANGE NOTE: The identity tunnel-admin-state-auto below -> // has been added in this module revision -> // RFC Editor: remove the note above and this note -> identity tunnel-admin-state-auto { -> base tunnel-admin-state-type; -> description -> "Tunnel administrative auto state. The administrative status -> in state datastore transitions to 'tunnel-admin-up' when the -> tunnel used by the client layer, and to 'tunnel-admin-down' -> when it is not used by the client layer."; -> } -> -1321a1443,1451 -> // CHANGE NOTE: The identity lsp-restoration-restore-none -> // below has been added in this module revision -> // RFC Editor: remove the note above and this note -> identity lsp-restoration-restore-none { -> base lsp-restoration-type; -> description -> "No LSP affected by a failure is restored."; -> } -> -1339a1470,1484 -> // CHANGE NOTE: The identity restoration-scheme-rerouting -> // below has been added in this module revision -> // RFC Editor: remove the note above and this note -> identity restoration-scheme-rerouting { -> base restoration-scheme-type; -> description -> "Restoration LSP is computed after the failure detection. -> -> This restoration scheme is also known as -> 'Full LSP Re-routing.'"; -> reference -> "RFC 4427: Recovery (Protection and Restoration) Terminology -> for Generalized Multi-Protocol Label Switching (GMPLS)"; -> } -> -1383a1529,1531 -> // CHANGE NOTE: The identity lsp-protection-reroute-extra -> // below has been obsoleted in this module revision -> // RFC Editor: remove the note above and this note -1385a1534 -> status obsolete; -1387c1536,1540 -< "'(Full) Rerouting' LSP protection type."; ---- -> "'(Full) Rerouting' LSP protection type. -> -> This identity has been obsoleted: the -> 'restoration-scheme-rerouting' identity SHOULD be used -> instead."; -1392a1546,1548 -> // CHANGE NOTE: The identity lsp-protection-reroute -> // below has been obsoleted in this module revision -> // RFC Editor: remove the note above and this note -1394a1551 -> status obsolete; -1396c1553,1557 -< "'Rerouting without Extra-Traffic' LSP protection type."; ---- -> "'Rerouting without Extra-Traffic' LSP protection type. -> -> This identity has been obsoleted: the -> 'restoration-scheme-rerouting' identity SHOULD be used -> instead."; -1628a1790,1793 -> // cCHANGE NOTE: The description and reference of the -> // identity action-exercise have been updated in this module -> // revision -> // RFC Editor: remove the note above and this note -1632,1633c1797,1799 -< "An action that starts testing whether or not APS communication -< is operating correctly. It is of lower priority than any ---- -> "An action that starts testing whether or not Automatic -> Protection Switching (APS) communication is operating -> correctly. It is of lower priority than any -1636,1637c1802,1803 -< "RFC 4427: Recovery (Protection and Restoration) Terminology -< for Generalized Multi-Protocol Label Switching (GMPLS)"; ---- -> "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - -> Linear trail and subnetwork protection"; -1916a2083,2085 -> // CHANGE NOTE: The description of the identity path-metric-type -> // has been updated in this module revision -> // RFC Editor: remove the note above and this note -1919c2088,2091 -< "Base identity for the path metric type."; ---- -> "Base identity for the path metric type. -> -> Derived identities SHOULD describe the unit and maximum value -> of the path metric types they define."; -1939a2112,2114 -> // CHANGE NOTE: The reference for the identity path-metric-hop -> // has been added in this module revision -> // RFC Editor: remove the note above and this note -1943a2119,2121 -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP)"; -1945a2124 -> -2110a2290,2693 -> // CHANGE NOTE: The base identity path-computation-error-reason -> // and its derived identities below have been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> identity path-computation-error-reason { -> description -> "Base identity for path computation error reasons."; -> } -> -> identity path-computation-error-path-not-found { -> base path-computation-error-reason; -> description -> "Path computation has failed because of an unspecified -> reason."; -> reference -> "Section 7.5 of RFC5440: Path Computation Element (PCE) -> Communication Protocol (PCEP)"; -> } -> -> identity path-computation-error-no-topology { -> base path-computation-error-reason; -> description -> "Path computation has failed because there is no topology -> with the provided topology-identifier."; -> } -> -> identity path-computation-error-no-dependent-server { -> base path-computation-error-reason; -> description -> "Path computation has failed because one or more dependent -> path computation servers are unavailable. -> -> The dependent path computation server could be -> a Backward-Recursive Path Computation (BRPC) downstream -> PCE or a child PCE."; -> reference -> "RFC5441, RFC8685"; -> } -> -> identity path-computation-error-pce-unavailable { -> base path-computation-error-reason; -> description -> "Path computation has failed because PCE is not available. -> -> It corresponds to bit 31 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP); -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-no-inclusion-hop { -> base path-computation-error-reason; -> description -> "Path computation has failed because there is no -> node or link provided by one or more inclusion hops."; -> } -> -> identity path-computation-error-destination-unknown-in-domain { -> base path-computation-error-reason; -> description -> "Path computation has failed because the destination node is -> unknown in indicated destination domain. -> -> It corresponds to bit 19 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC8685; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-no-resource { -> base path-computation-error-reason; -> description -> "Path computation has failed because there is no -> available resource in one or more domains. -> -> It corresponds to bit 20 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC8685; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-child-pce-unresponsive { -> base path-computation-error-no-dependent-server; -> description -> "Path computation has failed because child PCE is not -> responsive. -> -> It corresponds to bit 21 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC8685; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-destination-domain-unknown { -> base path-computation-error-reason; -> description -> "Path computation has failed because the destination domain -> was unknown. -> -> It corresponds to bit 22 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC8685; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-p2mp { -> base path-computation-error-reason; -> description -> "Path computation has failed because of P2MP reachability -> problem. -> -> It corresponds to bit 24 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC8306; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-no-gco-migration { -> base path-computation-error-reason; -> description -> "Path computation has failed because of no Global Concurrent -> Optimization (GCO) migration path found. -> -> It corresponds to bit 26 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5557; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-no-gco-solution { -> base path-computation-error-reason; -> description -> "Path computation has failed because of no GCO solution -> found. -> -> It corresponds to bit 25 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5557; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-pks-expansion { -> base path-computation-error-reason; -> description -> "Path computation has failed because of Path-Key Subobject -> (PKS) expansion failure. -> -> It corresponds to bit 27 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5520; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-brpc-chain-unavailable { -> base path-computation-error-no-dependent-server; -> description -> "Path computation has failed because PCE BRPC chain -> unavailable. -> -> It corresponds to bit 28 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5441; -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-source-unknown { -> base path-computation-error-reason; -> description -> "Path computation has failed because source node is -> unknown. -> -> It corresponds to bit 29 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP); -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-destination-unknown { -> base path-computation-error-reason; -> description -> "Path computation has failed because destination node is -> unknown. -> -> It corresponds to bit 30 of the Flags field of the -> NO-PATH-VECTOR TLV."; -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP); -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> identity path-computation-error-no-server { -> base path-computation-error-reason; -> description -> "Path computation has failed because path computation -> server is unavailable."; -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP); -> -> https://www.iana.org/assignments/pcep/pcep.xhtml"; -> } -> -> // CHANGE NOTE: The base identity protocol-origin-type and -> // its derived identities below have been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> identity protocol-origin-type { -> description -> "Base identity for protocol origin type."; -> } -> -> identity protocol-origin-api { -> base protocol-origin-type; -> description -> "Protocol origin is via Application Programmable Interface -> (API)."; -> } -> -> identity protocol-origin-pcep { -> base protocol-origin-type; -> description -> "Protocol origin is Path Computation Engine Protocol -> (PCEP)."; -> reference -> "RFC5440: Path Computation Element (PCE) Communication -> Protocol (PCEP)"; -> } -> -> identity protocol-origin-bgp { -> base protocol-origin-type; -> description -> "Protocol origin is Border Gateway Protocol (BGP)."; -> reference "RFC9012"; -> } -> -> // CHANGE NOTE: The base identity svec-objective-function-type -> // and its derived identities below have been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> identity svec-objective-function-type { -> description -> "Base identity for SVEC objective function type."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-of-minimize-agg-bandwidth-consumption { -> base svec-objective-function-type; -> description -> "Objective function for minimizing aggregate bandwidth -> consumption (MBC)."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-of-minimize-load-most-loaded-link { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the load on the link that -> is carrying the highest load (MLL)."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-of-minimize-cost-path-set { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the cost on a path set -> (MCC)."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-of-minimize-common-transit-domain { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the number of common -> transit domains (MCTD)."; -> reference -> "RFC8685: Path Computation Element Communication Protocol -> (PCEP) Extensions for the Hierarchical Path Computation -> Element (H-PCE) Architecture."; -> } -> -> identity svec-of-minimize-shared-link { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the number of shared -> links (MSL)."; -> reference -> "RFC8685: Path Computation Element Communication Protocol -> (PCEP) Extensions for the Hierarchical Path Computation -> Element (H-PCE) Architecture."; -> } -> -> identity svec-of-minimize-shared-srlg { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the number of shared -> Shared Risk Link Groups (SRLG) (MSS)."; -> reference -> "RFC8685: Path Computation Element Communication Protocol -> (PCEP) Extensions for the Hierarchical Path Computation -> Element (H-PCE) Architecture."; -> } -> -> identity svec-of-minimize-shared-nodes { -> base svec-objective-function-type; -> description -> "Objective function for minimizing the number of shared -> nodes (MSN)."; -> reference -> "RFC8685: Path Computation Element Communication Protocol -> (PCEP) Extensions for the Hierarchical Path Computation -> Element (H-PCE) Architecture."; -> } -> -> // CHANGE NOTE: The base identity svec-metric-type and -> // its derived identities below have been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> identity svec-metric-type { -> description -> "Base identity for SVEC metric type."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-metric-cumul-te { -> base svec-metric-type; -> description -> "Cumulative TE cost."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-metric-cumul-igp { -> base svec-metric-type; -> description -> "Cumulative IGP cost."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-metric-cumul-hop { -> base svec-metric-type; -> description -> "Cumulative Hop path metric."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-metric-aggregate-bandwidth-consumption { -> base svec-metric-type; -> description -> "Aggregate bandwidth consumption."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -> identity svec-metric-load-of-the-most-loaded-link { -> base svec-metric-type; -> description -> "Load of the most loaded link."; -> reference -> "RFC5541: Encoding of Objective Functions in the Path -> Computation Element Communication Protocol (PCEP)."; -> } -> -2514a3098,3106 -> must "node-id-uri or node-id" { -> description -> "At least one node identifier MUST be present."; -> } -> leaf node-id-uri { -> type nw:node-id; -> description -> "The identifier of a node in the topology."; -> } -2517d3108 -< mandatory true; -2566a3158,3168 -> must "(link-tp-id-uri or link-tp-id) and " + -> "(node-id-uri or node-id)" { -> description -> "At least one node identifier and at least one Link -> Termination Point (LTP) identifier MUST be present."; -> } -> leaf link-tp-id-uri { -> type nt:tp-id; -> description -> "Link Termination Point (LTP) identifier."; -> } -2569d3170 -< mandatory true; -2574a3176,3180 -> leaf node-id-uri { -> type nw:node-id; -> description -> "The identifier of a node in the topology."; -> } -2577d3182 -< mandatory true; -2646a3252,3255 -> must "node-id-uri or node-id" { -> description -> "At least one node identifier MUST be present."; -> } -2648a3258,3262 -> leaf node-id-uri { -> type nw:node-id; -> description -> "The identifier of a node in the topology."; -> } -2651d3264 -< mandatory true; -2696a3310,3320 -> must "(link-tp-id-uri or link-tp-id) and " + -> "(node-id-uri or node-id)" { -> description -> "At least one node identifier and at least one Link -> Termination Point (LTP) identifier MUST be present."; -> } -> leaf link-tp-id-uri { -> type nt:tp-id; -> description -> "Link Termination Point (LTP) identifier."; -> } -2699d3322 -< mandatory true; -2704a3328,3332 -> leaf node-id-uri { -> type nw:node-id; -> description -> "The identifier of a node in the topology."; -> } -2968a3597,3601 -> leaf network-id { -> type nw:network-id; -> description -> "The network topology identifier."; -> } -3124,3126c3757,3763 -< "Upper bound on the end-to-end TE path metric. A zero -< indicates an unbounded upper limit for the specific -< 'metric-type'."; ---- -> "Upper bound on the end-to-end TE path metric. -> -> A zero indicates an unbounded upper limit for the -> specific 'metric-type'. -> -> The unit of is interpreted in the context of the -> path-metric-type."; -3379c4016,4043 -< } -\ No newline at end of file ---- -> -> // NOTE: The grouping encoding-and-switching-type below has been -> // added in this module revision -> // RFC Editor: remove the note above and this note -> grouping encoding-and-switching-type { -> description -> "Common grouping to define the LSP encoding and -> switching types"; -> leaf encoding { -> type identityref { -> base te-types:lsp-encoding-types; -> } -> description -> "LSP encoding type."; -> reference -> "RFC3945"; -> } -> leaf switching-type { -> type identityref { -> base te-types:switching-capabilities; -> } -> description -> "LSP switching type."; -> reference -> "RFC3945"; -> } -> } -> } diff --git a/drafts/te-types-update/diffs/te-types/model-updates.txt b/drafts/te-types-update/diffs/te-types/model-updates.txt index df17eab..55cc508 100644 --- a/drafts/te-types-update/diffs/te-types/model-updates.txt +++ b/drafts/te-types-update/diffs/te-types/model-updates.txt @@ -21,21 +21,21 @@ < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set - 65,66c75,108 + 65,66c75,113 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; - > - > revision 2023-06-27 { + > revision 2023-11-25e { > description > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; + > - identity restoration-scheme-rerouting; > - base identity path-computation-error-reason and > its derived identities; > - base identity protocol-origin-type and @@ -47,19 +47,54 @@ > > Updated: > - description of the base identity objective-function-type; - > - description and reference of identity action-exercise. + > - description and reference of identity action-exercise; + > - typedef te-node-id to support also 16 octects TE identifiers. > > Obsoleted: - > - identity of-minimize-agg-bandwidth-consumption - > - identity of-minimize-load-most-loaded-link - > - identity of-minimize-cost-path-set"; + > - identity of-minimize-agg-bandwidth-consumption; + > - identity of-minimize-load-most-loaded-link; + > - identity of-minimize-cost-path-set; + > - identity lsp-protection-reroute-extra; + > - identity lsp-protection-reroute. + > + > Container explicit-route-objects-always renamed as + > explicit-route-objects."; > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note - 545a588,615 + 353c400,403 + < type yang:dotted-quad; + --- + > type union { + > type yang:dotted-quad; + > type inet:ipv6-address-no-zone; + > } + 357,358c407,411 + < The identifier is represented as 4 octets in dotted-quad + < notation. + --- + > + > The identifier is represented either as 4 octets in + > dotted-quad notation or 16 octets in full, mixed, shortened, + > or shortened-mixed IPv6 address notation. + > + 362,363c415,418 + < Router ID TLV described in Section 4.3 of RFC 5305, or the + < TE Router ID TLV described in Section 3.2.1 of RFC 6119. + --- + > Router ID TLV described in Section 4.3 of RFC 5305, the TE + > Router ID TLV described in Section 3.2.1 of RFC 6119, or the + > IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. + > + 368a424 + > + 370a427 + > + 371a429 + > + 545a604,631 > // CHANGE NOTE: The typedef path-type below has been > // added in this module revision > // RFC Editor: remove the note above and this note @@ -88,7 +123,7 @@ > path."; > } > - 606a677,684 + 606a693,700 > // CHANGE NOTE: The base identity lsp-provisioning-error-reason > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -97,7 +132,7 @@ > "Base identity for LSP provisioning errors."; > } > - 982a1061,1078 + 982a1077,1094 > // CHANGE NOTE: The identity association-type-diversity below has > // been added in this module revision > // RFC Editor: remove the note above and this note @@ -116,45 +151,45 @@ > // objective-function-type has been updated > // in this module revision > // RFC Editor: remove the note above and this note - 985c1081 + 985c1097 < "Base objective function type."; --- > "Base identity for path objective function type."; - 1015a1112,1114 + 1015a1128,1130 > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1017a1117 + 1017a1133 > status obsolete; - 1020c1120 + 1020c1136 < consumption."; --- > consumption."; - 1023c1123 + 1023c1139 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1025a1126,1128 + 1025a1142,1144 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1027a1131 + 1027a1147 > status obsolete; - 1030c1134 + 1030c1150 < is carrying the highest load."; --- > is carrying the highest load."; - 1033c1137 + 1033c1153 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1035a1140,1142 + 1035a1156,1158 > // CHANGE NOTE: The identity of-minimize-cost-path-set > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1037a1145 + 1037a1161 > status obsolete; - 1216a1325,1336 + 1216a1341,1352 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -167,7 +202,7 @@ > when it is not used by the client layer."; > } > - 1321a1442,1450 + 1321a1458,1466 > // CHANGE NOTE: The identity lsp-restoration-restore-none > // below has been added in this module revision > // RFC Editor: remove the note above and this note @@ -177,25 +212,90 @@ > "No LSP affected by a failure is restored."; > } > - 1628a1758,1761 + 1339a1485,1499 + > // CHANGE NOTE: The identity restoration-scheme-rerouting + > // below has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity restoration-scheme-rerouting { + > base restoration-scheme-type; + > description + > "Restoration LSP is computed after the failure detection. + > + > This restoration scheme is also known as + > 'Full LSP Re-routing.'"; + > reference + > "RFC 4427: Recovery (Protection and Restoration) Terminology + > for Generalized Multi-Protocol Label Switching (GMPLS)"; + > } + > + 1383a1544,1546 + > // CHANGE NOTE: The identity lsp-protection-reroute-extra + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1385a1549 + > status obsolete; + 1387c1551,1555 + < "'(Full) Rerouting' LSP protection type."; + --- + > "'(Full) Rerouting' LSP protection type. + > + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1392a1561,1563 + > // CHANGE NOTE: The identity lsp-protection-reroute + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1394a1566 + > status obsolete; + 1396c1568,1572 + < "'Rerouting without Extra-Traffic' LSP protection type."; + --- + > "'Rerouting without Extra-Traffic' LSP protection type. + > + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1628a1805,1808 > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision > // RFC Editor: remove the note above and this note - 1632,1633c1765,1767 + 1632,1633c1812,1814 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any --- > "An action that starts testing whether or not Automatic > Protection Switching (APS) communication is operating > correctly. It is of lower priority than any - 1636,1637c1770,1771 + 1636,1637c1817,1818 < "RFC 4427: Recovery (Protection and Restoration) Terminology < for Generalized Multi-Protocol Label Switching (GMPLS)"; --- > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - > Linear trail and subnetwork protection"; - 2110a2245,2641 + 1916a2098,2100 + > // CHANGE NOTE: The description of the identity path-metric-type + > // has been updated in this module revision + > // RFC Editor: remove the note above and this note + 1919c2103,2106 + < "Base identity for the path metric type."; + --- + > "Base identity for the path metric type. + > + > Derived identities SHOULD describe the unit and maximum value + > of the path metric types they define."; + 1939a2127,2129 + > // CHANGE NOTE: The reference for the identity path-metric-hop + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + 1943a2134,2136 + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; + 1945a2139 + > + 2110a2305,2708 > // CHANGE NOTE: The base identity path-computation-error-reason > // and its derived identities below have been > // added in this module revision @@ -211,7 +311,8 @@ > "Path computation has failed because of an unspecified > reason."; > reference - > "Section 7.5 of RFC5440"; + > "Section 7.5 of RFC5440: Path Computation Element (PCE) + > Communication Protocol (PCEP)"; > } > > identity path-computation-error-no-topology { @@ -242,7 +343,8 @@ > It corresponds to bit 31 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -389,7 +491,8 @@ > It corresponds to bit 29 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -403,7 +506,8 @@ > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -414,7 +518,8 @@ > "Path computation has failed because path computation > server is unavailable."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -440,7 +545,9 @@ > description > "Protocol origin is Path Computation Engine Protocol > (PCEP)."; - > reference "RFC5440"; + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; > } > > identity protocol-origin-bgp { @@ -593,7 +700,7 @@ > Computation Element Communication Protocol (PCEP)."; > } > - 2514a3046,3054 + 2514a3113,3121 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; @@ -603,9 +710,9 @@ > description > "The identifier of a node in the topology."; > } - 2517d3056 + 2517d3123 < mandatory true; - 2566a3106,3116 + 2566a3173,3183 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -617,30 +724,30 @@ > description > "Link Termination Point (LTP) identifier."; > } - 2569d3118 + 2569d3185 < mandatory true; - 2574a3124,3128 + 2574a3191,3195 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2577d3130 + 2577d3197 < mandatory true; - 2646a3200,3203 + 2646a3267,3270 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; > } - 2648a3206,3210 + 2648a3273,3277 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2651d3212 + 2651d3279 < mandatory true; - 2696a3258,3268 + 2696a3325,3335 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -652,21 +759,37 @@ > description > "Link Termination Point (LTP) identifier."; > } - 2699d3270 + 2699d3337 < mandatory true; - 2704a3276,3280 + 2704a3343,3347 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2968a3545,3549 + 2968a3612,3616 > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; > } - 3379c3960,3987 + 2977c3625 + < container explicit-route-objects-always { + --- + > container explicit-route-objects { + 3124,3126c3772,3778 + < "Upper bound on the end-to-end TE path metric. A zero + < indicates an unbounded upper limit for the specific + < 'metric-type'."; + --- + > "Upper bound on the end-to-end TE path metric. + > + > A zero indicates an unbounded upper limit for the + > specific 'metric-type'. + > + > The unit of is interpreted in the context of the + > path-metric-type."; + 3379c4031,4058 < } \ No newline at end of file --- diff --git "a/drafts/te-types-update/diffs/te-types/model-updates.txt\r" "b/drafts/te-types-update/diffs/te-types/model-updates.txt\r" deleted file mode 100644 index df17eab..0000000 --- "a/drafts/te-types-update/diffs/te-types/model-updates.txt\r" +++ /dev/null @@ -1,700 +0,0 @@ - 21a22,31 - > import ietf-network { - > prefix "nw"; - > reference "RFC 8345: A YANG Data Model for Network Topologies"; - > } - > - > import ietf-network-topology { - > prefix "nt"; - > reference "RFC 8345: A YANG Data Model for Network Topologies"; - > } - > - 30c40 - < - --- - > - 55c65 - < Copyright (c) 2020 IETF Trust and the persons identified as - --- - > Copyright (c) 2023 IETF Trust and the persons identified as - 60c70 - < the license terms contained in, the Simplified BSD License set - --- - > the license terms contained in, the Revised BSD License set - 65,66c75,108 - < This version of this YANG module is part of RFC 8776; see the - < RFC itself for full legal notices."; - --- - > 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."; - > - > revision 2023-06-27 { - > description - > "Added: - > - base identity lsp-provisioning-error-reason; - > - identity association-type-diversity; - > - identity tunnel-admin-state-auto; - > - identity lsp-restoration-restore-none; - > - base identity path-computation-error-reason and - > its derived identities; - > - base identity protocol-origin-type and - > its derived identities; - > - base identity svec-objective-function-type and its derived - > identities; - > - base identity svec-metric-type and its derived identities; - > - grouping encoding-and-switching-type. - > - > Updated: - > - description of the base identity objective-function-type; - > - description and reference of identity action-exercise. - > - > Obsoleted: - > - identity of-minimize-agg-bandwidth-consumption - > - identity of-minimize-load-most-loaded-link - > - identity of-minimize-cost-path-set"; - > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - > } - > // RFC Editor: replace XXXX with actual RFC number, update date - > // information and remove this note - 545a588,615 - > // CHANGE NOTE: The typedef path-type below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > typedef path-type { - > type enumeration { - > enum primary-path { - > description - > "Indicates that the TE path is a primary path."; - > } - > enum secondary-path { - > description - > "Indicates that the TE path is a secondary path."; - > } - > enum primary-reverse-path { - > description - > "Indicates that the TE path is a primary reverse path."; - > } - > enum secondary-reverse-path { - > description - > "Indicates that the TE path is a secondary reverse path."; - > } - > } - > description - > "The type of TE path, indicating whether a path is a primary, - > or a reverse primary, or a secondary, or a reverse secondary - > path."; - > } - > - 606a677,684 - > // CHANGE NOTE: The base identity lsp-provisioning-error-reason - > // has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity lsp-provisioning-error-reason { - > description - > "Base identity for LSP provisioning errors."; - > } - > - 982a1061,1078 - > // CHANGE NOTE: The identity association-type-diversity below has - > // been added in this module revision - > // RFC Editor: remove the note above and this note - > identity association-type-diversity { - > base association-type; - > description - > "Association Type diversity used to associate LSPs whose - > paths are to be diverse from each other."; - > reference - > "RFC8800: Path Computation Element Communication Protocol - > (PCEP) Extension for Label Switched Path (LSP) Diversity - > Constraint Signaling"; - > } - > - > // CHANGE NOTE: The description of the base identity - > // objective-function-type has been updated - > // in this module revision - > // RFC Editor: remove the note above and this note - 985c1081 - < "Base objective function type."; - --- - > "Base identity for path objective function type."; - 1015a1112,1114 - > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1017a1117 - > status obsolete; - 1020c1120 - < consumption."; - --- - > consumption."; - 1023c1123 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; - 1025a1126,1128 - > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1027a1131 - > status obsolete; - 1030c1134 - < is carrying the highest load."; - --- - > is carrying the highest load."; - 1033c1137 - < Computation Element Communication Protocol (PCEP)"; - --- - > Computation Element Communication Protocol (PCEP)"; - 1035a1140,1142 - > // CHANGE NOTE: The identity of-minimize-cost-path-set - > // below has been obsoleted in this module revision - > // RFC Editor: remove the note above and this note - 1037a1145 - > status obsolete; - 1216a1325,1336 - > // CHANGE NOTE: The identity tunnel-admin-state-auto below - > // has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity tunnel-admin-state-auto { - > base tunnel-admin-state-type; - > description - > "Tunnel administrative auto state. The administrative status - > in state datastore transitions to 'tunnel-admin-up' when the - > tunnel used by the client layer, and to 'tunnel-admin-down' - > when it is not used by the client layer."; - > } - > - 1321a1442,1450 - > // CHANGE NOTE: The identity lsp-restoration-restore-none - > // below has been added in this module revision - > // RFC Editor: remove the note above and this note - > identity lsp-restoration-restore-none { - > base lsp-restoration-type; - > description - > "No LSP affected by a failure is restored."; - > } - > - 1628a1758,1761 - > // cCHANGE NOTE: The description and reference of the - > // identity action-exercise have been updated in this module - > // revision - > // RFC Editor: remove the note above and this note - 1632,1633c1765,1767 - < "An action that starts testing whether or not APS communication - < is operating correctly. It is of lower priority than any - --- - > "An action that starts testing whether or not Automatic - > Protection Switching (APS) communication is operating - > correctly. It is of lower priority than any - 1636,1637c1770,1771 - < "RFC 4427: Recovery (Protection and Restoration) Terminology - < for Generalized Multi-Protocol Label Switching (GMPLS)"; - --- - > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - - > Linear trail and subnetwork protection"; - 2110a2245,2641 - > // CHANGE NOTE: The base identity path-computation-error-reason - > // and its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity path-computation-error-reason { - > description - > "Base identity for path computation error reasons."; - > } - > - > identity path-computation-error-path-not-found { - > base path-computation-error-reason; - > description - > "Path computation has failed because of an unspecified - > reason."; - > reference - > "Section 7.5 of RFC5440"; - > } - > - > identity path-computation-error-no-topology { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no topology - > with the provided topology-identifier."; - > } - > - > identity path-computation-error-no-dependent-server { - > base path-computation-error-reason; - > description - > "Path computation has failed because one or more dependent - > path computation servers are unavailable. - > - > The dependent path computation server could be - > a Backward-Recursive Path Computation (BRPC) downstream - > PCE or a child PCE."; - > reference - > "RFC5441, RFC8685"; - > } - > - > identity path-computation-error-pce-unavailable { - > base path-computation-error-reason; - > description - > "Path computation has failed because PCE is not available. - > - > It corresponds to bit 31 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-inclusion-hop { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no - > node or link provided by one or more inclusion hops."; - > } - > - > identity path-computation-error-destination-unknown-in-domain { - > base path-computation-error-reason; - > description - > "Path computation has failed because the destination node is - > unknown in indicated destination domain. - > - > It corresponds to bit 19 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-resource { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no - > available resource in one or more domains. - > - > It corresponds to bit 20 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-child-pce-unresponsive { - > base path-computation-error-no-dependent-server; - > description - > "Path computation has failed because child PCE is not - > responsive. - > - > It corresponds to bit 21 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-destination-domain-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because the destination domain - > was unknown. - > - > It corresponds to bit 22 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8685; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-p2mp { - > base path-computation-error-reason; - > description - > "Path computation has failed because of P2MP reachability - > problem. - > - > It corresponds to bit 24 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC8306; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-gco-migration { - > base path-computation-error-reason; - > description - > "Path computation has failed because of no Global Concurrent - > Optimization (GCO) migration path found. - > - > It corresponds to bit 26 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5557; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-gco-solution { - > base path-computation-error-reason; - > description - > "Path computation has failed because of no GCO solution - > found. - > - > It corresponds to bit 25 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5557; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-pks-expansion { - > base path-computation-error-reason; - > description - > "Path computation has failed because of Path-Key Subobject - > (PKS) expansion failure. - > - > It corresponds to bit 27 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5520; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-brpc-chain-unavailable { - > base path-computation-error-no-dependent-server; - > description - > "Path computation has failed because PCE BRPC chain - > unavailable. - > - > It corresponds to bit 28 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5441; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-source-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because source node is - > unknown. - > - > It corresponds to bit 29 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-destination-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because destination node is - > unknown. - > - > It corresponds to bit 30 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-no-server { - > base path-computation-error-reason; - > description - > "Path computation has failed because path computation - > server is unavailable."; - > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > // CHANGE NOTE: The base identity protocol-origin-type and - > // its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity protocol-origin-type { - > description - > "Base identity for protocol origin type."; - > } - > - > identity protocol-origin-api { - > base protocol-origin-type; - > description - > "Protocol origin is via Application Programmable Interface - > (API)."; - > } - > - > identity protocol-origin-pcep { - > base protocol-origin-type; - > description - > "Protocol origin is Path Computation Engine Protocol - > (PCEP)."; - > reference "RFC5440"; - > } - > - > identity protocol-origin-bgp { - > base protocol-origin-type; - > description - > "Protocol origin is Border Gateway Protocol (BGP)."; - > reference "RFC9012"; - > } - > - > // CHANGE NOTE: The base identity svec-objective-function-type - > // and its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity svec-objective-function-type { - > description - > "Base identity for SVEC objective function type."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-agg-bandwidth-consumption { - > base svec-objective-function-type; - > description - > "Objective function for minimizing aggregate bandwidth - > consumption (MBC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-load-most-loaded-link { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the load on the link that - > is carrying the highest load (MLL)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-cost-path-set { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the cost on a path set - > (MCC)."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-of-minimize-common-transit-domain { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of common - > transit domains (MCTD)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-link { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > links (MSL)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-srlg { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > Shared Risk Link Groups (SRLG) (MSS)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > identity svec-of-minimize-shared-nodes { - > base svec-objective-function-type; - > description - > "Objective function for minimizing the number of shared - > nodes (MSN)."; - > reference - > "RFC8685: Path Computation Element Communication Protocol - > (PCEP) Extensions for the Hierarchical Path Computation - > Element (H-PCE) Architecture."; - > } - > - > // CHANGE NOTE: The base identity svec-metric-type and - > // its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity svec-metric-type { - > description - > "Base identity for SVEC metric type."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-te { - > base svec-metric-type; - > description - > "Cumulative TE cost."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-igp { - > base svec-metric-type; - > description - > "Cumulative IGP cost."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-cumul-hop { - > base svec-metric-type; - > description - > "Cumulative Hop path metric."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-aggregate-bandwidth-consumption { - > base svec-metric-type; - > description - > "Aggregate bandwidth consumption."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - > identity svec-metric-load-of-the-most-loaded-link { - > base svec-metric-type; - > description - > "Load of the most loaded link."; - > reference - > "RFC5541: Encoding of Objective Functions in the Path - > Computation Element Communication Protocol (PCEP)."; - > } - > - 2514a3046,3054 - > must "node-id-uri or node-id" { - > description - > "At least one node identifier MUST be present."; - > } - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2517d3056 - < mandatory true; - 2566a3106,3116 - > must "(link-tp-id-uri or link-tp-id) and " + - > "(node-id-uri or node-id)" { - > description - > "At least one node identifier and at least one Link - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; - > description - > "Link Termination Point (LTP) identifier."; - > } - 2569d3118 - < mandatory true; - 2574a3124,3128 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2577d3130 - < mandatory true; - 2646a3200,3203 - > must "node-id-uri or node-id" { - > description - > "At least one node identifier MUST be present."; - > } - 2648a3206,3210 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2651d3212 - < mandatory true; - 2696a3258,3268 - > must "(link-tp-id-uri or link-tp-id) and " + - > "(node-id-uri or node-id)" { - > description - > "At least one node identifier and at least one Link - > Termination Point (LTP) identifier MUST be present."; - > } - > leaf link-tp-id-uri { - > type nt:tp-id; - > description - > "Link Termination Point (LTP) identifier."; - > } - 2699d3270 - < mandatory true; - 2704a3276,3280 - > leaf node-id-uri { - > type nw:node-id; - > description - > "The identifier of a node in the topology."; - > } - 2968a3545,3549 - > leaf network-id { - > type nw:network-id; - > description - > "The network topology identifier."; - > } - 3379c3960,3987 - < } - \ No newline at end of file - --- - > - > // NOTE: The grouping encoding-and-switching-type below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > grouping encoding-and-switching-type { - > description - > "Common grouping to define the LSP encoding and - > switching types"; - > leaf encoding { - > type identityref { - > base te-types:lsp-encoding-types; - > } - > description - > "LSP encoding type."; - > reference - > "RFC3945"; - > } - > leaf switching-type { - > type identityref { - > base te-types:switching-capabilities; - > } - > description - > "LSP switching type."; - > reference - > "RFC3945"; - > } - > } - > } diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md index 5f4881e..f2cb225 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.md @@ -487,7 +487,7 @@ RFC Editor: remove the CHANGE NOTE above and this note {::include ../../ietf-te-packet-types.yang} ~~~~ {: #fig-pkt-yang title="Packet TE Types YANG module" -sourcecode-markers="true" sourcecode-name="ietf-te-packet-types@2023-07-10.yang"} +sourcecode-markers="true" sourcecode-name="ietf-te-packet-types@2024-01-25.yang"} # IANA Considerations diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt index 556ff7d..7e77ae6 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.txt @@ -81,18 +81,18 @@ Table of Contents 3.2. Packet TE Types Module Contents . . . . . . . . . . . . . 11 4. TE Types YANG Module . . . . . . . . . . . . . . . . . . . . 13 5. Packet TE Types YANG Module . . . . . . . . . . . . . . . . . 98 - 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 112 + 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 113 7. Security Considerations . . . . . . . . . . . . . . . . . . . 113 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 114 8.1. Normative References . . . . . . . . . . . . . . . . . . 114 8.2. Informative References . . . . . . . . . . . . . . . . . 116 Appendix A. Changes from RFC 8776 . . . . . . . . . . . . . . . 124 A.1. TE Types YANG Diffs . . . . . . . . . . . . . . . . . . . 124 - A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 139 - Appendix B. Option Considered for updating RFC8776 . . . . . . . 143 - Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 144 - Contributors . . . . . . . . . . . . . . . . . . . . . . . . . . 144 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 144 + A.2. Packet TE Types YANG Diffs . . . . . . . . . . . . . . . 141 + Appendix B. Option Considered for updating RFC8776 . . . . . . . 147 + Acknowledgements . . . . . . . . . . . . . . . . . . . . . . . . 148 + Contributors . . . . . . . . . . . . . . . . . . . . . . . . . . 148 + Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 148 1. Introduction @@ -5474,7 +5474,7 @@ Internet-Draft TE Common YANG Types January 2024 RFC Editor: remove the CHANGE NOTE above and this note - file "ietf-te-packet-types@2023-07-10.yang" + file "ietf-te-packet-types@2024-01-25.yang" module ietf-te-packet-types { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-te-packet-types"; @@ -5521,23 +5521,23 @@ Internet-Draft TE Common YANG Types January 2024 "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to Packet Traffic Enginnering (TE). + data type definitions specific to Packet Traffic Enginnering + (TE). The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2023 IETF Trust and the persons identified as + 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. + + 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 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). - - This version of this YANG module is part of RFC XXXX - (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself @@ -5546,8 +5546,15 @@ Busi, et al. Expires 28 July 2024 [Page 99] Internet-Draft TE Common YANG Types January 2024 + 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). + + 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."; - revision 2023-11-16 { + revision 2024-01-25 { description "Added common TE packet identities: - bandwidth-profile-type; @@ -5587,13 +5594,6 @@ Internet-Draft TE Common YANG Types January 2024 identity mef-10-bwp { base bandwidth-profile-type; - description - "MEF 10 Bandwidth Profile"; - reference - "MEF 10.3: Ethernet Services Attributes Phase 3"; - } - - identity rfc-2697-bwp { @@ -5602,6 +5602,13 @@ Busi, et al. Expires 28 July 2024 [Page 100] Internet-Draft TE Common YANG Types January 2024 + description + "MEF 10 Bandwidth Profile"; + reference + "MEF 10.3: Ethernet Services Attributes Phase 3"; + } + + identity rfc-2697-bwp { base bandwidth-profile-type; description "RFC 2697 Bandwidth Profile"; @@ -5630,7 +5637,7 @@ Internet-Draft TE Common YANG Types January 2024 // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-loss { - base path-metric-type; + base te-types:path-metric-type; description "The path loss (as a packet percentage) metric type encodes a function of the unidirectional loss metrics of all @@ -5643,13 +5650,6 @@ Internet-Draft TE Common YANG Types January 2024 Values that are larger than the maximum value SHOULD be encoded as the maximum value."; reference - "RFC8233: Extensions to the Path Computation Element - Communication Protocol (PCEP) to Compute Service-Aware Label - Switched Paths (LSPs); - - RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; - - RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; @@ -5658,13 +5658,20 @@ Busi, et al. Expires 28 July 2024 [Page 101] Internet-Draft TE Common YANG Types January 2024 + "RFC8233: Extensions to the Path Computation Element + Communication Protocol (PCEP) to Compute Service-Aware Label + Switched Paths (LSPs); + + RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + + RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; } // CHANGE NOTE: The identity path-metric-delay-variation below has // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-delay-variation { - base path-metric-type; + base te-types:path-metric-type; description "The path delay variation encodes the sum of the unidirectional delay variation metrics of all links traversed by a P2P path. @@ -5699,13 +5706,6 @@ Internet-Draft TE Common YANG Types January 2024 enum auto { description "Bandwidth is automatically computed."; - } - } - description - "Enumerated type for specifying whether bandwidth is - explicitly specified or automatically computed."; - } - @@ -5714,6 +5714,13 @@ Busi, et al. Expires 28 July 2024 [Page 102] Internet-Draft TE Common YANG Types January 2024 + } + } + description + "Enumerated type for specifying whether bandwidth is + explicitly specified or automatically computed."; + } + typedef te-class-type { type uint8; description @@ -5755,13 +5762,6 @@ Internet-Draft TE Common YANG Types January 2024 typedef bandwidth-gbps { type uint64; units "Gbps"; - description - "Bandwidth values, expressed in gigabits per second."; - } - - identity backup-protection-type { - description - "Base identity for the backup protection type."; @@ -5770,6 +5770,13 @@ Busi, et al. Expires 28 July 2024 [Page 103] Internet-Draft TE Common YANG Types January 2024 + description + "Bandwidth values, expressed in gigabits per second."; + } + + identity backup-protection-type { + description + "Base identity for the backup protection type."; } identity backup-protection-link { @@ -5811,13 +5818,6 @@ Internet-Draft TE Common YANG Types January 2024 Diffserv-aware MPLS Traffic Engineering"; } - identity bc-model-mar { - base bc-model-type; - description - "Maximum Allocation with Reservation Bandwidth Constraints - Model type."; - reference - "RFC 4126: Max Allocation with Reservation Bandwidth @@ -5826,6 +5826,13 @@ Busi, et al. Expires 28 July 2024 [Page 104] Internet-Draft TE Common YANG Types January 2024 + identity bc-model-mar { + base bc-model-type; + description + "Maximum Allocation with Reservation Bandwidth Constraints + Model type."; + reference + "RFC 4126: Max Allocation with Reservation Bandwidth Constraints Model for Diffserv-aware MPLS Traffic Engineering & Performance Comparisons"; } @@ -5867,13 +5874,6 @@ Internet-Draft TE Common YANG Types January 2024 } leaf one-way-delay-variation { type uint32 { - range "0..16777215"; - } - description - "One-way delay variation in microseconds."; - reference - "RFC 5481: Packet Delay Variation Applicability - Statement, Section 4.2"; @@ -5882,6 +5882,13 @@ Busi, et al. Expires 28 July 2024 [Page 105] Internet-Draft TE Common YANG Types January 2024 + range "0..16777215"; + } + description + "One-way delay variation in microseconds."; + reference + "RFC 5481: Packet Delay Variation Applicability + Statement, Section 4.2"; } leaf one-way-delay-variation-normality { type te-types:performance-metrics-normality; @@ -5923,13 +5930,6 @@ Internet-Draft TE Common YANG Types January 2024 TE Metric Extensions RFC 8570: IS-IS Traffic Engineering (TE) Metric Extensions"; - } - description - "PM one-way packet-specific augmentation for a generic PM - grouping."; - } - augment "performance-metrics-two-way" { - leaf two-way-min-delay { @@ -5938,6 +5938,13 @@ Busi, et al. Expires 28 July 2024 [Page 106] Internet-Draft TE Common YANG Types January 2024 + } + description + "PM one-way packet-specific augmentation for a generic PM + grouping."; + } + augment "performance-metrics-two-way" { + leaf two-way-min-delay { type uint32 { range "0..16777215"; } @@ -5979,13 +5986,6 @@ Internet-Draft TE Common YANG Types January 2024 Explicitly Routed Label Switched Paths (LSPs) Using TE Metric Extensions RFC 8570: IS-IS Traffic Engineering (TE) Metric - Extensions"; - } - leaf two-way-delay-variation { - type uint32 { - range "0..16777215"; - } - default "0"; @@ -5994,6 +5994,13 @@ Busi, et al. Expires 28 July 2024 [Page 107] Internet-Draft TE Common YANG Types January 2024 + Extensions"; + } + leaf two-way-delay-variation { + type uint32 { + range "0..16777215"; + } + default "0"; description "Two-way delay variation in microseconds."; reference @@ -6035,13 +6042,6 @@ Internet-Draft TE Common YANG Types January 2024 "PM two-way packet-specific augmentation for a generic PM grouping."; reference - "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions - RFC 7823: Performance-Based Path Selection for - Explicitly Routed Label Switched Paths (LSPs) Using - TE Metric Extensions - RFC 8570: IS-IS Traffic Engineering (TE) Metric - Extensions"; - } @@ -6050,6 +6050,13 @@ Busi, et al. Expires 28 July 2024 [Page 108] Internet-Draft TE Common YANG Types January 2024 + "RFC 7471: OSPF Traffic Engineering (TE) Metric Extensions + RFC 7823: Performance-Based Path Selection for + Explicitly Routed Label Switched Paths (LSPs) Using + TE Metric Extensions + RFC 8570: IS-IS Traffic Engineering (TE) Metric + Extensions"; + } } } @@ -6091,13 +6098,6 @@ Internet-Draft TE Common YANG Types January 2024 sent over a configurable interval. The finest precision is 0.000003%."; } - } - - grouping two-way-performance-metrics-packet { - description - "Two-way packet PM throttle grouping."; - leaf two-way-min-delay { - type uint32 { @@ -6106,6 +6106,13 @@ Busi, et al. Expires 28 July 2024 [Page 109] Internet-Draft TE Common YANG Types January 2024 + } + + grouping two-way-performance-metrics-packet { + description + "Two-way packet PM throttle grouping."; + leaf two-way-min-delay { + type uint32 { range "0..16777215"; } default "0"; @@ -6147,13 +6154,6 @@ Internet-Draft TE Common YANG Types January 2024 uses te-types:performance-metrics-throttle-container { augment "throttle/threshold-out" { uses one-way-performance-metrics-packet; - uses two-way-performance-metrics-packet; - description - "PM threshold-out packet augmentation for a - generic grouping."; - } - augment "throttle/threshold-in" { - uses one-way-performance-metrics-packet; @@ -6162,6 +6162,13 @@ Busi, et al. Expires 28 July 2024 [Page 110] Internet-Draft TE Common YANG Types January 2024 + uses two-way-performance-metrics-packet; + description + "PM threshold-out packet augmentation for a + generic grouping."; + } + augment "throttle/threshold-in" { + uses one-way-performance-metrics-packet; uses two-way-performance-metrics-packet; description "PM threshold-in packet augmentation for a @@ -6203,13 +6210,6 @@ Internet-Draft TE Common YANG Types January 2024 leaf cbs { type uint64; units "bits/second"; - mandatory true; - description - "Committed Burst Size (CBS)."; - } - leaf eir { - type uint64; - units "bits/second"; @@ -6218,6 +6218,13 @@ Busi, et al. Expires 28 July 2024 [Page 111] Internet-Draft TE Common YANG Types January 2024 + mandatory true; + description + "Committed Burst Size (CBS)."; + } + leaf eir { + type uint64; + units "bits/second"; description "Excess Information Rate (EIR)."; } @@ -6259,13 +6266,6 @@ Internet-Draft TE Common YANG Types January 2024 Figure 2: Packet TE Types YANG module -6. IANA Considerations - - For the following URIs in the "IETF XML Registry" [RFC3688], IANA has - updated the reference field to refer to this document: - - - @@ -6274,6 +6274,11 @@ Busi, et al. Expires 28 July 2024 [Page 112] Internet-Draft TE Common YANG Types January 2024 +6. IANA Considerations + + For the following URIs in the "IETF XML Registry" [RFC3688], IANA has + updated the reference field to refer to this document: + URI: urn:ietf:params:xml:ns:yang:ietf-te-types Registrant Contact: The IESG. XML: N/A, the requested URI is an XML namespace. @@ -6317,11 +6322,6 @@ Internet-Draft TE Common YANG Types January 2024 (e.g., typedef, identity, and grouping statements) in YANG data modeling language to be imported and used by other TE modules. When imported and used, the resultant schema will have data nodes that can - be writable or readable. Access to such data nodes may be considered - sensitive or vulnerable in some network environments. Write - operations (e.g., edit-config) to these data nodes without proper - protection can have a negative effect on network operations. - @@ -6330,6 +6330,11 @@ Busi, et al. Expires 28 July 2024 [Page 113] Internet-Draft TE Common YANG Types January 2024 + be writable or readable. Access to such data nodes may be considered + sensitive or vulnerable in some network environments. Write + operations (e.g., edit-config) to these data nodes without proper + protection can have a negative effect on network operations. + The security considerations spelled out in the YANG 1.1 specification [RFC7950] apply for this document as well. @@ -6371,11 +6376,6 @@ Internet-Draft TE Common YANG Types January 2024 DOI 10.17487/RFC5541, June 2009, . - [RFC5557] Lee, Y., Le Roux, JL., King, D., and E. Oki, "Path - Computation Element Communication Protocol (PCEP) - Requirements and Protocol Extensions in Support of Global - Concurrent Optimization", RFC 5557, DOI 10.17487/RFC5557, - July 2009, . @@ -6386,6 +6386,12 @@ Busi, et al. Expires 28 July 2024 [Page 114] Internet-Draft TE Common YANG Types January 2024 + [RFC5557] Lee, Y., Le Roux, JL., King, D., and E. Oki, "Path + Computation Element Communication Protocol (PCEP) + Requirements and Protocol Extensions in Support of Global + Concurrent Optimization", RFC 5557, DOI 10.17487/RFC5557, + July 2009, . + [RFC6020] Bjorklund, M., Ed., "YANG - A Data Modeling Language for the Network Configuration Protocol (NETCONF)", RFC 6020, DOI 10.17487/RFC6020, October 2010, @@ -6428,12 +6434,6 @@ Internet-Draft TE Common YANG Types January 2024 DOI 10.17487/RFC8306, November 2017, . - [RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration - Access Control Model", STD 91, RFC 8341, - DOI 10.17487/RFC8341, March 2018, - . - - @@ -6442,6 +6442,11 @@ Busi, et al. Expires 28 July 2024 [Page 115] Internet-Draft TE Common YANG Types January 2024 + [RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration + Access Control Model", STD 91, RFC 8341, + DOI 10.17487/RFC8341, March 2018, + . + [RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N., Ananthakrishnan, H., and X. Liu, "A YANG Data Model for Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March @@ -6488,11 +6493,6 @@ Internet-Draft TE Common YANG Types January 2024 - - - - - Busi, et al. Expires 28 July 2024 [Page 116] Internet-Draft TE Common YANG Types January 2024 @@ -6954,21 +6954,21 @@ Internet-Draft TE Common YANG Types January 2024 < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set - 65,66c75,108 + 65,66c75,113 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; - > - > revision 2023-06-27 { + > revision 2023-11-25e { > description > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; + > - identity restoration-scheme-rerouting; > - base identity path-computation-error-reason and > its derived identities; > - base identity protocol-origin-type and @@ -6980,20 +6980,20 @@ Internet-Draft TE Common YANG Types January 2024 > > Updated: > - description of the base identity objective-function-type; - > - description and reference of identity action-exercise. + > - description and reference of identity action-exercise; + > - typedef te-node-id to support also 16 octects TE identifiers. > > Obsoleted: - > - identity of-minimize-agg-bandwidth-consumption - > - identity of-minimize-load-most-loaded-link - > - identity of-minimize-cost-path-set"; + > - identity of-minimize-agg-bandwidth-consumption; + > - identity of-minimize-load-most-loaded-link; + > - identity of-minimize-cost-path-set; + > - identity lsp-protection-reroute-extra; + > - identity lsp-protection-reroute. + > + > Container explicit-route-objects-always renamed as + > explicit-route-objects."; > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - > } - > // RFC Editor: replace XXXX with actual RFC number, update date - > // information and remove this note - 545a588,615 - > // CHANGE NOTE: The typedef path-type below has been + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; @@ -7002,19 +7002,62 @@ Busi, et al. Expires 28 July 2024 [Page 125] Internet-Draft TE Common YANG Types January 2024 - > // added in this module revision - > // RFC Editor: remove the note above and this note - > typedef path-type { - > type enumeration { - > enum primary-path { - > description - > "Indicates that the TE path is a primary path."; - > } - > enum secondary-path { - > description + > } + > // RFC Editor: replace XXXX with actual RFC number, update date + > // information and remove this note + 353c400,403 + < type yang:dotted-quad; + --- + > type union { + > type yang:dotted-quad; + > type inet:ipv6-address-no-zone; + > } + 357,358c407,411 + < The identifier is represented as 4 octets in dotted-quad + < notation. + --- + > + > The identifier is represented either as 4 octets in + > dotted-quad notation or 16 octets in full, mixed, shortened, + > or shortened-mixed IPv6 address notation. + > + 362,363c415,418 + < Router ID TLV described in Section 4.3 of RFC 5305, or the + < TE Router ID TLV described in Section 3.2.1 of RFC 6119. + --- + > Router ID TLV described in Section 4.3 of RFC 5305, the TE + > Router ID TLV described in Section 3.2.1 of RFC 6119, or the + > IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. + > + 368a424 + > + 370a427 + > + 371a429 + > + 545a604,631 + > // CHANGE NOTE: The typedef path-type below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > typedef path-type { + > type enumeration { + > enum primary-path { + > description + > "Indicates that the TE path is a primary path."; + > } + > enum secondary-path { + > description > "Indicates that the TE path is a secondary path."; > } > enum primary-reverse-path { + + + +Busi, et al. Expires 28 July 2024 [Page 126] + +Internet-Draft TE Common YANG Types January 2024 + + > description > "Indicates that the TE path is a primary reverse path."; > } @@ -7029,7 +7072,7 @@ Internet-Draft TE Common YANG Types January 2024 > path."; > } > - 606a677,684 + 606a693,700 > // CHANGE NOTE: The base identity lsp-provisioning-error-reason > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -7038,7 +7081,7 @@ Internet-Draft TE Common YANG Types January 2024 > "Base identity for LSP provisioning errors."; > } > - 982a1061,1078 + 982a1077,1094 > // CHANGE NOTE: The identity association-type-diversity below has > // been added in this module revision > // RFC Editor: remove the note above and this note @@ -7050,14 +7093,6 @@ Internet-Draft TE Common YANG Types January 2024 > reference > "RFC8800: Path Computation Element Communication Protocol > (PCEP) Extension for Label Switched Path (LSP) Diversity - - - -Busi, et al. Expires 28 July 2024 [Page 126] - -Internet-Draft TE Common YANG Types January 2024 - - > Constraint Signaling"; > } > @@ -7065,55 +7100,55 @@ Internet-Draft TE Common YANG Types January 2024 > // objective-function-type has been updated > // in this module revision > // RFC Editor: remove the note above and this note - 985c1081 + 985c1097 < "Base objective function type."; --- > "Base identity for path objective function type."; - 1015a1112,1114 + 1015a1128,1130 > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption + + + +Busi, et al. Expires 28 July 2024 [Page 127] + +Internet-Draft TE Common YANG Types January 2024 + + > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1017a1117 + 1017a1133 > status obsolete; - 1020c1120 + 1020c1136 < consumption."; --- > consumption."; - 1023c1123 + 1023c1139 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1025a1126,1128 + 1025a1142,1144 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1027a1131 + 1027a1147 > status obsolete; - 1030c1134 + 1030c1150 < is carrying the highest load."; --- > is carrying the highest load."; - 1033c1137 + 1033c1153 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; - 1035a1140,1142 + 1035a1156,1158 > // CHANGE NOTE: The identity of-minimize-cost-path-set > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note - 1037a1145 + 1037a1161 > status obsolete; - 1216a1325,1336 + 1216a1341,1352 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision - - - -Busi, et al. Expires 28 July 2024 [Page 127] - -Internet-Draft TE Common YANG Types January 2024 - - > // RFC Editor: remove the note above and this note > identity tunnel-admin-state-auto { > base tunnel-admin-state-type; @@ -7124,9 +7159,17 @@ Internet-Draft TE Common YANG Types January 2024 > when it is not used by the client layer."; > } > - 1321a1442,1450 + 1321a1458,1466 > // CHANGE NOTE: The identity lsp-restoration-restore-none > // below has been added in this module revision + + + +Busi, et al. Expires 28 July 2024 [Page 128] + +Internet-Draft TE Common YANG Types January 2024 + + > // RFC Editor: remove the note above and this note > identity lsp-restoration-restore-none { > base lsp-restoration-type; @@ -7134,49 +7177,123 @@ Internet-Draft TE Common YANG Types January 2024 > "No LSP affected by a failure is restored."; > } > - 1628a1758,1761 + 1339a1485,1499 + > // CHANGE NOTE: The identity restoration-scheme-rerouting + > // below has been added in this module revision + > // RFC Editor: remove the note above and this note + > identity restoration-scheme-rerouting { + > base restoration-scheme-type; + > description + > "Restoration LSP is computed after the failure detection. + > + > This restoration scheme is also known as + > 'Full LSP Re-routing.'"; + > reference + > "RFC 4427: Recovery (Protection and Restoration) Terminology + > for Generalized Multi-Protocol Label Switching (GMPLS)"; + > } + > + 1383a1544,1546 + > // CHANGE NOTE: The identity lsp-protection-reroute-extra + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1385a1549 + > status obsolete; + 1387c1551,1555 + < "'(Full) Rerouting' LSP protection type."; + --- + > "'(Full) Rerouting' LSP protection type. + > + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1392a1561,1563 + > // CHANGE NOTE: The identity lsp-protection-reroute + > // below has been obsoleted in this module revision + > // RFC Editor: remove the note above and this note + 1394a1566 + > status obsolete; + 1396c1568,1572 + < "'Rerouting without Extra-Traffic' LSP protection type."; + --- + > "'Rerouting without Extra-Traffic' LSP protection type. + > + + + +Busi, et al. Expires 28 July 2024 [Page 129] + +Internet-Draft TE Common YANG Types January 2024 + + + > This identity has been obsoleted: the + > 'restoration-scheme-rerouting' identity SHOULD be used + > instead."; + 1628a1805,1808 > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision > // RFC Editor: remove the note above and this note - 1632,1633c1765,1767 + 1632,1633c1812,1814 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any --- > "An action that starts testing whether or not Automatic > Protection Switching (APS) communication is operating > correctly. It is of lower priority than any - 1636,1637c1770,1771 + 1636,1637c1817,1818 < "RFC 4427: Recovery (Protection and Restoration) Terminology < for Generalized Multi-Protocol Label Switching (GMPLS)"; --- > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - > Linear trail and subnetwork protection"; - 2110a2245,2641 + 1916a2098,2100 + > // CHANGE NOTE: The description of the identity path-metric-type + > // has been updated in this module revision + > // RFC Editor: remove the note above and this note + 1919c2103,2106 + < "Base identity for the path metric type."; + --- + > "Base identity for the path metric type. + > + > Derived identities SHOULD describe the unit and maximum value + > of the path metric types they define."; + 1939a2127,2129 + > // CHANGE NOTE: The reference for the identity path-metric-hop + > // has been added in this module revision + > // RFC Editor: remove the note above and this note + 1943a2134,2136 + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; + 1945a2139 + > + 2110a2305,2708 > // CHANGE NOTE: The base identity path-computation-error-reason > // and its derived identities below have been > // added in this module revision > // RFC Editor: remove the note above and this note > identity path-computation-error-reason { - > description - > "Base identity for path computation error reasons."; - > } - > -Busi, et al. Expires 28 July 2024 [Page 128] +Busi, et al. Expires 28 July 2024 [Page 130] Internet-Draft TE Common YANG Types January 2024 + > description + > "Base identity for path computation error reasons."; + > } + > > identity path-computation-error-path-not-found { > base path-computation-error-reason; > description > "Path computation has failed because of an unspecified > reason."; > reference - > "Section 7.5 of RFC5440"; + > "Section 7.5 of RFC5440: Path Computation Element (PCE) + > Communication Protocol (PCEP)"; > } > > identity path-computation-error-no-topology { @@ -7207,25 +7324,26 @@ Internet-Draft TE Common YANG Types January 2024 > It corresponds to bit 31 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } > - > identity path-computation-error-no-inclusion-hop { - > base path-computation-error-reason; - > description - > "Path computation has failed because there is no - > node or link provided by one or more inclusion hops."; - > } -Busi, et al. Expires 28 July 2024 [Page 129] +Busi, et al. Expires 28 July 2024 [Page 131] Internet-Draft TE Common YANG Types January 2024 + > identity path-computation-error-no-inclusion-hop { + > base path-computation-error-reason; + > description + > "Path computation has failed because there is no + > node or link provided by one or more inclusion hops."; + > } > > identity path-computation-error-destination-unknown-in-domain { > base path-computation-error-reason; @@ -7268,20 +7386,20 @@ Internet-Draft TE Common YANG Types January 2024 > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } - > - > identity path-computation-error-destination-domain-unknown { - > base path-computation-error-reason; - > description - > "Path computation has failed because the destination domain - > was unknown. -Busi, et al. Expires 28 July 2024 [Page 130] +Busi, et al. Expires 28 July 2024 [Page 132] Internet-Draft TE Common YANG Types January 2024 + > + > identity path-computation-error-destination-domain-unknown { + > base path-computation-error-reason; + > description + > "Path computation has failed because the destination domain + > was unknown. > > It corresponds to bit 22 of the Flags field of the > NO-PATH-VECTOR TLV."; @@ -7324,20 +7442,20 @@ Internet-Draft TE Common YANG Types January 2024 > description > "Path computation has failed because of no GCO solution > found. - > - > It corresponds to bit 25 of the Flags field of the - > NO-PATH-VECTOR TLV."; - > reference - > "RFC5557; - > -Busi, et al. Expires 28 July 2024 [Page 131] +Busi, et al. Expires 28 July 2024 [Page 133] Internet-Draft TE Common YANG Types January 2024 + > + > It corresponds to bit 25 of the Flags field of the + > NO-PATH-VECTOR TLV."; + > reference + > "RFC5557; + > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } > @@ -7378,29 +7496,31 @@ Internet-Draft TE Common YANG Types January 2024 > It corresponds to bit 29 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; - > - > https://www.iana.org/assignments/pcep/pcep.xhtml"; - > } - > - > identity path-computation-error-destination-unknown { - > base path-computation-error-reason; - > description + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); -Busi, et al. Expires 28 July 2024 [Page 132] +Busi, et al. Expires 28 July 2024 [Page 134] Internet-Draft TE Common YANG Types January 2024 + > + > https://www.iana.org/assignments/pcep/pcep.xhtml"; + > } + > + > identity path-computation-error-destination-unknown { + > base path-computation-error-reason; + > description > "Path computation has failed because destination node is > unknown. > > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7411,7 +7531,8 @@ Internet-Draft TE Common YANG Types January 2024 > "Path computation has failed because path computation > server is unavailable."; > reference - > "RFC5440; + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7433,23 +7554,25 @@ Internet-Draft TE Common YANG Types January 2024 > } > > identity protocol-origin-pcep { + + + +Busi, et al. Expires 28 July 2024 [Page 135] + +Internet-Draft TE Common YANG Types January 2024 + + > base protocol-origin-type; > description > "Protocol origin is Path Computation Engine Protocol > (PCEP)."; - > reference "RFC5440"; + > reference + > "RFC5440: Path Computation Element (PCE) Communication + > Protocol (PCEP)"; > } > > identity protocol-origin-bgp { > base protocol-origin-type; - - - -Busi, et al. Expires 28 July 2024 [Page 133] - -Internet-Draft TE Common YANG Types January 2024 - - > description > "Protocol origin is Border Gateway Protocol (BGP)."; > reference "RFC9012"; @@ -7487,6 +7610,14 @@ Internet-Draft TE Common YANG Types January 2024 > Computation Element Communication Protocol (PCEP)."; > } > + + + +Busi, et al. Expires 28 July 2024 [Page 136] + +Internet-Draft TE Common YANG Types January 2024 + + > identity svec-of-minimize-cost-path-set { > base svec-objective-function-type; > description @@ -7498,14 +7629,6 @@ Internet-Draft TE Common YANG Types January 2024 > } > > identity svec-of-minimize-common-transit-domain { - - - -Busi, et al. Expires 28 July 2024 [Page 134] - -Internet-Draft TE Common YANG Types January 2024 - - > base svec-objective-function-type; > description > "Objective function for minimizing the number of common @@ -7543,6 +7666,14 @@ Internet-Draft TE Common YANG Types January 2024 > description > "Objective function for minimizing the number of shared > nodes (MSN)."; + + + +Busi, et al. Expires 28 July 2024 [Page 137] + +Internet-Draft TE Common YANG Types January 2024 + + > reference > "RFC8685: Path Computation Element Communication Protocol > (PCEP) Extensions for the Hierarchical Path Computation @@ -7554,14 +7685,6 @@ Internet-Draft TE Common YANG Types January 2024 > // added in this module revision > // RFC Editor: remove the note above and this note > identity svec-metric-type { - - - -Busi, et al. Expires 28 July 2024 [Page 135] - -Internet-Draft TE Common YANG Types January 2024 - - > description > "Base identity for SVEC metric type."; > reference @@ -7599,6 +7722,14 @@ Internet-Draft TE Common YANG Types January 2024 > identity svec-metric-aggregate-bandwidth-consumption { > base svec-metric-type; > description + + + +Busi, et al. Expires 28 July 2024 [Page 138] + +Internet-Draft TE Common YANG Types January 2024 + + > "Aggregate bandwidth consumption."; > reference > "RFC5541: Encoding of Objective Functions in the Path @@ -7610,19 +7741,11 @@ Internet-Draft TE Common YANG Types January 2024 > description > "Load of the most loaded link."; > reference - - - -Busi, et al. Expires 28 July 2024 [Page 136] - -Internet-Draft TE Common YANG Types January 2024 - - > "RFC5541: Encoding of Objective Functions in the Path > Computation Element Communication Protocol (PCEP)."; > } > - 2514a3046,3054 + 2514a3113,3121 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; @@ -7632,9 +7755,9 @@ Internet-Draft TE Common YANG Types January 2024 > description > "The identifier of a node in the topology."; > } - 2517d3056 + 2517d3123 < mandatory true; - 2566a3106,3116 + 2566a3173,3183 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -7646,38 +7769,38 @@ Internet-Draft TE Common YANG Types January 2024 > description > "Link Termination Point (LTP) identifier."; > } - 2569d3118 + 2569d3185 < mandatory true; - 2574a3124,3128 + 2574a3191,3195 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2577d3130 + 2577d3197 + + + +Busi, et al. Expires 28 July 2024 [Page 139] + +Internet-Draft TE Common YANG Types January 2024 + + < mandatory true; - 2646a3200,3203 + 2646a3267,3270 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; > } - 2648a3206,3210 + 2648a3273,3277 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; - - - -Busi, et al. Expires 28 July 2024 [Page 137] - -Internet-Draft TE Common YANG Types January 2024 - - > } - 2651d3212 + 2651d3279 < mandatory true; - 2696a3258,3268 + 2696a3325,3335 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -7689,21 +7812,45 @@ Internet-Draft TE Common YANG Types January 2024 > description > "Link Termination Point (LTP) identifier."; > } - 2699d3270 + 2699d3337 < mandatory true; - 2704a3276,3280 + 2704a3343,3347 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } - 2968a3545,3549 + 2968a3612,3616 > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; > } - 3379c3960,3987 + 2977c3625 + < container explicit-route-objects-always { + --- + > container explicit-route-objects { + 3124,3126c3772,3778 + < "Upper bound on the end-to-end TE path metric. A zero + < indicates an unbounded upper limit for the specific + < 'metric-type'."; + + + +Busi, et al. Expires 28 July 2024 [Page 140] + +Internet-Draft TE Common YANG Types January 2024 + + + --- + > "Upper bound on the end-to-end TE path metric. + > + > A zero indicates an unbounded upper limit for the + > specific 'metric-type'. + > + > The unit of is interpreted in the context of the + > path-metric-type."; + 3379c4031,4058 < } \ No newline at end of file --- @@ -7722,14 +7869,6 @@ Internet-Draft TE Common YANG Types January 2024 > description > "LSP encoding type."; > reference - - - -Busi, et al. Expires 28 July 2024 [Page 138] - -Internet-Draft TE Common YANG Types January 2024 - - > "RFC3945"; > } > leaf switching-type { @@ -7751,6 +7890,14 @@ A.2. Packet TE Types YANG Diffs This section provides the diff between the YANG module in section 3.2 of [RFC8776] and the YANG model revision in Section 5. + + + +Busi, et al. Expires 28 July 2024 [Page 141] + +Internet-Draft TE Common YANG Types January 2024 + + The intention of this appendix is to facilitate focusing the review of the YANG model in Section 5 to the changes compared with the YANG model in [RFC8776]. @@ -7767,206 +7914,283 @@ A.2. Packet TE Types YANG Diffs The output (model-updates.txt) is reported here: - 11c11,12 - < "RFC 8776: Common YANG Data Types for Traffic Engineering"; - --- - > "RFCXXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - 12a14,15 - > // RFC Editor: replace XXXX with actual RFC number - > // and remove this note - 22c25 - < - --- + 11c11 + < "RFC 8776: Common YANG Data Types for Traffic Engineering"; + --- + > "RFCXXXX: Common YANG Data Types for Traffic Engineering"; + 12a13,14 + > // RFC Editor: replace XXXX with actual RFC number + > // and remove this note + 22c24 + < + --- + > + 37,39c39,49 + < data type definitions specific to MPLS TE. The model fully + < conforms to the Network Management Datastore Architecture + < (NMDA). + --- + > data type definitions specific to Packet Traffic Enginnering + > (TE). + > + > The model fully conforms to the Network Management Datastore + > Architecture (NMDA). + > + > 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. + 41c51 + < Copyright (c) 2020 IETF Trust and the persons identified as + --- + > Copyright (c) 2024 IETF Trust and the persons identified as + 46c56 + +Busi, et al. Expires 28 July 2024 [Page 142] + +Internet-Draft TE Common YANG Types January 2024 + -Busi, et al. Expires 28 July 2024 [Page 139] + < the license terms contained in, the Simplified BSD License set + --- + > the license terms contained in, the Revised BSD License set + 51,52c61,80 + < This version of this YANG module is part of RFC 8776; see the + < RFC itself for full legal notices."; + --- + > 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."; + > revision 2024-01-25 { + > description + > "Added common TE packet identities: + > - bandwidth-profile-type; + > - path-metric-loss; + > - path-metric-delay-variation. + > + > Added common TE packet groupings: + > - te-packet-path-bandwidth; + > - te-packet-link-bandwidth. + > + > Updated module description."; + > reference + > "RFC XXXX: Common YANG Data Types for Traffic Engineering"; + > } + > // RFC Editor: replace XXXX with actual RFC number, update date + > // information and remove this note + 61c89,187 + < /** + --- + > /* + > * Identities + > */ + > + > // CHANGE NOTE: The base identity bandwidth-profile-type and + > // its derived identities below have been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > identity bandwidth-profile-type { + > description + > "Bandwidth Profile Types"; + > } + > + > identity mef-10-bwp { + > base bandwidth-profile-type; + > description + > "MEF 10 Bandwidth Profile"; + > reference + + + +Busi, et al. Expires 28 July 2024 [Page 143] Internet-Draft TE Common YANG Types January 2024 - > - 41c44 - < Copyright (c) 2020 IETF Trust and the persons identified as - --- - > Copyright (c) 2023 IETF Trust and the persons identified as - 46c49 - < the license terms contained in, the Simplified BSD License set - --- - > the license terms contained in, the Revised BSD License set - 51,52c54,71 - < This version of this YANG module is part of RFC 8776; see the - < RFC itself for full legal notices."; - --- - > 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."; - > - > revision 2023-07-10 { - > description - > "Added common TE packet identities: - > - bandwidth-profile-type. - > - > Added common TE packet groupings: - > - te-packet-path-bandwidth; - > - te-packet-link-bandwidth."; - > reference - > "RFC XXXX: Updated Common YANG Data Types for Traffic - > Engineering"; - > } - > // RFC Editor: replace XXXX with actual RFC number, update date - > // information and remove this note - 61c80,126 - < /** - --- - > /* - > * Identities - > */ - > - > // CHANGE NOTE: The base identity bandwidth-profile-type and - > // its derived identities below have been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > identity bandwidth-profile-type { - > description - > "Bandwidth Profile Types"; - > } - > - > identity mef-10-bwp { + > "MEF 10.3: Ethernet Services Attributes Phase 3"; + > } + > + > identity rfc-2697-bwp { + > base bandwidth-profile-type; + > description + > "RFC 2697 Bandwidth Profile"; + > reference + > "RFC2697: A Single Rate Three Color Marker"; + > } + > + > identity rfc-2698-bwp { + > base bandwidth-profile-type; + > description + > "RFC 2698 Bandwidth Profile"; + > reference + > "RFC2698: A Two Rate Three Color Marker"; + > } + > + > identity rfc-4115-bwp { + > base bandwidth-profile-type; + > description + > "RFC 4115 Bandwidth Profile"; + > reference + > "RFC4115: A Differentiated Service Two-Rate, Three-Color + > Marker with Efficient Handling of in-Profile Traffic"; + > } + > + > // CHANGE NOTE: The identity path-metric-loss below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-loss { + > base te-types:path-metric-type; + > description + > "The path loss (as a packet percentage) metric type + > encodes a function of the unidirectional loss metrics of all + > links traversed by a P2P path. + > + > The basic unit is 0.000003%, + > where (2^24 - 2) or 50.331642% is the maximum value of the + > path loss percentage that can be expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); -Busi, et al. Expires 28 July 2024 [Page 140] +Busi, et al. Expires 28 July 2024 [Page 144] Internet-Draft TE Common YANG Types January 2024 - > base bandwidth-profile-type; - > description - > "MEF 10 Bandwidth Profile"; - > reference - > "MEF 10.3: Ethernet Services Attributes Phase 3"; - > } - > - > identity rfc-2697-bwp { - > base bandwidth-profile-type; - > description - > "RFC 2697 Bandwidth Profile"; - > reference - > "RFC2697: A Single Rate Three Color Marker"; - > } - > - > identity rfc-2698-bwp { - > base bandwidth-profile-type; - > description - > "RFC 2698 Bandwidth Profile"; - > reference - > "RFC2698: A Two Rate Three Color Marker"; - > } - > - > identity rfc-4115-bwp { - > base bandwidth-profile-type; - > description - > "RFC 4115 Bandwidth Profile"; - > reference - > "RFC4115: A Differentiated Service Two-Rate, Three-Color - > Marker with Efficient Handling of in-Profile Traffic"; - > } - > - > /* - 180a246,249 - > /* - > * Groupings - > */ - > - 472a542,611 - > } - > } - > - > // CHANGE NOTE: The te-packet-path-bandwidth below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > grouping te-packet-path-bandwidth { - > description - > "Path bandwidth for Packet. "; + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > + > // CHANGE NOTE: The identity path-metric-delay-variation below has + > // been added in this module revision + > // RFC Editor: remove the note above and this note + > identity path-metric-delay-variation { + > base te-types:path-metric-type; + > description + > "The path delay variation encodes the sum of the unidirectional + > delay variation metrics of all links traversed by a P2P path. + > + > The path delay variation metric unit is in microseconds, where + > (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the + > maximum value of the path delay variation that can be + > expressed. + > + > Values that are larger than the maximum value SHOULD be + > encoded as the maximum value."; + > reference + > "RFC8233: Extensions to the Path Computation Element + > Communication Protocol (PCEP) to Compute Service-Aware Label + > Switched Paths (LSPs); + > + > RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; + > + > RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; + > } + > + > /* + 180a307,310 + > /* + > * Groupings + > */ + > + 472a603,672 + > } + > } + > + > // CHANGE NOTE: The te-packet-path-bandwidth below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > grouping te-packet-path-bandwidth { + > description + > "Path bandwidth for Packet. "; -Busi, et al. Expires 28 July 2024 [Page 141] +Busi, et al. Expires 28 July 2024 [Page 145] Internet-Draft TE Common YANG Types January 2024 - > leaf bandwidth-profile-name { - > type string; - > description "Name of Bandwidth Profile."; - > } - > leaf bandwidth-profile-type { - > type identityref { - > base bandwidth-profile-type; - > } - > description "Type of Bandwidth Profile."; - > } - > leaf cir { - > type uint64; - > units "bits/second"; - > mandatory true; - > description - > "Committed Information Rate (CIR)."; - > } - > leaf cbs { - > type uint64; - > units "bits/second"; - > mandatory true; - > description - > "Committed Burst Size (CBS)."; - > } - > leaf eir { - > type uint64; - > units "bits/second"; - > description - > "Excess Information Rate (EIR)."; - > } - > leaf ebs { - > type uint64; - > units "bytes"; - > description - > "Excess Burst Size (EBS)."; - > } - > leaf pir { - > type uint64; - > units "bits/second"; - > description - > "Peak Information Rate (PIR)."; - > } - > leaf pbs { - > type uint64; - > units "bytes"; - > description - > "Peak Burst Size (PBS)."; - > } + > leaf bandwidth-profile-name { + > type string; + > description "Name of Bandwidth Profile."; + > } + > leaf bandwidth-profile-type { + > type identityref { + > base bandwidth-profile-type; + > } + > description "Type of Bandwidth Profile."; + > } + > leaf cir { + > type uint64; + > units "bits/second"; + > mandatory true; + > description + > "Committed Information Rate (CIR)."; + > } + > leaf cbs { + > type uint64; + > units "bits/second"; + > mandatory true; + > description + > "Committed Burst Size (CBS)."; + > } + > leaf eir { + > type uint64; + > units "bits/second"; + > description + > "Excess Information Rate (EIR)."; + > } + > leaf ebs { + > type uint64; + > units "bytes"; + > description + > "Excess Burst Size (EBS)."; + > } + > leaf pir { + > type uint64; + > units "bits/second"; + > description + > "Peak Information Rate (PIR)."; + > } + > leaf pbs { + > type uint64; + > units "bytes"; + > description + > "Peak Burst Size (PBS)."; + > } -Busi, et al. Expires 28 July 2024 [Page 142] +Busi, et al. Expires 28 July 2024 [Page 146] Internet-Draft TE Common YANG Types January 2024 - > } - > - > // CHANGE NOTE: The te-packet-path-bandwidth below has been - > // added in this module revision - > // RFC Editor: remove the note above and this note - > grouping te-packet-link-bandwidth { - > description - > "Link Bandwidth for Packet. "; - > leaf packet-bandwidth { - > type uint64; - > units "bits/second"; - > description - > "Available bandwith value."; + > } + > + > // CHANGE NOTE: The te-packet-path-bandwidth below has been + > // added in this module revision + > // RFC Editor: remove the note above and this note + > grouping te-packet-link-bandwidth { + > description + > "Link Bandwidth for Packet. "; + > leaf packet-bandwidth { + > type uint64; + > units "bits/second"; + > description + > "Available bandwith value."; Appendix B. Option Considered for updating RFC8776 @@ -8005,7 +8229,7 @@ Appendix B. Option Considered for updating RFC8776 -Busi, et al. Expires 28 July 2024 [Page 143] +Busi, et al. Expires 28 July 2024 [Page 147] Internet-Draft TE Common YANG Types January 2024 @@ -8061,7 +8285,7 @@ Authors' Addresses -Busi, et al. Expires 28 July 2024 [Page 144] +Busi, et al. Expires 28 July 2024 [Page 148] Internet-Draft TE Common YANG Types January 2024 @@ -8117,4 +8341,4 @@ Internet-Draft TE Common YANG Types January 2024 -Busi, et al. Expires 28 July 2024 [Page 145] +Busi, et al. Expires 28 July 2024 [Page 149] diff --git a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml index 7a17078..3c7715c 100644 --- a/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml +++ b/drafts/te-types-update/draft-ietf-teas-rfc8776-update.xml @@ -4686,7 +4686,7 @@ module ietf-te-types { RFC Editor: remove the CHANGE NOTE above and this note -
    "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to Packet Traffic Enginnering (TE). + data type definitions specific to Packet Traffic Enginnering + (TE). The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2023 IETF Trust and the persons identified as + 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. + + 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 @@ -4743,7 +4750,7 @@ module ietf-te-packet-types { 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."; - revision 2023-11-16 { + revision 2024-01-25 { description "Added common TE packet identities: - bandwidth-profile-type; @@ -4818,7 +4825,7 @@ module ietf-te-packet-types { // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-loss { - base path-metric-type; + base te-types:path-metric-type; description "The path loss (as a packet percentage) metric type encodes a function of the unidirectional loss metrics of all @@ -4844,7 +4851,7 @@ module ietf-te-packet-types { // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-delay-variation { - base path-metric-type; + base te-types:path-metric-type; description "The path delay variation encodes the sum of the unidirectional delay variation metrics of all links traversed by a P2P path. @@ -6931,21 +6938,21 @@ sed 's/^ > / > /' model-diff-spaces.txt < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set -65,66c75,108 +65,66c75,113 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; -> -> revision 2023-06-27 { +> revision 2023-11-25e { > description > "Added: > - base identity lsp-provisioning-error-reason; > - identity association-type-diversity; > - identity tunnel-admin-state-auto; > - identity lsp-restoration-restore-none; +> - identity restoration-scheme-rerouting; > - base identity path-computation-error-reason and > its derived identities; > - base identity protocol-origin-type and @@ -6957,19 +6964,54 @@ sed 's/^ > / > /' model-diff-spaces.txt > > Updated: > - description of the base identity objective-function-type; -> - description and reference of identity action-exercise. +> - description and reference of identity action-exercise; +> - typedef te-node-id to support also 16 octects TE identifiers. > > Obsoleted: -> - identity of-minimize-agg-bandwidth-consumption -> - identity of-minimize-load-most-loaded-link -> - identity of-minimize-cost-path-set"; +> - identity of-minimize-agg-bandwidth-consumption; +> - identity of-minimize-load-most-loaded-link; +> - identity of-minimize-cost-path-set; +> - identity lsp-protection-reroute-extra; +> - identity lsp-protection-reroute. +> +> Container explicit-route-objects-always renamed as +> explicit-route-objects."; > reference -> "RFC XXXX: Updated Common YANG Data Types for Traffic -> Engineering"; +> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note -545a588,615 +353c400,403 +< type yang:dotted-quad; +--- +> type union { +> type yang:dotted-quad; +> type inet:ipv6-address-no-zone; +> } +357,358c407,411 +< The identifier is represented as 4 octets in dotted-quad +< notation. +--- +> +> The identifier is represented either as 4 octets in +> dotted-quad notation or 16 octets in full, mixed, shortened, +> or shortened-mixed IPv6 address notation. +> +362,363c415,418 +< Router ID TLV described in Section 4.3 of RFC 5305, or the +< TE Router ID TLV described in Section 3.2.1 of RFC 6119. +--- +> Router ID TLV described in Section 4.3 of RFC 5305, the TE +> Router ID TLV described in Section 3.2.1 of RFC 6119, or the +> IPv6 TE Router ID TLV described in Section 4.1 of RFC 6119. +> +368a424 +> +370a427 +> +371a429 +> +545a604,631 > // CHANGE NOTE: The typedef path-type below has been > // added in this module revision > // RFC Editor: remove the note above and this note @@ -6998,7 +7040,7 @@ sed 's/^ > / > /' model-diff-spaces.txt > path."; > } > -606a677,684 +606a693,700 > // CHANGE NOTE: The base identity lsp-provisioning-error-reason > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -7007,7 +7049,7 @@ sed 's/^ > / > /' model-diff-spaces.txt > "Base identity for LSP provisioning errors."; > } > -982a1061,1078 +982a1077,1094 > // CHANGE NOTE: The identity association-type-diversity below has > // been added in this module revision > // RFC Editor: remove the note above and this note @@ -7026,45 +7068,45 @@ sed 's/^ > / > /' model-diff-spaces.txt > // objective-function-type has been updated > // in this module revision > // RFC Editor: remove the note above and this note -985c1081 +985c1097 < "Base objective function type."; --- > "Base identity for path objective function type."; -1015a1112,1114 +1015a1128,1130 > // CHANGE NOTE: The identity of-minimize-agg-bandwidth-consumption > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1017a1117 +1017a1133 > status obsolete; -1020c1120 +1020c1136 < consumption."; --- > consumption."; -1023c1123 +1023c1139 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; -1025a1126,1128 +1025a1142,1144 > // CHANGE NOTE: The identity of-minimize-load-most-loaded-link > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1027a1131 +1027a1147 > status obsolete; -1030c1134 +1030c1150 < is carrying the highest load."; --- > is carrying the highest load."; -1033c1137 +1033c1153 < Computation Element Communication Protocol (PCEP)"; --- > Computation Element Communication Protocol (PCEP)"; -1035a1140,1142 +1035a1156,1158 > // CHANGE NOTE: The identity of-minimize-cost-path-set > // below has been obsoleted in this module revision > // RFC Editor: remove the note above and this note -1037a1145 +1037a1161 > status obsolete; -1216a1325,1336 +1216a1341,1352 > // CHANGE NOTE: The identity tunnel-admin-state-auto below > // has been added in this module revision > // RFC Editor: remove the note above and this note @@ -7077,7 +7119,7 @@ sed 's/^ > / > /' model-diff-spaces.txt > when it is not used by the client layer."; > } > -1321a1442,1450 +1321a1458,1466 > // CHANGE NOTE: The identity lsp-restoration-restore-none > // below has been added in this module revision > // RFC Editor: remove the note above and this note @@ -7087,25 +7129,90 @@ sed 's/^ > / > /' model-diff-spaces.txt > "No LSP affected by a failure is restored."; > } > -1628a1758,1761 +1339a1485,1499 +> // CHANGE NOTE: The identity restoration-scheme-rerouting +> // below has been added in this module revision +> // RFC Editor: remove the note above and this note +> identity restoration-scheme-rerouting { +> base restoration-scheme-type; +> description +> "Restoration LSP is computed after the failure detection. +> +> This restoration scheme is also known as +> 'Full LSP Re-routing.'"; +> reference +> "RFC 4427: Recovery (Protection and Restoration) Terminology +> for Generalized Multi-Protocol Label Switching (GMPLS)"; +> } +> +1383a1544,1546 +> // CHANGE NOTE: The identity lsp-protection-reroute-extra +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1385a1549 +> status obsolete; +1387c1551,1555 +< "'(Full) Rerouting' LSP protection type."; +--- +> "'(Full) Rerouting' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1392a1561,1563 +> // CHANGE NOTE: The identity lsp-protection-reroute +> // below has been obsoleted in this module revision +> // RFC Editor: remove the note above and this note +1394a1566 +> status obsolete; +1396c1568,1572 +< "'Rerouting without Extra-Traffic' LSP protection type."; +--- +> "'Rerouting without Extra-Traffic' LSP protection type. +> +> This identity has been obsoleted: the +> 'restoration-scheme-rerouting' identity SHOULD be used +> instead."; +1628a1805,1808 > // cCHANGE NOTE: The description and reference of the > // identity action-exercise have been updated in this module > // revision > // RFC Editor: remove the note above and this note -1632,1633c1765,1767 +1632,1633c1812,1814 < "An action that starts testing whether or not APS communication < is operating correctly. It is of lower priority than any --- > "An action that starts testing whether or not Automatic > Protection Switching (APS) communication is operating > correctly. It is of lower priority than any -1636,1637c1770,1771 +1636,1637c1817,1818 < "RFC 4427: Recovery (Protection and Restoration) Terminology < for Generalized Multi-Protocol Label Switching (GMPLS)"; --- > "ITU-T G.808.1 v4.0 (05/2014): Generic protection switching - > Linear trail and subnetwork protection"; -2110a2245,2641 +1916a2098,2100 +> // CHANGE NOTE: The description of the identity path-metric-type +> // has been updated in this module revision +> // RFC Editor: remove the note above and this note +1919c2103,2106 +< "Base identity for the path metric type."; +--- +> "Base identity for the path metric type. +> +> Derived identities SHOULD describe the unit and maximum value +> of the path metric types they define."; +1939a2127,2129 +> // CHANGE NOTE: The reference for the identity path-metric-hop +> // has been added in this module revision +> // RFC Editor: remove the note above and this note +1943a2134,2136 +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; +1945a2139 +> +2110a2305,2708 > // CHANGE NOTE: The base identity path-computation-error-reason > // and its derived identities below have been > // added in this module revision @@ -7121,7 +7228,8 @@ sed 's/^ > / > /' model-diff-spaces.txt > "Path computation has failed because of an unspecified > reason."; > reference -> "Section 7.5 of RFC5440"; +> "Section 7.5 of RFC5440: Path Computation Element (PCE) +> Communication Protocol (PCEP)"; > } > > identity path-computation-error-no-topology { @@ -7152,7 +7260,8 @@ sed 's/^ > / > /' model-diff-spaces.txt > It corresponds to bit 31 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7299,7 +7408,8 @@ sed 's/^ > / > /' model-diff-spaces.txt > It corresponds to bit 29 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7313,7 +7423,8 @@ sed 's/^ > / > /' model-diff-spaces.txt > It corresponds to bit 30 of the Flags field of the > NO-PATH-VECTOR TLV."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7324,7 +7435,8 @@ sed 's/^ > / > /' model-diff-spaces.txt > "Path computation has failed because path computation > server is unavailable."; > reference -> "RFC5440; +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP); > > https://www.iana.org/assignments/pcep/pcep.xhtml"; > } @@ -7350,7 +7462,9 @@ sed 's/^ > / > /' model-diff-spaces.txt > description > "Protocol origin is Path Computation Engine Protocol > (PCEP)."; -> reference "RFC5440"; +> reference +> "RFC5440: Path Computation Element (PCE) Communication +> Protocol (PCEP)"; > } > > identity protocol-origin-bgp { @@ -7503,7 +7617,7 @@ sed 's/^ > / > /' model-diff-spaces.txt > Computation Element Communication Protocol (PCEP)."; > } > -2514a3046,3054 +2514a3113,3121 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; @@ -7513,9 +7627,9 @@ sed 's/^ > / > /' model-diff-spaces.txt > description > "The identifier of a node in the topology."; > } -2517d3056 +2517d3123 < mandatory true; -2566a3106,3116 +2566a3173,3183 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -7527,30 +7641,30 @@ sed 's/^ > / > /' model-diff-spaces.txt > description > "Link Termination Point (LTP) identifier."; > } -2569d3118 +2569d3185 < mandatory true; -2574a3124,3128 +2574a3191,3195 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2577d3130 +2577d3197 < mandatory true; -2646a3200,3203 +2646a3267,3270 > must "node-id-uri or node-id" { > description > "At least one node identifier MUST be present."; > } -2648a3206,3210 +2648a3273,3277 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2651d3212 +2651d3279 < mandatory true; -2696a3258,3268 +2696a3325,3335 > must "(link-tp-id-uri or link-tp-id) and " + > "(node-id-uri or node-id)" { > description @@ -7562,21 +7676,37 @@ sed 's/^ > / > /' model-diff-spaces.txt > description > "Link Termination Point (LTP) identifier."; > } -2699d3270 +2699d3337 < mandatory true; -2704a3276,3280 +2704a3343,3347 > leaf node-id-uri { > type nw:node-id; > description > "The identifier of a node in the topology."; > } -2968a3545,3549 +2968a3612,3616 > leaf network-id { > type nw:network-id; > description > "The network topology identifier."; > } -3379c3960,3987 +2977c3625 +< container explicit-route-objects-always { +--- +> container explicit-route-objects { +3124,3126c3772,3778 +< "Upper bound on the end-to-end TE path metric. A zero +< indicates an unbounded upper limit for the specific +< 'metric-type'."; +--- +> "Upper bound on the end-to-end TE path metric. +> +> A zero indicates an unbounded upper limit for the +> specific 'metric-type'. +> +> The unit of is interpreted in the context of the +> path-metric-type."; +3379c4031,4058 < } \ No newline at end of file --- @@ -7632,49 +7762,66 @@ sed 's/^ > / > /' model-diff-spaces.txt The output (model-updates.txt) is reported here:
    "RFCXXXX: Updated Common YANG Data Types for Traffic -> Engineering"; -12a14,15 +> "RFCXXXX: Common YANG Data Types for Traffic Engineering"; +12a13,14 > // RFC Editor: replace XXXX with actual RFC number > // and remove this note -22c25 +22c24 < --- > -41c44 +37,39c39,49 +< data type definitions specific to MPLS TE. The model fully +< conforms to the Network Management Datastore Architecture +< (NMDA). +--- +> data type definitions specific to Packet Traffic Enginnering +> (TE). +> +> The model fully conforms to the Network Management Datastore +> Architecture (NMDA). +> +> 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. +41c51 < Copyright (c) 2020 IETF Trust and the persons identified as --- -> Copyright (c) 2023 IETF Trust and the persons identified as -46c49 +> Copyright (c) 2024 IETF Trust and the persons identified as +46c56 < the license terms contained in, the Simplified BSD License set --- > the license terms contained in, the Revised BSD License set -51,52c54,71 +51,52c61,80 < This version of this YANG module is part of RFC 8776; see the < RFC itself for full legal notices."; --- > 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."; -> -> revision 2023-07-10 { +> revision 2024-01-25 { > description > "Added common TE packet identities: -> - bandwidth-profile-type. +> - bandwidth-profile-type; +> - path-metric-loss; +> - path-metric-delay-variation. > > Added common TE packet groupings: > - te-packet-path-bandwidth; -> - te-packet-link-bandwidth."; +> - te-packet-link-bandwidth. +> +> Updated module description."; > reference -> "RFC XXXX: Updated Common YANG Data Types for Traffic -> Engineering"; +> "RFC XXXX: Common YANG Data Types for Traffic Engineering"; > } > // RFC Editor: replace XXXX with actual RFC number, update date > // information and remove this note -61c80,126 +61c89,187 < /** --- > /* @@ -7723,13 +7870,65 @@ sed 's/^ > / > /' model-diff-spaces.txt > Marker with Efficient Handling of in-Profile Traffic"; > } > +> // CHANGE NOTE: The identity path-metric-loss below has +> // been added in this module revision +> // RFC Editor: remove the note above and this note +> identity path-metric-loss { +> base te-types:path-metric-type; +> description +> "The path loss (as a packet percentage) metric type +> encodes a function of the unidirectional loss metrics of all +> links traversed by a P2P path. +> +> The basic unit is 0.000003%, +> where (2^24 - 2) or 50.331642% is the maximum value of the +> path loss percentage that can be expressed. +> +> Values that are larger than the maximum value SHOULD be +> encoded as the maximum value."; +> reference +> "RFC8233: Extensions to the Path Computation Element +> Communication Protocol (PCEP) to Compute Service-Aware Label +> Switched Paths (LSPs); +> +> RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; +> +> RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; +> } +> +> // CHANGE NOTE: The identity path-metric-delay-variation below has +> // been added in this module revision +> // RFC Editor: remove the note above and this note +> identity path-metric-delay-variation { +> base te-types:path-metric-type; +> description +> "The path delay variation encodes the sum of the unidirectional +> delay variation metrics of all links traversed by a P2P path. +> +> The path delay variation metric unit is in microseconds, where +> (2^24 - 1) or 16,777,215 microseconds (16.777215 sec) is the +> maximum value of the path delay variation that can be +> expressed. +> +> Values that are larger than the maximum value SHOULD be +> encoded as the maximum value."; +> reference +> "RFC8233: Extensions to the Path Computation Element +> Communication Protocol (PCEP) to Compute Service-Aware Label +> Switched Paths (LSPs); +> +> RFC7471: OSPF Traffic Engineering (TE) Metric Extensions; +> +> RFC8570: IS-IS Traffic Engineering (TE) Metric Extensions."; +> } +> > /* -180a246,249 +180a307,310 > /* > * Groupings > */ > -472a542,611 +472a603,672 > } > } > @@ -7865,772 +8064,822 @@ about the process to follow to provide tiny updates to a YANG module already pub diff --git a/ietf-te-packet-types.yang b/ietf-te-packet-types.yang index 6e3abef..e1d1f59 100644 --- a/ietf-te-packet-types.yang +++ b/ietf-te-packet-types.yang @@ -36,12 +36,19 @@ module ietf-te-packet-types { "; description "This YANG module contains a collection of generally useful YANG - data type definitions specific to Packet Traffic Enginnering (TE). + data type definitions specific to Packet Traffic Enginnering + (TE). The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2023 IETF Trust and the persons identified as + 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. + + 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 @@ -54,7 +61,7 @@ module ietf-te-packet-types { 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."; - revision 2023-11-16 { + revision 2024-01-25 { description "Added common TE packet identities: - bandwidth-profile-type; @@ -129,7 +136,7 @@ module ietf-te-packet-types { // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-loss { - base path-metric-type; + base te-types:path-metric-type; description "The path loss (as a packet percentage) metric type encodes a function of the unidirectional loss metrics of all @@ -155,7 +162,7 @@ module ietf-te-packet-types { // been added in this module revision // RFC Editor: remove the note above and this note identity path-metric-delay-variation { - base path-metric-type; + base te-types:path-metric-type; description "The path delay variation encodes the sum of the unidirectional delay variation metrics of all links traversed by a P2P path. From e547bb368aac83ff60b882f5ddf9ebe878aaf357 Mon Sep 17 00:00:00 2001 From: italobusi Date: Thu, 25 Jan 2024 22:07:02 +0100 Subject: [PATCH 10/10] Added JSON examples for mpls-static configuration --- .../node-a-configuration.json | 196 ++++++++++++++++++ .../node-b-configuration.json | 89 ++++++++ .../node-c-configuration.json | 196 ++++++++++++++++++ .../node-d-configuration.json | 89 ++++++++ .../reference-network.txt | 21 ++ 5 files changed, 591 insertions(+) create mode 100644 mpls-static-json-examples/node-a-configuration.json create mode 100644 mpls-static-json-examples/node-b-configuration.json create mode 100644 mpls-static-json-examples/node-c-configuration.json create mode 100644 mpls-static-json-examples/node-d-configuration.json create mode 100644 mpls-static-json-examples/reference-network.txt diff --git a/mpls-static-json-examples/node-a-configuration.json b/mpls-static-json-examples/node-a-configuration.json new file mode 100644 index 0000000..babc53b --- /dev/null +++ b/mpls-static-json-examples/node-a-configuration.json @@ -0,0 +1,196 @@ +{ + "ietf-routing:routing": { + "ietf-mpls:mpls": { + "interfaces": { + "interface": [ + { + "name": "mpls-if-A-1", + "mpls-enabled": true + }, + { + "name": "mpls-if-A-2", + "mpls-enabled": true + }, + { + "name": "mpls-if-A-3", + "mpls-enabled": true + }, + { + "name": "mpls-if-A-4", + "mpls-enabled": true + } + ] + }, + "ietf-mpls-static:static-lsps": { + "static-lsp": [ + { + "name": "lsp1-forward", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 101, + "incoming-interface": "mpls-if-A-1" + } + }, + "out-segment": { + "nhlfe-multiple": { + "nhlfe": [ + { + "index": "1", + "backup-index": "2", + "role": "primary", + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 202 + }, + { + "id": 2, + "label": 103 + } + ] + }, + "outgoing-interface": "mpls-if-A-3" + }, + { + "index": "2", + "role": "backup", + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 304 + }, + { + "id": 2, + "label": 103 + } + ] + }, + "outgoing-interface": "mpls-if-A-4" + } + ] + } + } + }, + { + "name": "lsp1-reverse", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 111 + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 110 + } + ] + }, + "outgoing-interface": "mpls-if-A-1" + } + } + }, + { + "name": "lsp2-forward", + "operation": "impose-and-forward", + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 202 + } + ] + }, + "outgoing-interface": "mpls-if-A-3" + } + } + }, + { + "name": "lsp2-reverse", + "operation": "pop-and-lookup", + "in-segment": { + "fec": { + "incoming-label": 211, + "incoming-interface": "mpls-if-A-3" + } + } + }, + { + "name": "lsp3-forward", + "operation": "impose-and-forward", + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 304 + } + ] + }, + "outgoing-interface": "mpls-if-A-4" + } + } + }, + { + "name": "lsp3-reverse", + "operation": "pop-and-lookup", + "in-segment": { + "fec": { + "incoming-label": 311, + "incoming-interface": "mpls-if-A-4" + } + } + } + ] + }, + "ietf-mpls-static-extended:bidir-static-lsps": { + "bidir-static-lsp": [ + { + "name": "lsp1", + "forward-lsp": "lsp1-forward", + "reverse-lsp": "lsp1-reverse" + }, + { + "name": "lsp2", + "forward-lsp": "lsp2-forward", + "reverse-lsp": "lsp2-reverse" + }, + { + "name": "lsp3", + "forward-lsp": "lsp3-forward", + "reverse-lsp": "lsp3-reverse" + } + ] + } + } + }, + "ietf-interfaces:interfaces": { + "interface": [ + { + "name": "mpls-if-A-1", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-A-2", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-A-3", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-A-4", + "type": "iana-if-type:ethernetCsmacd" + } + ] + } +} \ No newline at end of file diff --git a/mpls-static-json-examples/node-b-configuration.json b/mpls-static-json-examples/node-b-configuration.json new file mode 100644 index 0000000..99c149b --- /dev/null +++ b/mpls-static-json-examples/node-b-configuration.json @@ -0,0 +1,89 @@ +{ + "ietf-routing:routing": { + "ietf-mpls:mpls": { + "interfaces": { + "interface": [ + { + "name": "mpls-if-B-1", + "mpls-enabled": true + }, + { + "name": "mpls-if-B-2", + "mpls-enabled": true + } + ] + }, + "ietf-mpls-static:static-lsps": { + "static-lsp": [ + { + "name": "lsp2-forward", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 202, + "incoming-interface": "mpls-if-B-1" + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 203 + } + ] + }, + "outgoing-interface": "mpls-if-B-2" + } + } + }, + { + "name": "lsp2-reverse", + "operation": "pop-and-lookup", + "in-segment": { + "fec": { + "incoming-label": 212, + "incoming-interface": "mpls-if-B-2" + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 211 + } + ] + }, + "outgoing-interface": "mpls-if-B-1" + } + } + } + ] + }, + "ietf-mpls-static-extended:bidir-static-lsps": { + "bidir-static-lsp": [ + { + "name": "lsp2", + "forward-lsp": "lsp2-forward", + "reverse-lsp": "lsp2-reverse" + } + ] + } + } + }, + "ietf-interfaces:interfaces": { + "interface": [ + { + "name": "mpls-if-B-1", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-B-2", + "type": "iana-if-type:ethernetCsmacd" + } + ] + } +} \ No newline at end of file diff --git a/mpls-static-json-examples/node-c-configuration.json b/mpls-static-json-examples/node-c-configuration.json new file mode 100644 index 0000000..6dce6dc --- /dev/null +++ b/mpls-static-json-examples/node-c-configuration.json @@ -0,0 +1,196 @@ +{ + "ietf-routing:routing": { + "ietf-mpls:mpls": { + "interfaces": { + "interface": [ + { + "name": "mpls-if-C-1", + "mpls-enabled": true + }, + { + "name": "mpls-if-C-2", + "mpls-enabled": true + }, + { + "name": "mpls-if-C-3", + "mpls-enabled": true + }, + { + "name": "mpls-if-C-4", + "mpls-enabled": true + } + ] + }, + "ietf-mpls-static:static-lsps": { + "static-lsp": [ + { + "name": "lsp1-forward", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 103 + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 100 + } + ] + }, + "outgoing-interface": "mpls-if-C-3" + } + } + }, + { + "name": "lsp1-reverse", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 113, + "incoming-interface": "mpls-if-C-3" + } + }, + "out-segment": { + "nhlfe-multiple": { + "nhlfe": [ + { + "index": "1", + "backup-index": "2", + "role": "primary", + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 212 + }, + { + "id": 2, + "label": 111 + } + ] + }, + "outgoing-interface": "mpls-if-C-1" + }, + { + "index": "2", + "role": "backup", + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 314 + }, + { + "id": 2, + "label": 111 + } + ] + }, + "outgoing-interface": "mpls-if-C-2" + } + ] + } + } + }, + { + "name": "lsp2-forward", + "operation": "pop-and-lookup", + "in-segment": { + "fec": { + "incoming-label": 203, + "incoming-interface": "mpls-if-C-1" + } + } + }, + { + "name": "lsp2-reverse", + "operation": "impose-and-forward", + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 212 + } + ] + }, + "outgoing-interface": "mpls-if-C-1" + } + } + }, + { + "name": "lsp3-forward", + "operation": "pop-and-lookup", + "in-segment": { + "fec": { + "incoming-label": 303, + "incoming-interface": "mpls-if-C-2" + } + } + }, + { + "name": "lsp3-reverse", + "operation": "impose-and-forward", + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 314 + } + ] + }, + "outgoing-interface": "mpls-if-C-2" + } + } + } + ] + }, + "ietf-mpls-static-extended:bidir-static-lsps": { + "bidir-static-lsp": [ + { + "name": "lsp1", + "forward-lsp": "lsp1-forward", + "reverse-lsp": "lsp1-reverse" + }, + { + "name": "lsp2", + "forward-lsp": "lsp2-forward", + "reverse-lsp": "lsp2-reverse" + }, + { + "name": "lsp3", + "forward-lsp": "lsp3-forward", + "reverse-lsp": "lsp3-reverse" + } + ] + } + } + }, + "ietf-interfaces:interfaces": { + "interface": [ + { + "name": "mpls-if-C-1", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-C-2", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-C-3", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-C-4", + "type": "iana-if-type:ethernetCsmacd" + } + ] + } +} \ No newline at end of file diff --git a/mpls-static-json-examples/node-d-configuration.json b/mpls-static-json-examples/node-d-configuration.json new file mode 100644 index 0000000..96eaaae --- /dev/null +++ b/mpls-static-json-examples/node-d-configuration.json @@ -0,0 +1,89 @@ +{ + "ietf-routing:routing": { + "ietf-mpls:mpls": { + "interfaces": { + "interface": [ + { + "name": "mpls-if-D-1", + "mpls-enabled": true + }, + { + "name": "mpls-if-D-2", + "mpls-enabled": true + } + ] + }, + "ietf-mpls-static:static-lsps": { + "static-lsp": [ + { + "name": "lsp3-forward", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 304, + "incoming-interface": "mpls-if-D-1" + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 303 + } + ] + }, + "outgoing-interface": "mpls-if-D-2" + } + } + }, + { + "name": "lsp3-reverse", + "operation": "swap-and-forward", + "in-segment": { + "fec": { + "incoming-label": 314, + "incoming-interface": "mpls-if-D-2" + } + }, + "out-segment": { + "nhlfe-single": { + "mpls-label-stack": { + "entry": [ + { + "id": 1, + "label": 311 + } + ] + }, + "outgoing-interface": "mpls-if-D-1" + } + } + } + ] + }, + "ietf-mpls-static-extended:bidir-static-lsps": { + "bidir-static-lsp": [ + { + "name": "lsp3", + "forward-lsp": "lsp3-forward", + "reverse-lsp": "lsp3-reverse" + } + ] + } + } + }, + "ietf-interfaces:interfaces": { + "interface": [ + { + "name": "mpls-if-D-1", + "type": "iana-if-type:ethernetCsmacd" + }, + { + "name": "mpls-if-D-2", + "type": "iana-if-type:ethernetCsmacd" + } + ] + } +} \ No newline at end of file diff --git a/mpls-static-json-examples/reference-network.txt b/mpls-static-json-examples/reference-network.txt new file mode 100644 index 0000000..34d7804 --- /dev/null +++ b/mpls-static-json-examples/reference-network.txt @@ -0,0 +1,21 @@ + + LSP1 +<==============================================================> + + LSP2 (Working) + <==============================> + + +--------+ +--------------+ +--------+ + | | | | | | +<----->O(1) (2)O<----->O(1) Node B (2)O<----->O(1) (3)O<-----> + | | | | | | + | | +--------------+ | | + | Node A | | Node C | + | | +--------------+ | | + | | | | | | + O(3) (4)O<----->O(1) Node D (2)O<----->O(2) (4)O + | | | | | | + +--------+ +--------------+ +--------+ + + <==============================> + LSP3 (Protection)