From e002074136138b76daa11ead9b3e6fd5fad2c961 Mon Sep 17 00:00:00 2001 From: Joe Clarke Date: Wed, 25 Dec 2024 17:40:54 -0500 Subject: [PATCH] yc.o sync (#1609) * Cronjob - daily check of IETF modules. * Cronjob - daily check of IANA modules. --------- Co-authored-by: Miroslav Kovac --- ...23.yang => ietf-bfd-large@2024-12-09.yang} | 2 +- ...yang => ietf-layer0-types@2024-11-27.yang} | 108 +- ...> ietf-mpls-mldp-extended@2024-12-01.yang} | 374 +++--- ...11.yang => ietf-mpls-mldp@2024-12-01.yang} | 180 +-- ...etf-network-slice-service@2024-12-20.yang} | 6 +- ...=> ietf-on-path-telemetry@2024-12-20.yang} | 68 +- ...2.yang => ietf-otn-tunnel@2024-03-21.yang} | 47 +- .../ietf-pcep-stats@2024-10-19.yang | 872 ------------ .../ietf-pcep-stats@2024-12-18.yang | 679 ++++++++++ ...4-10-19.yang => ietf-pcep@2024-12-18.yang} | 290 ++-- .../ietf-udp-notif-transport@2024-10-17.yang | 1 + ...=> iana-dns-class-rr-type@2024-12-10.yang} | 68 +- standard/iana/yang-parameters.xml | 22 +- standard/ietf/RFC/ietf-tcg-algs.yang | 1 + .../ietf/RFC/ietf-tcg-algs@2024-12-05.yang | 715 ++++++++++ .../ietf/RFC/ietf-tpm-remote-attestation.yang | 1 + ...etf-tpm-remote-attestation@2024-12-05.yang | 1183 +++++++++++++++++ 17 files changed, 3176 insertions(+), 1441 deletions(-) rename experimental/ietf-extracted-YANG-modules/{ietf-bfd-large@2024-11-23.yang => ietf-bfd-large@2024-12-09.yang} (99%) rename experimental/ietf-extracted-YANG-modules/{ietf-layer0-types@2024-07-23.yang => ietf-layer0-types@2024-11-27.yang} (97%) rename experimental/ietf-extracted-YANG-modules/{ietf-mpls-mldp-extended@2021-11-11.yang => ietf-mpls-mldp-extended@2024-12-01.yang} (75%) rename experimental/ietf-extracted-YANG-modules/{ietf-mpls-mldp@2021-11-11.yang => ietf-mpls-mldp@2024-12-01.yang} (70%) rename experimental/ietf-extracted-YANG-modules/{ietf-network-slice-service@2024-08-28.yang => ietf-network-slice-service@2024-12-20.yang} (99%) rename experimental/ietf-extracted-YANG-modules/{ietf-on-path-telemetry@2024-06-19.yang => ietf-on-path-telemetry@2024-12-20.yang} (91%) rename experimental/ietf-extracted-YANG-modules/{ietf-otn-tunnel@2023-10-12.yang => ietf-otn-tunnel@2024-03-21.yang} (96%) delete mode 100644 experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-10-19.yang create mode 100644 experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-12-18.yang rename experimental/ietf-extracted-YANG-modules/{ietf-pcep@2024-10-19.yang => ietf-pcep@2024-12-18.yang} (93%) rename standard/iana/{iana-dns-class-rr-type@2023-11-27.yang => iana-dns-class-rr-type@2024-12-10.yang} (91%) create mode 120000 standard/ietf/RFC/ietf-tcg-algs.yang create mode 100644 standard/ietf/RFC/ietf-tcg-algs@2024-12-05.yang create mode 120000 standard/ietf/RFC/ietf-tpm-remote-attestation.yang create mode 100644 standard/ietf/RFC/ietf-tpm-remote-attestation@2024-12-05.yang diff --git a/experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-11-23.yang b/experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-12-09.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-11-23.yang rename to experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-12-09.yang index 75e6ca9e1..9a8d4c4ff 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-11-23.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-bfd-large@2024-12-09.yang @@ -81,7 +81,7 @@ module ietf-bfd-large { described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision "2024-11-23" { + revision "2024-12-09" { description "Initial Version."; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-07-23.yang b/experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-11-27.yang similarity index 97% rename from experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-07-23.yang rename to experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-11-27.yang index 972983102..7583ab02f 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-07-23.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-layer0-types@2024-11-27.yang @@ -3,6 +3,14 @@ module ietf-layer0-types { namespace "urn:ietf:params:xml:ns:yang:ietf-layer0-types"; prefix l0-types; + import ietf-te-types { + prefix te-types; + reference + "RFC YYYY: Common YANG Data Types for Traffic Engineering"; + } + // RFC Editor: replace YYYY with actual RFC number assigned to + // [I-D.ietf-teas-rfc8776-update] and remove this note + organization "IETF CCAMP Working Group"; contact @@ -51,7 +59,7 @@ module ietf-layer0-types { // replace the revision date with the module publication date // the format is (year-month-day) - revision 2024-07-23 { + revision 2024-11-27 { description "To be updated"; reference @@ -528,58 +536,6 @@ module ietf-layer0-types { within the permissible frequency range."; } - identity otu-type { - description - "Base identity from which specific OTU identities are derived"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity OTU1 { - base otu-type; - description - "OTU1 (2.66 Gb/s)"; - reference - "ITU-T G.709 v6.0 (06/2020): Interfaces for the Optical - Transport Network (OTN)"; - } - - identity OTU2 { - base otu-type; - description - "OTU2 (10.70 Gb/s)"; - reference - "ITU-T G.709 v6.0 (06/2020): Interfaces for the Optical - Transport Network (OTN)"; - } - - identity OTU3 { - base otu-type; - description - "OTU3 (43.01 Gb/s)"; - reference - "ITU-T G.709 v6.0 (06/2020): Interfaces for the Optical - Transport Network (OTN)"; - } - - identity OTU4 { - base otu-type; - description - "OTU4 (111.80 Gb/s)"; - reference - "ITU-T G.709 v6.0 (06/2020): Interfaces for the Optical - Transport Network (OTN)"; - } - - identity OTUCn { - base otu-type; - description - "OTUCn (n x 105.25 Gb/s)"; - reference - "ITU-T G.709 v6.0 (06/2020): Interfaces for the Optical - Transport Network (OTN)"; - } - identity type-power-mode { description "power equalization mode used within the @@ -598,6 +554,27 @@ module ietf-layer0-types { "all elements must use power (dBm)"; } + identity switching-wson-lsc { + base te-types:switching-lsc; + description + "Wavelength Switched Optical Network Lambda-Switch Capable + (WSON-LSC)."; + reference + "Section 3 of RFC 7688: GMPLS OSPF Enhancement for Signal and + Network Element Compatibility for Wavelength Switched Optical + Networks"; + } + + identity switching-flexi-grid-lsc { + base te-types:switching-lsc; + description + "Flexi-grid Lambda-Switch Capable (Flexi-Grid-LSC)."; + reference + "Section 4.1 of RFC 8363: GMPLS OSPF-TE Extensions in Support + of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) + Networks"; + } + /* * Typedefs */ @@ -1549,6 +1526,7 @@ module ietf-layer0-types { proper leafrefs when used: see for example the transceiver-capabilities grouping below."; choice mode { + config false; mandatory true; description "Indicates whether the transceiver's mode is a standard @@ -1602,6 +1580,7 @@ module ietf-layer0-types { presence "When present, it indicates that the modes supported by a transceiver are reported."; + config false; description "The top level container for the list supported transceiver's modes."; @@ -2062,14 +2041,33 @@ module ietf-layer0-types { description "This parameter indicates the transmitter frequency fine tuning steps e.g 3.125GHz or 0.001GHz."; - } + } } // grouping transmitter-tuning-range grouping common-all-modes { description "Common attributes used by all transceiver's modes."; - uses transmitter-tuning-range; + container transmitter-tuning-range { + config false; + description + "Transmitter tuning range (f_tx-min, f_tx-max)"; + uses transmitter-tuning-range; + } +/* Alternative solution (not future safe): + + uses transmitter-tuning-range { + refine min-central-frequency { + config false; + } + refine max-central-frequency { + config false; + } + refine transceiver-tunability { + config false; + } + } +*/ leaf tx-channel-power-min { type power-dbm; config false; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2021-11-11.yang b/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2024-12-01.yang similarity index 75% rename from experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2021-11-11.yang rename to experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2024-12-01.yang index 35b012278..29bc48807 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2021-11-11.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp-extended@2024-12-01.yang @@ -29,16 +29,12 @@ module ietf-mpls-mldp-extended { import ietf-mpls-ldp { prefix "ldp"; - reference "RFC XXXX: A YANG Data Model for MPLS LDP"; -// RFC Editor: replace the XXXX with actual LDP YANG RFC number at -// time of publication and remove this note. + reference "RFC 9070: YANG Data Model for MPLS LDP"; } import ietf-mpls-ldp-extended { prefix "ldp-ext"; - reference "RFC XXXX: A YANG Data Model for MPLS LDP"; -// RFC Editor: replace the XXXX with actual LDP YANG RFC number at -// time of publication and remove this note. + reference "RFC 9070: YANG Data Model for MPLS LDP"; } import ietf-mpls-mldp { prefix "mldp"; @@ -73,26 +69,39 @@ module ietf-mpls-mldp-extended { management of Multiprotocol Label Switching (MPLS) Multipoint LDP (mLDP). - Copyright (c) 2021 IETF Trust and the persons identified as + The types and groupings defined in this module are intended exclusively + for use within this module itself or any other module that augments this + module. + + 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 Simplified BSD License set + 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 - (http://trustee.ietf.org/license-info). + (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX; see the - RFC itself for full legal notices."; + This version of this YANG module is part of RFC XXXX + (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself + for full legal notices."; // RFC Editor: replace XXXX with actual RFC number and remove // this note - revision 2021-11-11 { - // RFC Editor: replace the above date 2021-11-11 with the date of + revision 2024-12-01 { + // RFC Editor: replace the above date 2024-12-01 with the date of // publication and remove this note. + description + "Addressing YANG doctors review comments"; + reference + "RFC XXXX: Base YANG Data Model for MPLS mLDP"; + // RFC Editor: replace XXXX with actual RFC number and remove + // this note + } + revision 2021-11-11 { description "Initial revision."; reference @@ -108,18 +117,25 @@ module ietf-mpls-mldp-extended { description "This feature indicates that the system allows to configure mLDP hub-and-spoke-multipoint capability."; + reference + "RFC7140: LDP Extensions for Hub and Spoke Multipoint + Label Switched Path"; } feature capability-mldp-node-protection { description "This feature indicates that the system allows to configure mLDP node-protection capability."; + reference + "RFC7715: Multipoint LDP (mLDP) Node Protection"; } feature mldp-mofrr { description "This feature indicates that the system supports mLDP Multicast only FRR (MoFRR)."; + reference + "RFC7431: Multicast-Only Fast Reroute"; } feature per-peer-capability { @@ -131,10 +147,10 @@ module ietf-mpls-mldp-extended { /* * Typedefs */ - typedef mofrr-role { + typedef lsp-mofrr-role { type enumeration { enum none { - description "MOFRR is not enabled."; + description "MoFRR is not enabled."; } enum primary { description "This LSP is primary."; @@ -144,8 +160,8 @@ module ietf-mpls-mldp-extended { } } description - "This type represents the MOFRR (Multicast only FRR) role - status of a LSP."; + "This type represents the MoFRR (Multicast-only FRR) + role of an LSP."; } /* @@ -158,7 +174,7 @@ module ietf-mpls-mldp-extended { list peer { key "direction peer advertisement-type"; description - "List of advertised and received peers"; + "List of peers with bindings exchnaged (sent and/or received)"; leaf peer { type leafref { path @@ -166,31 +182,31 @@ module ietf-mpls-mldp-extended { + "ldp:lsr-id"; } description - "LDP peer from which this binding is received, - or to which this binding is advertised."; + "[m]LDP peer from which this binding is received, or + to which this binding is advertised."; } uses mldp:mldp-binding-label-peer-state-attributes; - leaf mofrr-role { + leaf mofrr-status { when "../direction = 'upstream'" { description - "For upstream."; + "This leaf is used for MoFRR upstream direction only."; } - type mofrr-role; + type lsp-mofrr-role; description - "The MOFRR status of this LSP"; + "The MoFRR status of this LSP"; } } // peer } // mldp-ext-binding-label-peer-state - grouping mldp-ext-binding-label-recursive-fec-peer-state { + grouping mldp-ext-binding-label-recur-fec-peer-state { description - "mLDP label binding peer state for recursive FECs."; + "mLDP label binding peer state."; list peer { key "direction peer advertisement-type"; description - "List of advertised and received peers"; + "List of peers with bindings exchnaged (sent and/or received)"; leaf peer { type leafref { path @@ -198,22 +214,22 @@ module ietf-mpls-mldp-extended { + "ldp:lsr-id"; } description - "LDP peer from which this binding is received, - or to which this binding is advertised."; + "[m]LDP peer from which this binding is received, or + to which this binding is advertised."; } uses mldp:mldp-binding-label-peer-state-attributes; - leaf mofrr-role { + leaf mofrr-status { when "../direction = 'upstream'" { description - "For upstream."; + "This leaf is used for MoFRR upstream direction only."; } - type mofrr-role; + type lsp-mofrr-role; description - "The MOFRR status of this LSP"; + "The MoFRR status of this LSP"; } } // peer - } // mldp-ext-binding-label-recursive-fec-peer-state + } // mldp-ext-binding-label-recur-fec-peer-state grouping mldp-ext-capabilities { description @@ -240,7 +256,7 @@ module ietf-mpls-mldp-extended { leaf plr { type boolean; description - "Point of Local Repair (PLR) capable for Multipoimt LSP + "Point of Local Repair (PLR) capable for Multipoint LSP node protection"; } container merge-point { @@ -258,23 +274,25 @@ module ietf-mpls-mldp-extended { "Targeted session teardown delay"; } } // merge-point - } + } // node-protection } // mldp-ext-capabilities - grouping mldp-ext-per-af-config-attibutes { + grouping mldp-ext-per-af-config-attributes { description - "mLDP per address family configuration attibutes"; + "mLDP per address family configuration attributes"; container multicast-only-frr { if-feature mldp-mofrr; description "Multicast-only FRR (MoFRR) policy"; + reference + "RFC7431: Multicast-Only Fast Reroute"; leaf prefix-list { type ldp-ext:prefix-list-ref; description - "Enables Multicast-only FRR (MoFRR) for the specified - access list"; + "Enables Multicast-only FRR (MoFRR) for the specified prefix-list"; } } // multicast-only-frr + container recursive-fec { description "Recursive FEC policy"; @@ -284,34 +302,31 @@ module ietf-mpls-mldp-extended { "Enables recursive FEC for the specified prefix-list"; } } // recursive-fec - } // mldp-ext-per-af-config-attibutes + } // mldp-ext-per-af-config-attributes - grouping recursive-fec-attibutes { + grouping recursive-fec-attributes { description - "mLDP recursive FEC attibutes."; + "mLDP recursive FEC attributes."; + reference + "RFC6512: Using Multipoint LDP When the + Backbone Has No Route to the Root"; leaf recur-root-address { type inet:ip-address; description "Recursive root address"; - reference - "RFC6512: Using Multipoint LDP When the - Backbone Has No Route to the Root"; } leaf recur-rd { type rt-types:route-distinguisher; description "Route Distinguisher in the VPN-Recursive Opaque Value"; - reference - "RFC6512: Using Multipoint LDP When the - Backbone Has No Route to the Root"; } leaf multipoint-type { type mldp:multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } - } // recursive-fec-attibutes + } // recursive-fec-attributes /* * Configuration data and operational state data nodes @@ -320,7 +335,7 @@ module ietf-mpls-mldp-extended { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/" + "ldp:capability/mldp:mldp" { - description "Augmentation for MLDP global capability."; + description "Augmentation for mLDP global capabilities."; uses mldp-ext-capabilities; } @@ -330,7 +345,7 @@ module ietf-mpls-mldp-extended { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:peers/ldp:peer/" + "ldp:capability" { - description "Augmentation for MLDP peer capability."; + description "Augmentation for mLDP peer capability."; container mldp { if-feature per-peer-capability; description @@ -338,12 +353,13 @@ module ietf-mpls-mldp-extended { uses mldp:mldp-capabilities; } } */ + // IPv4 config augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families/mldp:ipv4" { - description "Augmentation for MLDP IPv4 configuration"; - uses mldp-ext-per-af-config-attibutes; + description "Augmentation for mLDP IPv4 configuration"; + uses mldp-ext-per-af-config-attributes; } // IPv4 configured-leaf-lsps config @@ -352,28 +368,27 @@ module ietf-mpls-mldp-extended { + "mldp:address-families/mldp:ipv4/mldp:configured-leaf-lsps/" + "mldp:opaque-element-lspid/mldp:fec-label" { description - "Augmentation for MLDP IPv4 configured-leaf-lsps - configuration for opaque-element-lspid"; + "Augmentation for mLDP IPv4 configured-leaf-lsps + configuration for opaque-element-lspid with recursive-fec"; list recursive-fec { key "recur-root-address recur-rd"; description - "List of recursive opaque values"; - uses recursive-fec-attibutes; - } // fec-label + "List of recursive-fec opaque values"; + uses recursive-fec-attributes; + } // recursive-fec } augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families/mldp:ipv4/mldp:configured-leaf-lsps" { description - "Augmentation for MLDP IPv4 configured-leaf-lsps - configuration"; + "Augmentation for mLDP IPv4 configured-leaf-lsps + configuration for other opaque types"; container opaque-element-transit { description - "The type of opaque value element is the transit IPv4 - source."; + "Transit IPv4/VPNv4 Source opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -383,19 +398,19 @@ module ietf-mpls-mldp-extended { "root-address source-address group-address " + "rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf root-address { type inet:ipv4-address; description "Root address"; } leaf source-address { - type inet:ip-address; + type inet:ipv4-address; description "Source address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv4-address; description "Group address"; } @@ -409,14 +424,13 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; } // fec-label } // opaque-element-transit container opaque-element-bidir { description - "The type of opaque value element is - the generic LSP identifier"; + "Transit IPv4/VPNv4 Bidir opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -427,19 +441,19 @@ module ietf-mpls-mldp-extended { "root-address rp group-address rd recur-root-address " + "recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf root-address { type inet:ipv4-address; description "Root address"; } leaf rp { - type inet:ip-address; + type inet:ipv4-address; description "Rendezvous-Point (RP) address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv4-address; description "Group address"; } @@ -453,7 +467,7 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; } // fec-label } // opaque-element-bidir } @@ -462,8 +476,8 @@ module ietf-mpls-mldp-extended { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families/ipv6" { - description "Augmentation for MLDP IPv4 configuration"; - uses mldp-ext-per-af-config-attibutes; + description "Augmentation for mLDP IPv6 configuration"; + uses mldp-ext-per-af-config-attributes; } // Global forwarding-nexthop @@ -472,7 +486,7 @@ module ietf-mpls-mldp-extended { + "ldp-ext:forwarding-nexthop/ldp-ext:interfaces/" + "ldp-ext:interface/ldp-ext:address-family" { description - "Augmentation for MLDP nexthop forwarding interface"; + "Augmentation for mLDP nexthop forwarding interface"; leaf mldp-disable { type boolean; description @@ -489,16 +503,16 @@ module ietf-mpls-mldp-extended { + "mldp:address-families/mldp:ipv4/mldp:roots/mldp:root/" + "mldp:bindings/mldp:opaque-element-lspid/mldp:fec-label/" + "mldp:peer" { - description "Augmentation for MLDP IPv4 state"; + description "Augmentation for mLDP IPv4 state"; - leaf mofrr-role { + leaf mofrr-status { when "../mldp:direction = 'upstream'" { description - "For upstream"; + "This leaf is used for upstream direction only."; } - type mofrr-role; + type lsp-mofrr-role; description - "The MOFRR status of this LSP"; + "The MoFRR status of this LSP"; } } @@ -507,34 +521,38 @@ module ietf-mpls-mldp-extended { + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:peers/ldp:peer/" + "ldp:received-peer-state/ldp:capability/mldp:mldp" { description - "Augmentation for MLDP received peer state capability."; + "Augmentation for mLDP received peer state capability."; container hub-and-spoke { description - "Configure hub-and-spoke-multipoint capability."; + "Operatiobal state information for the peer's hub-and-spoke-multipoint + capability."; reference "RFC7140: LDP Extensions for Hub and Spoke Multipoint Label Switched Path"; - leaf enabled { + leaf is-capable { type boolean; description - "Enable hub-and-spoke-multipoint"; + "'true' when hub-and-spoke-multipoint capability is received from + peer"; } } container node-protection { description - "Configure node-protection capability"; + "Operatiobal state information for the peer's node-protection + capability"; reference "RFC7715: mLDP Node Protection."; - leaf plr { + leaf is-plr-capable { type boolean; description - "Point of Local Repair (PLR) capable for Multipoint LSP - node protection"; + "'true' when Point of Local Repair (PLR) node-protection capability + is received from peer"; } - leaf merge-point { + leaf is-merge-point-capable { type boolean; description - "Merge Point capable for Multipoint LSP node protection"; + "'true' when Merge-point node-protection capability is received from + peer"; } // merge-point } // node-protection } @@ -544,11 +562,11 @@ module ietf-mpls-mldp-extended { + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families/mldp:ipv4/mldp:roots/mldp:root/" + "mldp:bindings" { - description "Augmentation for MLDP IPv4 bindings."; + description "Augmentation for mLDP IPv4 bindings extended type."; + container opaque-element-transit { description - "The type of opaque value element is the transit IPv4 - source."; + "Transit IPv4/VPNv4 Source opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -558,14 +576,14 @@ module ietf-mpls-mldp-extended { "source-address group-address " + "rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf source-address { - type inet:ip-address; + type inet:ipv4-address; description "Source address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv4-address; description "Group address"; } @@ -579,15 +597,14 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; uses mldp-ext-binding-label-peer-state; } // fec-label } // opaque-element-transit container opaque-element-bidir { description - "The type of opaque value element is - the generic LSP identifier."; + "Transit IPv4/VPNv4 Bidir opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -597,14 +614,14 @@ module ietf-mpls-mldp-extended { key "rp group-address rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf rp { - type inet:ip-address; + type inet:ipv4-address; description "Rendezvous Point (RP) address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv4-address; description "Group address"; } @@ -618,7 +635,7 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; uses mldp-ext-binding-label-peer-state; } // fec-label } // opaque-element-bidir @@ -628,12 +645,11 @@ module ietf-mpls-mldp-extended { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families/ipv6/roots/root/bindings" { - description "Augmentation for MLDP IPv6 bindings."; + description "Augmentation for mLDP IPv6 bindings."; container opaque-element-transit { config false; description - "The type of opaque value element is the transit IPv6 - source."; + "Transit IPv6/VPNv6 Source opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -644,14 +660,14 @@ module ietf-mpls-mldp-extended { "source-address group-address " + "rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf source-address { - type inet:ip-address; + type inet:ipv6-address; description "Source address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv6-address; description "Group address"; } @@ -665,7 +681,7 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; uses mldp-ext-binding-label-peer-state; } // fec-label } // opaque-element-transit @@ -673,8 +689,7 @@ module ietf-mpls-mldp-extended { container opaque-element-bidir { config false; description - "The type of opaque value element is - the generic LSP identifier"; + "Transit IPv6/VPNv6 Bidir opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -684,14 +699,14 @@ module ietf-mpls-mldp-extended { key "rp group-address rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf rp { - type inet:ip-address; + type inet:ipv6-address; description "Rendezvous Point (RP) address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv6-address; description "Group address"; } @@ -705,7 +720,7 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; uses mldp-ext-binding-label-peer-state; } // fec-label } // opaque-element-bidir @@ -717,15 +732,15 @@ module ietf-mpls-mldp-extended { + "mldp:address-families/mldp:ipv4/mldp:roots/mldp:root/" + "mldp:bindings/mldp:opaque-element-lspid/mldp:fec-label" { description - "Augmentation for MLDP IPv4 bindings with opaque type LSP ID."; + "Augmentation for mLDP IPv4 bindings opaque type LSP ID."; list recursive-fec { key "recur-root-address recur-rd"; description "List of recursive opaque values"; - uses recursive-fec-attibutes; - uses mldp-ext-binding-label-recursive-fec-peer-state; - } // fec-label + uses recursive-fec-attributes; + uses mldp-ext-binding-label-recur-fec-peer-state; + } // recursive-fec } // IPv6 bindings opaque-element-lspid state @@ -734,15 +749,15 @@ module ietf-mpls-mldp-extended { + "mldp:address-families/ipv6/roots/root/bindings/" + "opaque-element-lspid/fec-label" { description - "Augmentation for MLDP IPv6 bindings with opaque type LSP ID."; + "Augmentation for mLDP IPv6 bindings with opaque type LSP ID."; list recursive-fec { key "recur-root-address recur-rd"; config false; description "List of recursive opaque values"; - uses recursive-fec-attibutes; - uses mldp-ext-binding-label-recursive-fec-peer-state; - } // fec-label + uses recursive-fec-attributes; + uses mldp-ext-binding-label-recur-fec-peer-state; + } // recursive-fec } /* @@ -752,12 +767,18 @@ module ietf-mpls-mldp-extended { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/mldp:mldp/" + "mldp:address-families" { - description "Augmentation for MLDP IPv6 address family."; + description "Augmentation for mLDP IPv6 address family."; container ipv6 { - presence - "Present if IPv6 is enabled."; + presence "Enables IPv6 mLDP support unless the + 'enabled' leaf is set to 'false'."; description - "IPv6 information"; + "Containing data related to the IPv6 address family."; + leaf enabled { + type boolean; + default "true"; // TBD + description + "'false' to disable the IPv6 address family."; + } container roots { config false; @@ -777,14 +798,13 @@ module ietf-mpls-mldp-extended { leaf is-self { type boolean; description - "This is the root"; + "The node itself is the root node."; } list reachability { key "address interface"; description - "A next-hop for reachability to root, - as a RIB view"; + "Root reachability information in form of a next-hop"; leaf address { type inet:ipv6-address; description @@ -793,7 +813,7 @@ module ietf-mpls-mldp-extended { leaf interface { type if:interface-ref; description - "Interface connecting to next-hop"; + "The next-hop interface to reach root"; } leaf peer { type leafref { @@ -802,18 +822,16 @@ module ietf-mpls-mldp-extended { + "ldp:peer/ldp:lsr-id"; } description - "LDP peer from which this next-hop can be - reached"; + "LDP peer associated with the nexthop (address, interface)"; } } container bindings { description - "mLDP FEC to label bindings"; + "mLDP FEC-label bindings"; container opaque-element-lspid { description - "The type of opaque value element is - the generic LSP identifier"; + "Generic LSP identifier opaque element FEC-label bindings container"; reference "RFC6388: Label Distribution Protocol Extensions for Point-to-Multipoint and @@ -823,15 +841,15 @@ module ietf-mpls-mldp-extended { key "lsp-id"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf lsp-id { type uint32; - description "ID to identify the LSP"; + description "LSP identifier"; } leaf multipoint-type { type mldp:multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } uses mldp-ext-binding-label-peer-state; @@ -843,12 +861,11 @@ module ietf-mpls-mldp-extended { container configured-leaf-lsps { description - "Configured multicast LSPs"; + "Configured multicast LSPs."; container opaque-element-lspid { description - "The type of opaque value element is - the generic LSP identifier"; + "Generic LSP identifier opaque element FEC-label bindings container"; reference "RFC6388: Label Distribution Protocol Extensions for Point-to-Multipoint and @@ -858,7 +875,7 @@ module ietf-mpls-mldp-extended { key "root-address lsp-id"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf root-address { type inet:ipv6-address; description @@ -866,27 +883,26 @@ module ietf-mpls-mldp-extended { } leaf lsp-id { type uint32; - description "ID to identify the LSP"; + description "LSP identifier"; } leaf multipoint-type { type mldp:multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } list recursive-fec { key "recur-root-address recur-rd"; description "List of recursive opaque values"; - uses recursive-fec-attibutes; - } // fec-label + uses recursive-fec-attributes; + } // recursive-fec } // fec-label } // opaque-element-lspid container opaque-element-transit { description - "The type of opaque value element is the transit IPv4 - source."; + "Transit IPv6/VPNv6 Source opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -896,19 +912,19 @@ module ietf-mpls-mldp-extended { "root-address source-address group-address " + "rd recur-root-address recur-rd"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf root-address { type inet:ipv6-address; description "Root address"; } leaf source-address { - type inet:ip-address; + type inet:ipv6-address; description "Source address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv6-address; description "Group address"; } @@ -922,14 +938,12 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; } // fec-label } // opaque-element-transit - container opaque-element-bidir { description - "The type of opaque value element is - the generic LSP identifier"; + "Transit IPv6/VPNv6 Bidir opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -940,19 +954,19 @@ module ietf-mpls-mldp-extended { "root-address rp group-address rd recur-root-address " + "recur-rd"; description - "List of FEC to label bindings."; + "List of FEC-label bindings."; leaf root-address { type inet:ipv6-address; description "Root address"; } leaf rp { - type inet:ip-address; + type inet:ipv6-address; description "Rendezvous Point (RP) address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ipv6-address; description "Group address"; } @@ -966,7 +980,7 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; + uses recursive-fec-attributes; } // fec-label } // opaque-element-bidir } // configured-leaf-lsps @@ -982,22 +996,21 @@ module ietf-mpls-mldp-extended { augment "/mldp:mpls-mldp-fec-event/mldp:opaque-element/" + "mldp:opaque-element-lspid/mldp:opaque-element-lspid" { description - "Augmentation for MLDP notification for opaque-element-lspid."; + "Augmentation for mLDP notification for opaque-element-lspid."; container recursive-fec { description "Container of recursive opaque values"; - uses recursive-fec-attibutes; - } // fec-label + uses recursive-fec-attributes; + } // recursive-fec } augment "/mldp:mpls-mldp-fec-event/mldp:opaque-element" { description - "Augmentation for MLDP notification."; + "Augmentation for mLDP notification for opaque types other than lspid."; case opaque-element-transit { container opaque-element-transit { description - "The type of opaque value element is the transit IPv4 - source."; + "Transit IP/VPN Source opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -1013,7 +1026,7 @@ module ietf-mpls-mldp-extended { "Source address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ip-address; description "Group address"; } @@ -1027,15 +1040,14 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; - } // opaque-element-transit - } // opaque-element-transit + uses recursive-fec-attributes; + } // opaque-element-transit container + } // opaque-element-transit case case opaque-element-bidir { container opaque-element-bidir { description - "The type of opaque value element is - the generic LSP identifier"; + "Transit IP/VPN Bidir opaque type"; reference "RFC6826: Multipoint LDP In-Band Signaling for Point-to-Multipoint and @@ -1052,7 +1064,7 @@ module ietf-mpls-mldp-extended { "Rendezvous Point (RP) address"; } leaf group-address { - type inet:ip-address-no-zone; + type inet:ip-address; description "Group address"; } @@ -1066,8 +1078,8 @@ module ietf-mpls-mldp-extended { Routing and Forwarding (VRF) Table Context."; } - uses recursive-fec-attibutes; - } // opaque-element-bidir - } // opaque-element-bidir - } -} + uses recursive-fec-attributes; + } // opaque-element-bidir container + } // opaque-element-bidir case + } // augment +} // module diff --git a/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2021-11-11.yang b/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2024-12-01.yang similarity index 70% rename from experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2021-11-11.yang rename to experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2024-12-01.yang index 049437598..349356adb 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2021-11-11.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-mpls-mldp@2024-12-01.yang @@ -16,9 +16,7 @@ module ietf-mpls-mldp { import ietf-mpls-ldp { prefix "ldp"; - reference "RFC XXXX: A YANG Data Model for MPLS LDP"; -// RFC Editor: replace the XXXX with actual LDP YANG RFC number at -// time of publication and remove this note. + reference "RFC 9070: YANG Data Model for MPLS LDP"; } import ietf-routing { @@ -59,26 +57,40 @@ module ietf-mpls-mldp { "This YANG module defines the essential components for the management of Multiprotocol Label Switching (MPLS) Multipoint LDP (mLDP). - Copyright (c) 2021 IETF Trust and the persons identified as + + The types and groupings defined in this module are intended exclusively + for use within this module itself or any other module that augments this + module. + + 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 Simplified BSD License set + 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 - (http://trustee.ietf.org/license-info). + (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX; see the - RFC itself for full legal notices."; + This version of this YANG module is part of RFC XXXX + (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself + for full legal notices."; // RFC Editor: replace XXXX with actual RFC number and remove // this note - revision 2021-11-11 { - // RFC Editor: replace the above date 2021-11-11 with the date of + revision 2024-12-01 { + // RFC Editor: replace the above date 2024-12-01 with the date of // publication and remove this note. + description + "Addressing YANG doctors review comments"; + reference + "RFC XXXX: Base YANG Data Model for MPLS mLDP"; + // RFC Editor: replace XXXX with actual RFC number and remove + // this note + } + revision 2021-11-11 { description "Initial revision."; reference @@ -104,12 +116,31 @@ module ietf-mpls-mldp { (p2mp) or Multipoint to multipoint (mp2mp)"; } + typedef lsp-mbb-role { + type enumeration { + enum none { + description "Make-before-break (MBB) is not enabled."; + } + enum active { + description "This LSP is active."; + } + enum inactive { + description "This LSP is inactive."; + } + } + description + "This type represents the Make-before-break + role of an LSP."; + } + /* * Groupings */ - grouping mldp-capabilities { + grouping mldp-capabilities-base { description - "A grouping describing the protocol capabilities of mLDP"; + "A grouping describing the protocol capabilities of mLDP as specified + in RFC6388"; + container p2mp { description "Configuration and state information for the @@ -143,16 +174,19 @@ module ietf-mpls-mldp { type uint16; units seconds; description - "Switchover delay in seconds"; + "Switchover delay (in seconds) for activating an inactive element"; } leaf timeout { type uint16; units seconds; description - "Timeout in seconds"; + "To prevent waiting indefinitely for the MBB Notification to arrive, + a timeout should be applied. As soon as the timer expires, + the MBB procedures, same as those applied at the receipt of an MBB + notification, are applied on the inactive element."; } } - } // mldp-capabilities + } // mldp-capabilities-base grouping mldp-binding-label-peer-state-attributes { description @@ -160,34 +194,24 @@ module ietf-mpls-mldp { leaf direction { type ldp:downstream-upstream; description - "Downstream or upstream"; + "Downstream or upstream label binding"; } leaf advertisement-type { type ldp:advertised-received; description - "Advertised or received"; + "Advertised (outbound) or received label (inbound) binding"; } leaf label { type rt-types:mpls-label; description "Advertised (outbound) or received (inbound) label"; } - leaf mbb-role { + leaf mbb-status { when "../direction = 'upstream'" { description - "This leaf is used for upstream only."; - } - type enumeration { - enum none { - description "Make-Before-Break (MBB) is not enabled"; - } - enum active { - description "This LSP is active."; - } - enum inactive { - description "This LSP is inactive."; - } + "This leaf is used for MBB upstream direction only."; } + type lsp-mbb-role; description "The MBB status of this LSP"; } @@ -199,7 +223,7 @@ module ietf-mpls-mldp { list peer { key "direction peer advertisement-type"; description - "List of advertised and received peers"; + "List of peers with bindings exchnaged (sent and/or received)"; leaf peer { type leafref { path @@ -207,8 +231,8 @@ module ietf-mpls-mldp { + "ldp:lsr-id"; } description - "LDP peer from which this binding is received, - or to which this binding is advertised."; + "[m]LDP peer from which this binding is received, or + to which this binding is advertised."; } uses mldp-binding-label-peer-state-attributes; } // peer @@ -220,12 +244,12 @@ module ietf-mpls-mldp { augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global/" + "ldp:capability" { - description "Augmentation for MLDP global capability"; + description "Augmentation for mLDP global capability"; container mldp { description - "This container contains the configruation and state + "This container contains the configuration and state information for multipoint LDP capabilities."; - uses mldp-capabilities; + uses mldp-capabilities-base; } } @@ -236,41 +260,40 @@ module ietf-mpls-mldp { + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:peers/ldp:peer/" + "ldp:received-peer-state/ldp:capability" { description - "Augmentation for MLDP received peer state capability"; + "Augmentation for mLDP received peer state capability"; container mldp { description "Operational state information for the protocol capabilities - of mLDP"; + of mLDP peer"; container p2mp { description - "Operational state information for the point-to-multipoint - capability"; - leaf enabled { + "Operatiobal state information for the point-to-multipoint + capability of a peer"; + leaf is-capable { type boolean; description - "'true' to enable the point-to-multipoint capability"; + "'true' when point-to-multipoint capability is received from peer"; } } container mp2mp { description "Operational state information for the - multipoint-to-multipoint capability"; - leaf enabled { + multipoint-to-multipoint capability of a peer"; + leaf is-capable { type boolean; description - "'true' to enable the multipoint-to-multipoint - capability"; + "'true' when multipoint-to-multipoint capability is received from peer"; } } container make-before-break { description "Operational state information for the make-before-break - capability"; - leaf enabled { + capability of a peer"; + leaf is-capable { type boolean; description - "'true' to enable the make-before-break capability"; + "'true' when make-before-break capability is received from peer"; } } } // mldp @@ -281,29 +304,37 @@ module ietf-mpls-mldp { */ augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ldp:mpls-ldp/ldp:global" { - description "MLDP global augmentation."; + description "mLDP global augmentation."; container mldp { description "mLDP attributes at per instance level. Defining attributes here does not enable any MP capabilities. MP capabilities need to be explicitly enabled under - container capability."; + capability container"; leaf enabled { type boolean; description - "'true' to enable mLDP"; + "'true' to enable mLDP protocol"; } container address-families { description - "Per address family parameters"; + "Per-address-family configuration and operational state. + The address family can be either IPv4 or IPv6."; container ipv4 { - presence - "Present if IPv4 is enabled."; + presence "Enables IPv4 mLDP support unless the + 'enabled' leaf is set to 'false'."; description - "IPv4 information"; + "Containing data related to the IPv4 address family."; + leaf enabled { + type boolean; + default "true"; // TBD + description + "'false' to disable the IPv4 address family."; + } + container roots { config false; description @@ -322,14 +353,13 @@ module ietf-mpls-mldp { leaf is-self { type boolean; description - "I am the root node."; + "The node itself is the root node."; } list reachability { key "address interface"; description - "A next-hop for reachability to root, - as a RIB view"; + "Root reachability information in form of a next-hop"; leaf address { type inet:ipv4-address; description @@ -338,7 +368,7 @@ module ietf-mpls-mldp { leaf interface { type if:interface-ref; description - "Interface connecting to next-hop"; + "The next-hop interface to reach root"; } leaf peer { type leafref { @@ -347,18 +377,16 @@ module ietf-mpls-mldp { + "ldp:peer/ldp:lsr-id"; } description - "LDP peer from which this next-hop can be - reached"; + "LDP peer associated with the nexthop (address, interface)"; } } container bindings { description - "mLDP FEC to label bindings"; + "mLDP FEC-label bindings"; container opaque-element-lspid { description - "The type of opaque value element is the generic - LSP identifier"; + "Generic LSP identifier opaque element FEC-label bindings container"; reference "RFC6388: Label Distribution Protocol Extensions for Point-to-Multipoint and @@ -368,15 +396,15 @@ module ietf-mpls-mldp { key "lsp-id"; description - "List of FEC to label bindings"; + "List of FEC-label bindings"; leaf lsp-id { type uint32; - description "ID to identify the LSP"; + description "LSP identifier"; } leaf multipoint-type { type multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } uses mldp-binding-label-state-attributes; } // fec-label @@ -390,8 +418,7 @@ module ietf-mpls-mldp { "Configured multicast LSPs."; container opaque-element-lspid { description - "The type of opaque value element is - the generic LSP identifier"; + "Generic LSP identifier opaque element FEC-label bindings container"; reference "RFC6388: Label Distribution Protocol Extensions for Point-to-Multipoint and @@ -409,12 +436,12 @@ module ietf-mpls-mldp { } leaf lsp-id { type uint32; - description "ID to identify the LSP"; + description "LSP identifier"; } leaf multipoint-type { type multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } } // fec-label } // opaque-element-lspid @@ -424,6 +451,8 @@ module ietf-mpls-mldp { } // mldp } + // KAMI: TODO REVIEW + /* * Notifications */ @@ -440,8 +469,7 @@ module ietf-mpls-mldp { case opaque-element-lspid { container opaque-element-lspid { description - "The type of opaque value element is - the generic LSP identifier"; + "Generic LSP identifier opaque element"; reference "RFC6388: Label Distribution Protocol Extensions for Point-to-Multipoint and @@ -454,12 +482,12 @@ module ietf-mpls-mldp { } leaf lsp-id { type uint32; - description "ID to identify the LSP"; + description "LSP identifier"; } leaf multipoint-type { type multipoint-type; description - "The type of mutipoint: p2mp or mp2mp"; + "The type of multipoint: p2mp or mp2mp"; } } // container opaque-element-lspid } diff --git a/experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-08-28.yang b/experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-12-20.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-08-28.yang rename to experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-12-20.yang index 5499cf3c5..f0ce6643d 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-08-28.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-network-slice-service@2024-12-20.yang @@ -92,7 +92,7 @@ module ietf-network-slice-service { This version of this YANG module is part of RFC AAAA; see the RFC itself for full legal notices."; - revision 2024-08-28 { + revision 2024-12-20 { description "Initial revision."; reference @@ -893,7 +893,7 @@ module ietf-network-slice-service { constraints, customer name, or other customer-defined opaque types."; } - leaf-list value { + leaf-list tag-type-value { type string; description "The tag values, e.g., 5G customer names when multiple @@ -1143,7 +1143,7 @@ module ietf-network-slice-service { description "The attachment circuit tag type."; } - leaf-list value { + leaf-list tag-type-value { type string; description "The attachment circuit tag values. diff --git a/experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-06-19.yang b/experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-12-20.yang similarity index 91% rename from experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-06-19.yang rename to experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-12-20.yang index 3d48dcdb3..d2267cc4a 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-06-19.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-on-path-telemetry@2024-12-20.yang @@ -15,6 +15,7 @@ module ietf-on-path-telemetry { reference "RFC 8343: A YANG Data Model for Interface Management"; } + import ietf-yang-types { prefix yang; reference @@ -54,11 +55,10 @@ module ietf-on-path-telemetry { (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself for full legal notices."; - revision 2024-06-19 { + revision 2024-12-20 { description "First revision."; reference "RFC XXXX: A YANG Data Model for On-path Telemetry"; } - /* * FEATURES */ @@ -264,49 +264,6 @@ module ietf-on-path-telemetry { "Base identity to represent E2E data."; } - identity characteristics { - description - "Base identity for monitoring information - characteristics"; - } - - identity acquisition-method { - base characteristics; - description - "The type of acquisition-method. It can be multiple - types at once."; - } - - identity subscription { - base acquisition-method; - description - "The acquisition-method type is subscription."; - } - - identity query { - base acquisition-method; - description - "The acquisition-method type is query."; - } - - identity emission-type { - base characteristics; - description - "The type of emission-type."; - } - - identity periodic { - base emission-type; - description - "The emission-type type is periodic."; - } - - identity on-change { - base emission-type; - description - "The emission-type type is on-change."; - } - identity telemetry-param-type { description "Base identity for telemetry param types"; @@ -398,25 +355,6 @@ module ietf-on-path-telemetry { "Specify the time."; } } - grouping characteristics { - description - "A set of characteristics of a monitoring information."; - leaf acquisition-method { - type identityref { - base acquisition-method; - } - description - "The acquisition-method for characteristics"; - } - leaf emission-type { - type identityref { - base emission-type; - } - description - "The emission-type for characteristics. This attribute is - used when the acquisition-method is a 'subscription'"; - } - } grouping telemetry-filter { description "A grouping for On-path Telemetry filter definition"; @@ -612,8 +550,6 @@ module ietf-on-path-telemetry { uses timestamp; - uses characteristics; - container interfaces { description "Contains the list of available interfaces that support diff --git a/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang b/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2024-03-21.yang similarity index 96% rename from experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang rename to experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2024-03-21.yang index 17f982588..a20d869ee 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2024-03-21.yang @@ -5,18 +5,20 @@ module ietf-otn-tunnel { import ietf-te { prefix "te"; - revision-date "2021-02-20"; reference - "I-D.ietf-teas-yang-te-19: A YANG Data Model for Traffic - Engineering Tunnels and Interfaces. "; + "RFC ZZZZ: A YANG Data Model for Traffic Engineering Tunnels + and Interfaces."; } + /* Note: The RFC Editor will replace ZZZZ with the number assigned + to the RFC once draft-ietf-teas-yang-te becomes an RFC.*/ import ietf-layer1-types { prefix "l1-types"; reference - "I-D.ietf-ccamp-layer1-types: - A YANG Data Model for Layer 1 Types. "; + "RFC YYYY: Common YANG Data Types for Layer 1 Networks."; } + /* Note: The RFC Editor will replace YYYY with the number assigned + to the RFC once draft-ietf-ccamp-layer1-types becomes an RFC.*/ organization "IETF CCAMP Working Group"; @@ -45,7 +47,7 @@ module ietf-otn-tunnel { The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2023 IETF Trust and the persons + 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 @@ -55,14 +57,15 @@ module ietf-otn-tunnel { Relating to IETF Documents (https://trustee.ietf.org/license-info). - This version of this YANG module is part of RFC XXXX; see - the RFC itself for full legal notices."; + This version of this YANG module is part of RFC XXXX; see + the RFC itself for full legal notices."; - revision "2023-10-12" { + revision "2024-03-21" { description "Initial version"; reference - "RFC XXXX: OTN Tunnel YANG Model"; + "RFC XXXX: A YANG Data Model for Optical Transport Network + (OTN) Tunnels and Label Switched Paths"; // RFC Ed.: replace XXXX with actual RFC number, update date // information and remove this note } @@ -301,7 +304,7 @@ module ietf-otn-tunnel { augment "/te:te/te:globals/te:named-path-constraints/" + "te:named-path-constraint/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-exclude-always/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -315,7 +318,7 @@ module ietf-otn-tunnel { augment "/te:te/te:globals/te:named-path-constraints/" + "te:named-path-constraint/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -435,7 +438,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-exclude-always/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -448,7 +451,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -585,7 +588,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:primary-reverse-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-exclude-always/" + "te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { @@ -601,7 +604,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:primary-reverse-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-include-exclude/" + "te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { @@ -743,7 +746,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-exclude-always/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -756,7 +759,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -889,7 +892,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-reverse-paths/te:secondary-reverse-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-exclude-always/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -903,7 +906,7 @@ module ietf-otn-tunnel { augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-reverse-paths/te:secondary-reverse-path/" - + "te:explicit-route-objects-always/" + + "te:explicit-route-objects/" + "te:route-object-include-exclude/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description @@ -1007,8 +1010,8 @@ module ietf-otn-tunnel { } augment "/te:te/te:lsps/" - + "te:lsp/te:lsp-record-route-information/" - + "te:lsp-record-route-information/te:type/te:label/" + + "te:lsp/te:lsp-actual-route-information/" + + "te:lsp-actual-route-information/te:type/te:label/" + "te:label-hop/te:te-label/te:technology" { description "Augment TE label hop for the record route of the LSP."; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-10-19.yang b/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-10-19.yang deleted file mode 100644 index 73aea2bef..000000000 --- a/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-10-19.yang +++ /dev/null @@ -1,872 +0,0 @@ -module ietf-pcep-stats { - yang-version 1.1; - namespace "urn:ietf:params:xml:ns:yang:ietf-pcep-stats"; - prefix pcep-stats; - - import ietf-pcep { - prefix pcep; - reference - "RFC XXXX: A YANG Data Model for Path Computation - Element Communications Protocol (PCEP)"; - } - import ietf-yang-types { - prefix yang; - reference - "RFC 6991: Common YANG Data Types"; - } - - organization - "IETF PCE (Path Computation Element) Working Group"; - contact - "WG Web: - WG List: - Editor: Dhruv Dhody - "; - description - "The YANG module augments the Path Computation Element - Communication Protocol (PCEP) YANG operational - model with statistics, counters and telemetry data. - - 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; see the - RFC itself for full legal notices."; - - revision 2024-10-19 { - description - "Initial revision."; - reference - "RFC XXXX: A YANG Data Model for Path Computation - Element Communications Protocol (PCEP)"; - } - - /* - * Groupings - */ - - grouping stats { - description - "This grouping defines statistics for PCEP. It is used - for both peer and current sessions."; - leaf discontinuity-time { - type yang:timestamp; - description - "The timestamp value of the time when the - statistics were last reset."; - } - leaf rsp-time-avg { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type uint32; - units "milliseconds"; - description - "The average response time. If an average response time - has not been calculated then this leaf has the value - zero."; - } - leaf rsp-time-lwm { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type uint32; - units "milliseconds"; - description - "The smallest (low-water mark) response time seen. - If no responses have been received then this leaf has - the value zero."; - } - leaf rsp-time-hwm { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type uint32; - units "milliseconds"; - description - "The greatest (high-water mark) response time seen. - If no responses have been received then this object - has the value zero."; - } - leaf pcreq-sent { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of PCReq messages sent."; - } - leaf pcreq-rcvd { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of PCReq messages received."; - } - leaf pcrep-sent { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of PCRep messages sent."; - } - leaf pcrep-rcvd { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of PCRep messages received."; - } - leaf pcerr-sent { - type yang:counter32; - description - "The number of PCErr messages sent."; - } - leaf pcerr-rcvd { - type yang:counter32; - description - "The number of PCErr messages received."; - } - leaf pcntf-sent { - type yang:counter32; - description - "The number of PCNtf messages sent."; - } - leaf pcntf-rcvd { - type yang:counter32; - description - "The number of PCNtf messages received."; - } - leaf keepalive-sent { - type yang:counter32; - description - "The number of Keepalive messages sent."; - } - leaf keepalive-rcvd { - type yang:counter32; - description - "The number of Keepalive messages received."; - } - leaf unknown-rcvd { - type yang:counter32; - description - "The number of unknown messages received."; - } - leaf corrupt-rcvd { - type yang:counter32; - description - "The number of corrupted PCEP messages received."; - } - leaf req-sent { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests sent. A request corresponds - 1:1 with an RP object in a PCReq message. This might - be greater than pcreq-sent because multiple - requests can be batched into a single PCReq - message."; - } - leaf req-sent-pend-rep { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that have been sent for - which a response is still pending."; - } - leaf req-sent-ero-rcvd { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that have been sent for - which a response with an ERO object was received. - Such responses indicate that a path was - successfully computed by the peer."; - } - leaf req-sent-nopath-rcvd { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that have been sent for - which a response with a NO-PATH object was - received. Such responses indicate that the peer - could not find a path to satisfy the - request."; - } - leaf req-sent-cancel-rcvd { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that were cancelled with - a PCNtf message. This might be different than - pcntf-rcvd because not all PCNtf messages are - used to cancel requests, and a single PCNtf message - can cancel multiple requests."; - } - leaf req-sent-error-rcvd { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that were rejected with a - PCErr message. This might be different than - pcerr-rcvd because not all PCErr messages are - used to reject requests, and a single PCErr message - can reject multiple requests."; - } - leaf req-sent-timeout { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that have been sent to a peer - and have been abandoned because the peer has taken too - long to respond to them."; - } - leaf req-sent-cancel-sent { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that were sent to the peer and - explicitly cancelled by the local PCEP entity sending - a PCNtf."; - } - leaf req-rcvd { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests received. A request - corresponds 1:1 with an RP object in a PCReq - message. - This might be greater than pcreq-rcvd because - multiple requests can be batched into a single - PCReq message."; - } - leaf req-rcvd-pend-rep { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests that have been received for - which a response is still pending."; - } - leaf req-rcvd-ero-sent { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests that have been received for - which a response with an ERO object was sent. Such - responses indicate that a path was successfully - computed by the local PCEP entity."; - } - leaf req-rcvd-nopath-sent { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests that have been received for - which a response with a NO-PATH object was sent. Such - responses indicate that the local PCEP entity could - not find a path to satisfy the request."; - } - leaf req-rcvd-cancel-sent { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests received that were cancelled - by the local PCEP entity sending a PCNtf message. - This might be different than pcntf-sent because - not all PCNtf messages are used to cancel requests, - and a single PCNtf message can cancel multiple - requests."; - } - leaf req-rcvd-error-sent { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests received that were cancelled - by the local PCEP entity sending a PCErr message. - This might be different than pcerr-sent because - not all PCErr messages are used to cancel requests, - and a single PCErr message can cancel multiple - requests."; - } - leaf req-rcvd-cancel-rcvd { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests that were received from the - peer and explicitly cancelled by the peer sending - a PCNtf."; - } - leaf rep-rcvd-unknown { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of responses to unknown requests - received. A response to an unknown request is a - response whose RP object does not contain the - request ID of any request that is currently - outstanding on the session."; - } - leaf req-rcvd-unknown { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of unknown requests that have been - received. An unknown request is a request - whose RP object contains a request ID of zero."; - } - container svec { - if-feature "pcep:svec"; - description - "If synchronized path computation is supported"; - leaf svec-sent { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of SVEC objects sent in PCReq messages. - An SVEC object represents a set of synchronized - requests."; - } - leaf svec-req-sent { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests sent that appeared in one - or more SVEC objects."; - } - leaf svec-rcvd { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of SVEC objects received in PCReq - messages. An SVEC object represents a set of - synchronized requests."; - } - leaf svec-req-rcvd { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests received that appeared - in one or more SVEC objects."; - } - } - container stateful { - if-feature "pcep:stateful"; - description - "Stateful PCE related statistics"; - leaf pcrpt-sent { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of PCRpt messages sent."; - } - leaf pcrpt-rcvd { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of PCRpt messages received."; - } - leaf pcupd-sent { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of PCUpd messages sent."; - } - leaf pcupd-rcvd { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of PCUpd messages received."; - } - leaf rpt-sent { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of LSP Reports sent. An LSP report - corresponds 1:1 with an LSP object in a PCRpt - message. This might be greater than - pcrpt-sent because multiple reports can - be batched into a single PCRpt message."; - } - leaf rpt-rcvd { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of LSP Reports received. An LSP report - corresponds 1:1 with an LSP object in a PCRpt - message. - This might be greater than pcrpt-rcvd because - multiple reports can be batched into a single - PCRpt message."; - } - leaf rpt-rcvd-error-sent { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of reports of LSPs received that were - responded by the local PCEP entity by sending a - PCErr message."; - } - leaf upd-sent { - when "../../../pcep:role = 'pcc'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of LSP updates sent. An LSP update - corresponds 1:1 with an LSP object in a PCUpd - message. This might be greater than - pcupd-sent because multiple updates can - be batched into a single PCUpd message."; - } - leaf upd-rcvd { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of LSP Updates received. An LSP update - corresponds 1:1 with an LSP object in a PCUpd - message. - This might be greater than pcupd-rcvd because - multiple updates can be batched into a single - PCUpd message."; - } - leaf upd-rcvd-unknown { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of updates to unknown LSPs - received. An update to an unknown LSP is a - update whose LSP object does not contain the - PLSP-ID of any LSP that is currently - present."; - } - leaf upd-rcvd-undelegated { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of updates to not delegated LSPs - received. An update to an undelegated LSP is a - update whose LSP object does not contain the - PLSP-ID of any LSP that is currently - delegated to the current PCEP session."; - } - leaf upd-rcvd-error-sent { - when "../../../pcep:role = 'pce'" - + "or " - + "../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of updates to LSPs received that were - responded by the local PCEP entity by sending a - PCErr message."; - } - container initiation { - if-feature "pcep:pce-initiated"; - description - "PCE-Initiated related statistics"; - leaf pcinitiate-sent { - when "../../../../pcep:role = 'pcc'" - + "or " - + "../../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of PCInitiate messages sent."; - } - leaf pcinitiate-rcvd { - when "../../../../pcep:role = 'pce'" - + "or " - + "../../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of PCInitiate messages received."; - } - leaf initiate-sent { - when "../../../../pcep:role = 'pcc'" - + "or " - + "../../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of LSP Initiation sent via PCE. - An LSP initiation corresponds 1:1 with an LSP - object in a PCInitiate message. This might be - greater than pcinitiate-sent because - multiple initiations can be batched into a - single PCInitiate message."; - } - leaf initiate-rcvd { - when "../../../../pcep:role = 'pce'" - + "or " - + "../../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of LSP Initiation received from - PCE. An LSP initiation corresponds 1:1 with - an LSP object in a PCInitiate message. This - might be greater than pcinitiate-rcvd - because multiple initiations can be batched - into a single PCInitiate message."; - } - leaf initiate-rcvd-error-sent { - when "../../../../pcep:role = 'pce'" - + "or " - + "../../../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of initiations of LSPs received - that were responded to by the local PCEP entity - by sending a PCErr message."; - } - } - } - container path-key { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - if-feature "pcep:path-key"; - description - "If Path-Key is supported"; - leaf unknown-path-key { - type yang:counter32; - description - "The number of attempts to expand an unknown - path-key."; - } - leaf exp-path-key { - type yang:counter32; - description - "The number of attempts to expand an expired - path-key."; - } - leaf dup-path-key { - type yang:counter32; - description - "The number of duplicate attempts to expand the same - path-key."; - } - leaf path-key-no-attempt { - type yang:counter32; - description - "The number of expired path-keys with no attempt to - expand it."; - } - } - } - - /* - * Augment modules to add statistics - */ - - augment "/pcep:pcep/pcep:entity/pcep:peers/pcep:peer" { - description - "Augmenting the statistics"; - leaf sess-setup-ok { - type yang:counter32; - config false; - description - "The number of PCEP sessions successfully established with - the peer, including any current session. This counter is - incremented each time a session with this peer is - successfully established."; - } - leaf sess-setup-fail { - type yang:counter32; - config false; - description - "The number of PCEP sessions with the peer - that have been attempted but failed - before being fully established. This - counter is incremented each time a - session retry to this peer fails."; - } - container stats { - config false; - description - "The container for all statistics at peer level."; - uses stats { - description - "Since PCEP sessions can be ephemeral, the peer statistics - tracks a peer even when no PCEP session currently exists - to that peer. The statistics contained are an aggregate of - the statistics for all successive sessions to that peer."; - } - leaf req-sent-closed { - when "../../pcep:role = 'pce'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCE"; - } - type yang:counter32; - description - "The number of requests that were sent to the peer and - implicitly cancelled when the session they were sent - over was closed."; - } - leaf req-rcvd-closed { - when "../../pcep:role = 'pcc'" - + "or " - + "../../pcep:role = 'pcc-and-pce'" { - description - "Valid for PCEP Peer as PCC"; - } - type yang:counter32; - description - "The number of requests that were received from the peer - and implicitly cancelled when the session they were - received over was closed."; - } - } - } - - augment "/pcep:pcep/pcep:entity/pcep:peers/pcep:peer/" - + "pcep:sessions/pcep:session" { - description - "Augmenting the statistics"; - container stats { - description - "The container for all statistics at session level."; - uses stats { - description - "The statistics contained are for the current sessions to - that peer. These are lost when the session goes down."; - } - } - } - - rpc statistics-reset { - description - "Reset statistics collected."; - input { - choice peer-or-all { - description - "Resets statistics for a particular peer or - all"; - case peer { - leaf peer-addr { - type leafref { - path "/pcep:pcep/pcep:entity/pcep:peers" - + "/pcep:peer/pcep:addr"; - } - description - "Reference to peer address"; - } - description - "This resets all the statistics collected for - the peer."; - } - case all { - description - "This resets all the statistics collected."; - } - } - } - } -} diff --git a/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-12-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-12-18.yang new file mode 100644 index 000000000..5a77220c1 --- /dev/null +++ b/experimental/ietf-extracted-YANG-modules/ietf-pcep-stats@2024-12-18.yang @@ -0,0 +1,679 @@ +module ietf-pcep-stats { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:ietf-pcep-stats"; + prefix pcep-stats; + + import ietf-pcep { + prefix pcep; + reference + "RFC XXXX: A YANG Data Model for Path Computation + Element Communications Protocol (PCEP)"; + } + import ietf-yang-types { + prefix yang; + reference + "RFC 6991: Common YANG Data Types"; + } + + organization + "IETF PCE (Path Computation Element) Working Group"; + contact + "WG Web: + WG List: + Editor: Dhruv Dhody + "; + description + "The YANG module augments the Path Computation Element + Communication Protocol (PCEP) YANG operational + model with statistics, counters and telemetry data. + + 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; see the + RFC itself for full legal notices."; + + revision 2024-12-18 { + description + "Initial revision."; + reference + "RFC XXXX: A YANG Data Model for Path Computation + Element Communications Protocol (PCEP)"; + } + + /* + * Groupings + */ + + grouping stats { + description + "This grouping defines statistics for PCEP. It is used + for both peer and current sessions. Since this groupings + include a relative path, care needs to be taken while + using it"; + leaf discontinuity-time { + type yang:timestamp; + description + "The timestamp value of the time when the + statistics were last reset."; + } + container pce { + when "../../pcep:role = 'pce'" + + "or " + + "../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCE"; + } + leaf rsp-time-avg { + type uint32; + units "milliseconds"; + description + "The average response time. If an average response time + has not been calculated then this leaf has the value + zero."; + } + leaf rsp-time-lwm { + type uint32; + units "milliseconds"; + description + "The smallest (low-water mark) response time seen. + If no responses have been received then this leaf has + the value zero."; + } + leaf rsp-time-hwm { + type uint32; + units "milliseconds"; + description + "The greatest (high-water mark) response time seen. + If no responses have been received then this object + has the value zero."; + } + leaf pcreq-sent { + type yang:counter32; + description + "The number of PCReq messages sent."; + } + leaf pcreq-rcvd { + type yang:counter32; + description + "The number of PCReq messages received."; + } + leaf pcrep-sent { + type yang:counter32; + description + "The number of PCRep messages sent."; + } + leaf pcrep-rcvd { + type yang:counter32; + description + "The number of PCRep messages received."; + } + leaf req-sent { + type yang:counter32; + description + "The number of requests sent. A request corresponds + 1:1 with an RP object in a PCReq message. This might + be greater than pcreq-sent because multiple + requests can be batched into a single PCReq + message."; + } + leaf req-sent-pend-rep { + type yang:counter32; + description + "The number of requests that have been sent for + which a response is still pending."; + } + leaf req-sent-ero-rcvd { + type yang:counter32; + description + "The number of requests that have been sent for + which a response with an ERO object was received. + Such responses indicate that a path was + successfully computed by the peer."; + } + leaf req-sent-nopath-rcvd { + type yang:counter32; + description + "The number of requests that have been sent for + which a response with a NO-PATH object was + received. Such responses indicate that the peer + could not find a path to satisfy the + request."; + } + leaf req-sent-cancel-rcvd { + type yang:counter32; + description + "The number of requests that were cancelled with + a PCNtf message. This might be different than + pcntf-rcvd because not all PCNtf messages are + used to cancel requests, and a single PCNtf message + can cancel multiple requests."; + } + leaf req-sent-error-rcvd { + type yang:counter32; + description + "The number of requests that were rejected with a + PCErr message. This might be different than + pcerr-rcvd because not all PCErr messages are + used to reject requests, and a single PCErr message + can reject multiple requests."; + } + leaf req-sent-timeout { + type yang:counter32; + description + "The number of requests that have been sent to a peer + and have been abandoned because the peer has taken too + long to respond to them."; + } + leaf req-sent-cancel-sent { + type yang:counter32; + description + "The number of requests that were sent to the peer and + explicitly cancelled by the local PCEP entity sending + a PCNtf."; + } + leaf rep-rcvd-unknown { + type yang:counter32; + description + "The number of responses to unknown requests + received. A response to an unknown request is a + response whose RP object does not contain the + request ID of any request that is currently + outstanding on the session."; + } + description + "The stats related to PCE as peer"; + } + leaf pcerr-sent { + type yang:counter32; + description + "The number of PCErr messages sent."; + } + leaf pcerr-rcvd { + type yang:counter32; + description + "The number of PCErr messages received."; + } + leaf pcntf-sent { + type yang:counter32; + description + "The number of PCNtf messages sent."; + } + leaf pcntf-rcvd { + type yang:counter32; + description + "The number of PCNtf messages received."; + } + leaf keepalive-sent { + type yang:counter32; + description + "The number of Keepalive messages sent."; + } + leaf keepalive-rcvd { + type yang:counter32; + description + "The number of Keepalive messages received."; + } + leaf unknown-rcvd { + type yang:counter32; + description + "The number of unknown messages received."; + } + leaf corrupt-rcvd { + type yang:counter32; + description + "The number of corrupted PCEP messages received."; + } + container pcc { + when "../../pcep:role = 'pcc'" + + "or " + + "../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + leaf req-rcvd { + type yang:counter32; + description + "The number of requests received. A request + corresponds 1:1 with an RP object in a PCReq + message. + This might be greater than pcreq-rcvd because + multiple requests can be batched into a single + PCReq message."; + } + leaf req-rcvd-pend-rep { + type yang:counter32; + description + "The number of requests that have been received for + which a response is still pending."; + } + leaf req-rcvd-ero-sent { + type yang:counter32; + description + "The number of requests that have been received for + which a response with an ERO object was sent. Such + responses indicate that a path was successfully + computed by the local PCEP entity."; + } + leaf req-rcvd-nopath-sent { + type yang:counter32; + description + "The number of requests that have been received for + which a response with a NO-PATH object was sent. Such + responses indicate that the local PCEP entity could + not find a path to satisfy the request."; + } + leaf req-rcvd-cancel-sent { + type yang:counter32; + description + "The number of requests received that were cancelled + by the local PCEP entity sending a PCNtf message. + This might be different than pcntf-sent because + not all PCNtf messages are used to cancel requests, + and a single PCNtf message can cancel multiple + requests."; + } + leaf req-rcvd-error-sent { + type yang:counter32; + description + "The number of requests received that were cancelled + by the local PCEP entity sending a PCErr message. + This might be different than pcerr-sent because + not all PCErr messages are used to cancel requests, + and a single PCErr message can cancel multiple + requests."; + } + leaf req-rcvd-cancel-rcvd { + type yang:counter32; + description + "The number of requests that were received from the + peer and explicitly cancelled by the peer sending + a PCNtf."; + } + leaf req-rcvd-unknown { + type yang:counter32; + description + "The number of unknown requests that have been + received. An unknown request is a request + whose RP object contains a request ID of zero."; + } + description + "The stats related to PCC as peer"; + } + container svec { + if-feature "pcep:svec"; + description + "If synchronized path computation is supported"; + container pce { + when "../../../pcep:role = 'pce'" + + "or " + + "../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCE"; + } + leaf svec-sent { + type yang:counter32; + description + "The number of SVEC objects sent in PCReq messages. + An SVEC object represents a set of synchronized + requests."; + } + leaf svec-req-sent { + type yang:counter32; + description + "The number of requests sent that appeared in one + or more SVEC objects."; + } + description + "The SVEC stats related to PCE"; + } + container pcc { + when "../../../pcep:role = 'pcc'" + + "or " + + "../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + leaf svec-rcvd { + type yang:counter32; + description + "The number of SVEC objects received in PCReq + messages. An SVEC object represents a set of + synchronized requests."; + } + leaf svec-req-rcvd { + type yang:counter32; + description + "The number of requests received that appeared + in one or more SVEC objects."; + } + description + "The SVEC stats related to PCC as peer"; + } + } + container stateful { + if-feature "pcep:stateful"; + description + "Stateful PCE related statistics"; + container pce { + when "../../../pcep:role = 'pce'" + + "or " + + "../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCE"; + } + leaf pcrpt-sent { + type yang:counter32; + description + "The number of PCRpt messages sent."; + } + leaf pcupd-rcvd { + type yang:counter32; + description + "The number of PCUpd messages received."; + } + leaf rpt-sent { + type yang:counter32; + description + "The number of LSP Reports sent. An LSP report + corresponds 1:1 with an LSP object in a PCRpt + message. This might be greater than + pcrpt-sent because multiple reports can + be batched into a single PCRpt message."; + } + leaf upd-rcvd { + type yang:counter32; + description + "The number of LSP Updates received. An LSP update + corresponds 1:1 with an LSP object in a PCUpd + message. + This might be greater than pcupd-rcvd because + multiple updates can be batched into a single + PCUpd message."; + } + leaf upd-rcvd-unknown { + type yang:counter32; + description + "The number of updates to unknown LSPs + received. An update to an unknown LSP is a + update whose LSP object does not contain the + PLSP-ID of any LSP that is currently + present."; + } + leaf upd-rcvd-undelegated { + type yang:counter32; + description + "The number of updates to not delegated LSPs + received. An update to an undelegated LSP is a + update whose LSP object does not contain the + PLSP-ID of any LSP that is currently + delegated to the current PCEP session."; + } + leaf upd-rcvd-error-sent { + type yang:counter32; + description + "The number of updates to LSPs received that were + responded by the local PCEP entity by sending a + PCErr message."; + } + description + "The stateful stats related to PCE as peer"; + } + container pcc { + when "../../../pcep:role = 'pcc'" + + "or " + + "../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + leaf pcrpt-rcvd { + type yang:counter32; + description + "The number of PCRpt messages received."; + } + leaf pcupd-sent { + type yang:counter32; + description + "The number of PCUpd messages sent."; + } + leaf rpt-rcvd { + type yang:counter32; + description + "The number of LSP Reports received. An LSP report + corresponds 1:1 with an LSP object in a PCRpt + message. + This might be greater than pcrpt-rcvd because + multiple reports can be batched into a single + PCRpt message."; + } + leaf rpt-rcvd-error-sent { + type yang:counter32; + description + "The number of reports of LSPs received that were + responded by the local PCEP entity by sending a + PCErr message."; + } + leaf upd-sent { + type yang:counter32; + description + "The number of LSP updates sent. An LSP update + corresponds 1:1 with an LSP object in a PCUpd + message. This might be greater than + pcupd-sent because multiple updates can + be batched into a single PCUpd message."; + } + description + "The stateful stats related to PCC as peer"; + } + container initiation { + if-feature "pcep:pce-initiated"; + description + "PCE-Initiated related statistics"; + container pcc { + when "../../../../pcep:role = 'pcc'" + + "or " + + "../../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + leaf pcinitiate-sent { + type yang:counter32; + description + "The number of PCInitiate messages sent."; + } + leaf initiate-sent { + type yang:counter32; + description + "The number of LSP Initiation sent via PCE. + An LSP initiation corresponds 1:1 with an LSP + object in a PCInitiate message. This might be + greater than pcinitiate-sent because + multiple initiations can be batched into a + single PCInitiate message."; + } + description + "The initiation stats related to PCC as peer"; + } + container pce { + when "../../../../pcep:role = 'pce'" + + "or " + + "../../../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCE"; + } + leaf pcinitiate-rcvd { + type yang:counter32; + description + "The number of PCInitiate messages received."; + } + leaf initiate-rcvd { + type yang:counter32; + description + "The number of LSP Initiation received from + PCE. An LSP initiation corresponds 1:1 with + an LSP object in a PCInitiate message. This + might be greater than pcinitiate-rcvd + because multiple initiations can be batched + into a single PCInitiate message."; + } + leaf initiate-rcvd-error-sent { + type yang:counter32; + description + "The number of initiations of LSPs received + that were responded to by the local PCEP entity + by sending a PCErr message."; + } + description + "The initiation stats related to PCE as peer"; + } + } + } + container path-key { + when "../../pcep:role = 'pcc'" + + "or " + + "../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + if-feature "pcep:path-key"; + description + "If Path-Key is supported"; + leaf unknown-path-key { + type yang:counter32; + description + "The number of attempts to expand an unknown + path-key."; + } + leaf exp-path-key { + type yang:counter32; + description + "The number of attempts to expand an expired + path-key."; + } + leaf dup-path-key { + type yang:counter32; + description + "The number of duplicate attempts to expand the same + path-key."; + } + leaf path-key-no-attempt { + type yang:counter32; + description + "The number of expired path-keys with no attempt to + expand it."; + } + } + action reset-statistics { + description + "The reset action will clear the statistics at the + associated container"; + input { + leaf reset-at { + type yang:date-and-time; + description + "The time when the reset was issued."; + } + } + output { + leaf reset-finished-at { + type yang:date-and-time; + description + "The time when the reset finished."; + } + } + } + } + + /* + * Augment modules to add statistics + */ + + augment "/pcep:pcep/pcep:entity/pcep:peers/pcep:peer" { + description + "Augmenting the statistics"; + leaf sess-setup-ok { + type yang:counter32; + config false; + description + "The number of PCEP sessions successfully established with + the peer, including any current session. This counter is + incremented each time a session with this peer is + successfully established."; + } + leaf sess-setup-fail { + type yang:counter32; + config false; + description + "The number of PCEP sessions with the peer + that have been attempted but failed + before being fully established. This + counter is incremented each time a + session retry to this peer fails."; + } + container stats { + config false; + description + "The container for all statistics at peer level."; + uses stats { + description + "Since PCEP sessions can be ephemeral, the peer statistics + tracks a peer even when no PCEP session currently exists + to that peer. The statistics contained are an aggregate of + the statistics for all successive sessions to that peer."; + } + leaf req-sent-closed { + when "../../pcep:role = 'pce'" + + "or " + + "../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCE"; + } + type yang:counter32; + description + "The number of requests that were sent to the peer and + implicitly cancelled when the session they were sent + over was closed."; + } + leaf req-rcvd-closed { + when "../../pcep:role = 'pcc'" + + "or " + + "../../pcep:role = 'pcc-and-pce'" { + description + "Valid for PCEP Peer as PCC"; + } + type yang:counter32; + description + "The number of requests that were received from the peer + and implicitly cancelled when the session they were + received over was closed."; + } + } + } + + augment "/pcep:pcep/pcep:entity/pcep:peers/pcep:peer/" + + "pcep:sessions/pcep:session" { + description + "Augmenting the statistics"; + container stats { + description + "The container for all statistics at session level."; + uses stats { + description + "The statistics contained are for the current sessions to + that peer. These are lost when the session goes down."; + } + } + } + + rpc statistics-reset { + description + "Reset all the statistics collected."; + } +} diff --git a/experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-10-19.yang b/experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-12-18.yang similarity index 93% rename from experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-10-19.yang rename to experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-12-18.yang index 2d626c5eb..5f6a72e5e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-10-19.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-pcep@2024-12-18.yang @@ -32,14 +32,12 @@ module ietf-pcep { import ietf-tls-server { prefix tlss; reference - "I-D.ietf-netconf-tls-client-server: YANG Groupings for TLS - Clients and TLS Servers"; + "RFC9645: YANG Groupings for TLS Clients and TLS Servers"; } import ietf-tls-client { prefix tlsc; reference - "I-D.ietf-netconf-tls-client-server: YANG Groupings for TLS - Clients and TLS Servers"; + "RFC9645: YANG Groupings for TLS Clients and TLS Servers"; } import ietf-ospf { prefix ospf; @@ -76,14 +74,13 @@ module ietf-pcep { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices. - The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document are to be interpreted as described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2024-10-19 { + revision 2024-12-18 { description "Initial revision."; reference @@ -413,7 +410,6 @@ module ietf-pcep { "RFC 8232: Optimizations of Label Switched Path State Synchronization Procedures for a Stateful PCE"; } - feature pce-initiated { description "Support PCE-Initiated LSP as per @@ -423,6 +419,7 @@ module ietf-pcep { (PCEP) Extensions for PCE-Initiated LSP Setup in a Stateful PCE Model"; } + feature tls { description "Support PCEP over TLS as per RFC 8253."; @@ -432,9 +429,9 @@ module ietf-pcep { (PCEP)"; } - feature sr { + feature sr-mpls { description - "Support Segment Routing (SR) for PCE."; + "Support Segment Routing (SR) for MPLS in PCEP."; reference "RFC 8664: Path Computation Element Communication Protocol (PCEP) Extensions for Segment Routing"; @@ -577,7 +574,7 @@ module ietf-pcep { if-feature "stateful"; base lsp-error; description - "LSP administratively bought down. LSP Error Code value + "LSP administratively brought down. LSP Error Code value = 6."; reference "RFC 8231: Path Computation Element Communication Protocol @@ -634,7 +631,7 @@ module ietf-pcep { Paths (LSPs)"; } - identity vn { + identity virtual-network { base te-types:association-type; description "Virtual Network (VN) Association"; @@ -659,14 +656,14 @@ module ietf-pcep { description "The domain type."; } - leaf info { + leaf domain { type domain; description "The domain Information."; } } - grouping info { + grouping domain-info { description "This grouping specifies all information which may be relevant to both PCC and PCE. @@ -677,7 +674,7 @@ module ietf-pcep { description "The domain for the local PCEP entity or a peer."; list domain { - key "type info"; + key "type domain"; description "The domain information."; uses domain { @@ -861,6 +858,7 @@ module ietf-pcep { leaf pce-initiated { if-feature "pce-initiated"; type boolean; + default "false"; description "Set to true if PCE-initiated LSP capability is enabled."; @@ -873,6 +871,7 @@ module ietf-pcep { if-feature "stateful"; if-feature "sync-opt"; type boolean; + default "true"; description "Support inclusion of LSP-DB-VERSION in LSP object"; @@ -884,6 +883,7 @@ module ietf-pcep { if-feature "stateful"; if-feature "sync-opt"; type boolean; + default "true"; description "Support PCE-triggered re-synchronization"; reference @@ -894,6 +894,7 @@ module ietf-pcep { if-feature "stateful"; if-feature "sync-opt"; type boolean; + default "true"; description "PCE-triggered initial synchronization"; reference @@ -904,14 +905,15 @@ module ietf-pcep { if-feature "stateful"; if-feature "sync-opt"; type boolean; + default "true"; description "Support incremental (delta) sync"; reference "RFC 8232: Optimizations of Label Switched Path State Synchronization Procedures for a Stateful PCE"; } - container sr { - if-feature "sr"; + container sr-mpls { + if-feature "sr-mpls"; description "If segment routing for MPLS is supported at the local entity or a peer."; @@ -920,6 +922,7 @@ module ietf-pcep { (PCEP) Extensions for Segment Routing"; leaf enabled { type boolean; + default "false"; description "Set to true if SR-MPLS is enabled"; } @@ -952,6 +955,7 @@ module ietf-pcep { Networks"; leaf enabled { type boolean; + default "false"; description "Set to true if Stateful GMPLS is enabled"; } @@ -959,6 +963,7 @@ module ietf-pcep { leaf inter-layer { if-feature "inter-layer"; type boolean; + default "false"; description "If inter-layer path computation is supported for local entity or a peer"; @@ -978,12 +983,14 @@ module ietf-pcep { Computation Element (H-PCE) Architecture"; leaf enabled { type boolean; + default "false"; description "Set to true if H-PCE is enabled"; } leaf stateful { if-feature "stateful"; type boolean; + default "false"; description "Set to true if Stateful H-PCE is enabled"; reference @@ -1004,7 +1011,7 @@ module ietf-pcep { } } leaf msd { - if-feature "sr"; + if-feature "sr-mpls"; type uint8; config false; description @@ -1108,7 +1115,7 @@ module ietf-pcep { toward which a PCE can compute paths"; list domain { - key "type info"; + key "type domain"; description "The neighbour domain."; uses domain { @@ -1136,10 +1143,11 @@ module ietf-pcep { description "This group describes common session instance-specific data for notifications."; + uses notification-instance-hdr; leaf session-initiator { type leafref { - path "/pcep/entity/peers/peer/sessions/" - + "session/initiator"; + path "/pcep/entity/peers/peer[addr=current()/../peer-addr]/" + + "sessions/session/initiator"; } description "Reference to pcep session initiator leaf"; @@ -1264,18 +1272,20 @@ module ietf-pcep { container entity { description "The configured PCEP entity on the device."; - leaf addr { + leaf-list addr { type inet:ip-address-no-zone; - mandatory true; + min-elements 1; + ordered-by user; description "The local Internet address of this PCEP entity. If operating as a PCE server, the PCEP entity listens on this address. If operating as a PCC, the PCEP entity binds outgoing TCP connections - to this address. It is possible for the PCEP entity - to operate both as a PCC and a PCE Server, in which - case it uses this address both to listen for incoming - TCP connections and to bind outgoing TCP connections."; + to this address based on the address family. It is + possible for the PCEP entity to operate both as a + PCC and a PCE Server, in which case it uses this + address both to listen for incoming TCP connections + and to bind outgoing TCP connections."; } leaf enabled { type boolean; @@ -1286,12 +1296,13 @@ module ietf-pcep { } leaf role { type role; + must '(. != "unknown")' { + error-message "The PCEP entity role cannot be unknown"; + } mandatory true; description "The role that this entity can play. Takes one of the following values: - - unknown(0): this PCEP Entity role is not - known, - pcc(1): this PCEP Entity is a PCC, - pce(2): this PCEP Entity is a PCE, - pcc-and-pce(3): this PCEP Entity is both @@ -1349,7 +1360,7 @@ module ietf-pcep { has failed and will not recover without operator intervention."; } - uses info { + uses domain-info { description "Local PCEP entity information"; } @@ -1380,6 +1391,7 @@ module ietf-pcep { -Based Mechanism"; leaf enabled { type boolean; + default "false"; description "Enabled or Disabled; set to true when Enabled"; } @@ -1403,7 +1415,7 @@ module ietf-pcep { type inet:ip-address-no-zone; description "PCE Address to be used in each Path-Key Subobject - (PKS)"; + (PKS), same as local PCE entity IP address"; } } } @@ -1439,6 +1451,7 @@ module ietf-pcep { range "1..max"; } units "seconds"; + mandatory true; description "The initial back-off time in seconds for retrying a failed session setup attempt to a peer. @@ -1453,6 +1466,7 @@ module ietf-pcep { leaf max-back-off-timer { type uint32; units "seconds"; + mandatory true; description "The maximum back-off time in seconds for retrying a failed session setup attempt to a peer. @@ -1544,6 +1558,7 @@ module ietf-pcep { leaf max-keepalive-timer { type uint8; units "seconds"; + mandatory true; description "The maximum value that this PCEP entity will accept from a peer for the interval between @@ -1554,6 +1569,7 @@ module ietf-pcep { leaf max-dead-timer { type uint8; units "seconds"; + mandatory true; description "The maximum value in seconds, that this PCEP entity will accept from a peer for the DeadTimer. @@ -1563,6 +1579,7 @@ module ietf-pcep { leaf min-keepalive-timer { type uint8; units "seconds"; + mandatory true; description "The minimum value in seconds, that this PCEP entity will accept for the interval between @@ -1573,6 +1590,7 @@ module ietf-pcep { leaf min-dead-timer { type uint8; units "seconds"; + mandatory true; description "The minimum value in seconds, that this PCEP entity will accept for the DeadTimer. Zero @@ -1603,12 +1621,14 @@ module ietf-pcep { range "1..max"; } units "seconds"; + mandatory true; description "The maximum time that the PCEP entity will wait for a response to a PCReq message."; } leaf max-sessions { type uint32; + mandatory true; description "Maximum number of sessions involving this PCEP entity that can exist at any time."; @@ -1663,12 +1683,17 @@ module ietf-pcep { leaf state-timeout { type uint32; units "seconds"; + mandatory true; description "When a PCEP session is terminated, a PCC waits for this time period before flushing LSP state associated with that PCEP session and reverting to operator-defined default - parameters or behaviours."; + parameters or behaviours. The max value + represents infinity."; + reference + "RFC 8231: Path Computation Element Communication + Protocol (PCEP) Extensions for Stateful PCE"; } leaf redelegation-timeout { when "../../role = 'pcc'" @@ -1680,6 +1705,11 @@ module ietf-pcep { } type uint32; units "seconds"; + must '(. < ../state-timeout)' { + error-message "The Redelegation Timeout must be " + + "less than the State Timeout"; + } + mandatory true; description "When a PCEP session is terminated, a PCC waits for this time period before revoking @@ -1687,6 +1717,9 @@ module ietf-pcep { redelegate LSPs associated with the terminated PCEP session to an alternate PCE."; + reference + "RFC 8231: Path Computation Element Communication + Protocol (PCEP) Extensions for Stateful PCE"; } leaf rpt-non-pcep-lsp { when "../../role = 'pcc'" @@ -1799,7 +1832,8 @@ module ietf-pcep { leaf pcc-id { type leafref { path "/pcep/entity/lsp-db/" - + "lsp/pcc-id"; + + "lsp[plsp-id=current()/" + + "../plsp-id]/pcc-id"; } description "Reference to PCC-ID in LSP-DB"; @@ -1807,7 +1841,8 @@ module ietf-pcep { leaf lsp-id { type leafref { path "/pcep/entity/lsp-db/" - + "lsp/lsp-id"; + + "lsp[plsp-id=current()/../plsp-id]" + + "[pcc-id=current()/../pcc-id]/lsp-id"; } description "Reference to LSP ID in LSP-DB"; @@ -1832,7 +1867,7 @@ module ietf-pcep { leaf pcc-id { type inet:ip-address-no-zone; description - "The local internet address of the PCC, that + "The local IP address of the PCC, that generated the PLSP-ID."; } leaf source { @@ -1910,12 +1945,13 @@ module ietf-pcep { delegated"; } leaf peer { + when '../enabled' { + description + "The LSP must be delegated"; + } type leafref { path "/pcep/entity/peers/peer/addr"; } - must '(../enabled = true())' { - error-message "The LSP must be delegated"; - } description "At the PCC, the reference to the PCEP peer to which LSP is delegated; At the PCE, the @@ -1947,12 +1983,13 @@ module ietf-pcep { "Set to true if this LSP is initiated by a PCE"; } leaf peer { + when '../enabled' { + description + "The LSP must be PCE-Initiated"; + } type leafref { path "/pcep/entity/peers/peer/addr"; } - must '(../enabled = true())' { - error-message "The LSP must be PCE-Initiated"; - } description "If the role is PCC, this leaf refers to the PCEP peer (PCE) that initiated this LSP. If the role @@ -2004,7 +2041,8 @@ module ietf-pcep { leaf id { type leafref { path "/pcep/entity/lsp-db/" - + "association-list/id"; + + "association-list[type=current()/" + + "../type]/id"; } description "PCEP Association ID"; @@ -2012,7 +2050,8 @@ module ietf-pcep { leaf source { type leafref { path "/pcep/entity/lsp-db/" - + "association-list/source"; + + "association-list[type=current()/../type]" + + "[id=current()/../id]/source"; } description "PCEP Association Source."; @@ -2020,7 +2059,10 @@ module ietf-pcep { leaf global-source { type leafref { path "/pcep/entity/lsp-db/" - + "association-list/global-source"; + + "association-list[type=current()/../type]" + + "[id=current()/../id]" + + "[source=current()/../source]" + + "/global-source"; } description "PCEP Global Association Source."; @@ -2028,7 +2070,11 @@ module ietf-pcep { leaf extended-id { type leafref { path "/pcep/entity/lsp-db/" - + "association-list/extended-id"; + + "association-list[type=current()/../type]" + + "[id=current()/../id]" + + "[source=current()/../source]" + + "[global-source=current()/../global-source]" + + "/extended-id"; } description "Additional information to @@ -2102,12 +2148,13 @@ module ietf-pcep { "If path-key has been retrieved yet"; } leaf pcc-retrieved { + when '../retrieved' { + description + "The Path-key should be retrieved"; + } type leafref { path "/pcep/entity/peers/peer/addr"; } - must '(../retrieved = true())' { - error-message "The Path-key should be retrieved"; - } description "Reference to PCC peer address which retrieved the path-key"; @@ -2174,14 +2221,14 @@ module ietf-pcep { "Description of the PCEP peer configured by the user"; } - uses info { + uses domain-info { description "PCE Peer information"; } container pce-info { uses pce-info { description - "PCE Peer information"; + "Using the PCE Peer information grouping"; } description "The PCE Peer information"; @@ -2191,8 +2238,10 @@ module ietf-pcep { type uint8 { range "0..7"; } + mandatory true; description - "The PCE peer delegation preference."; + "The PCE peer delegation preference where + 7 reflects the highest preference"; } uses auth { description @@ -2278,10 +2327,10 @@ module ietf-pcep { } leaf role { type leafref { - path "/pcep/entity/role"; + path "../../../role"; } description - "The reference to peer role ."; + "The peer role."; } leaf state-last-change { type yang:timestamp; @@ -2329,23 +2378,13 @@ module ietf-pcep { } leaf remote-id { type uint8; - must "((../state != 'tcp-pending'" - + "and " - + "../state != 'open-wait' )" - + "or " - + "((../state = 'tcp-pending'" - + " or " - + "../state = 'open-wait' )" - + "and (. = 0)))" { - error-message "Invalid remote-id"; - description - "If the state is TCPPending or OpenWait then - this leaf is not used and MUST be set to - zero."; - } description "The value of the PCEP session ID used by the - peer in its Open message for this session."; + peer in its Open message for this session. + + If the state is TCPPending or OpenWait then + this leaf is not used and MUST be set to + zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2353,21 +2392,15 @@ module ietf-pcep { leaf keepalive-timer { type uint8; units "seconds"; - must "(../state = 'session-up'" - + "or " - + "(../state != 'session-up'" - + "and (. = 0)))" { - error-message "Invalid Keepalive timer"; - description - "This field is used if and only if the state - is session-up. Otherwise, it is not used and - MUST be set to zero."; - } description "The agreed maximum interval at which the local PCEP entity transmits PCEP messages on this PCEP session. Zero means that the local PCEP entity - never sends Keepalives on this session."; + never sends Keepalives on this session. + + This field is used if and only if the state + is session-up. Otherwise, it is not used and + MUST be set to zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2375,22 +2408,15 @@ module ietf-pcep { leaf peer-keepalive-timer { type uint8; units "seconds"; - must "(../state = 'session-up'" - + "or " - + "(../state != 'session-up'" - + "and " - + "(. = 0)))" { - error-message "Invalid Peer Keepalive timer"; - description - "This field is used if and only if state is - session-up. Otherwise, it is not used and MUST - be set to zero."; - } description "The agreed maximum interval at which the peer transmits PCEP messages on this PCEP session. Zero means that the peer never sends Keepalives - on this session."; + on this session. + + This field is used if and only if state is + session-up. Otherwise, it is not used and MUST + be set to zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2407,23 +2433,12 @@ module ietf-pcep { leaf peer-dead-timer { type uint8; units "seconds"; - must "((../state != 'tcp-pending'" - + "and " - + "../state != 'open-wait' )" - + "or " - + "((../state = 'tcp-pending'" - + " or " - + "../state = 'open-wait' )" - + "and " - + "(. = 0)))" { - error-message "Invalid Peer DeadTimer"; - description - "If the state is TCPPending or OpenWait then - this leaf is not used and MUST be set to zero."; - } description - "The peer's DeadTimer interval - for this PCEP session."; + "The peer's DeadTimer interval for this PCEP + session. + + If the state is TCPPending or OpenWait then + this leaf is not used and MUST be set to zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2431,25 +2446,13 @@ module ietf-pcep { leaf ka-hold-time-rem { type uint8; units "seconds"; - must "((../state != 'tcp-pending'" - + "and " - + "../state != 'open-wait' ) " - + "or " - + "((../state = 'tcp-pending'" - + "or " - + "../state = 'open-wait' )" - + "and " - + "(. = 0)))" { - error-message - "Invalid Keepalive hold time remaining"; - description - "If the state is TCPPending or OpenWait then - this field is not used and MUST be set to - zero."; - } description "The Keepalive hold time remaining for this - session."; + session. + + If the state is TCPPending or OpenWait then + this field is not used and MUST be set to + zero."; } leaf overloaded { type boolean; @@ -2462,7 +2465,7 @@ module ietf-pcep { Communication Protocol (PCEP)"; } leaf overloaded-timestamp { - when '(../overloaded = true())' { + when '../overloaded' { description "Valid when overloaded"; } @@ -2474,19 +2477,14 @@ module ietf-pcep { leaf overload-time { type uint32; units "seconds"; - must '((../overloaded = true()) ' - + 'or ((../overloaded != true()) ' - + 'and (. = 0)))' { - error-message "Invalid overload-time"; - description - "This field is only used if overloaded is set to - true. Otherwise, it is not used and MUST be set - to zero."; - } description "The interval of time that is remaining until the local PCEP entity will cease to be overloaded on - this session."; + this session. + + This field is only used if overloaded is set to + true. Otherwise, it is not used and MUST be set + to zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2502,7 +2500,7 @@ module ietf-pcep { Communication Protocol (PCEP)"; } leaf peer-overloaded-timestamp { - when '(../peer-overloaded = true())' { + when '../peer-overloaded' { description "Valid when Peer is overloaded"; } @@ -2514,23 +2512,15 @@ module ietf-pcep { leaf peer-overload-time { type uint32; units "seconds"; - must '((../peer-overloaded = ' - + 'true()) or ' - + '((../peer-overloaded !=' - + 'true())' - + ' and ' - + '(. = 0)))' { - error-message "Invalid peer overload time"; - description - "This field is only used if peer-overloaded - is set to true. Otherwise, it is not used - and MUST be set to zero."; - } description "The interval of time that is remaining until the peer will cease to be overloaded. If it is not known how long the peer will stay in - overloaded state, this leaf is set to zero."; + overloaded state, this leaf is set to zero. + + This field is only used if peer-overloaded + is set to true. Otherwise, it is not used + and MUST be set to zero."; reference "RFC 5440: Path Computation Element (PCE) Communication Protocol (PCEP)"; @@ -2656,7 +2646,6 @@ module ietf-pcep { "This notification is sent when the value of '/pcep/peers/peer/sessions/session/state' enters the 'session-up' state."; - uses notification-instance-hdr; uses notification-session-hdr; leaf state-last-change { type yang:timestamp; @@ -2711,7 +2700,6 @@ module ietf-pcep { description "This notification is sent when the local PCEP entity enters overload state for a peer."; - uses notification-instance-hdr; uses notification-session-hdr; leaf overloaded { type boolean; @@ -2766,7 +2754,6 @@ module ietf-pcep { description "This notification is sent when a peer enters overload state."; - uses notification-instance-hdr; uses notification-session-hdr; leaf peer-overloaded { type boolean; @@ -2836,6 +2823,7 @@ module ietf-pcep { type leafref { path "/pcep/entity/peers/peer/addr"; } + mandatory true; description "The IP address to identify the PCC. The state syncronization is re-triggered for all LSPs from diff --git a/experimental/ietf-extracted-YANG-modules/ietf-udp-notif-transport@2024-10-17.yang b/experimental/ietf-extracted-YANG-modules/ietf-udp-notif-transport@2024-10-17.yang index 245b81744..64dd53315 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-udp-notif-transport@2024-10-17.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-udp-notif-transport@2024-10-17.yang @@ -63,6 +63,7 @@ module ietf-udp-notif-transport { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; + revision 2024-10-17 { description "Initial revision"; diff --git a/standard/iana/iana-dns-class-rr-type@2023-11-27.yang b/standard/iana/iana-dns-class-rr-type@2024-12-10.yang similarity index 91% rename from standard/iana/iana-dns-class-rr-type@2023-11-27.yang rename to standard/iana/iana-dns-class-rr-type@2024-12-10.yang index 1a2c159db..80f50bda1 100644 --- a/standard/iana/iana-dns-class-rr-type@2023-11-27.yang +++ b/standard/iana/iana-dns-class-rr-type@2024-12-10.yang @@ -42,8 +42,33 @@ module iana-dns-class-rr-type { "IANA 'Domain Name System (DNS) Parameters' registry https://www.iana.org/assignments/dns-parameters"; + revision 2024-12-10 { + description "Registered RR Type DSYNC 66. Added version numbers + to draft strings, references to revision statements."; + reference + "draft-ietf-dnsop-generalized-notify-03"; + } + + revision 2024-07-25 { + description "Registered RR Types CLA 263 and IPN 264."; + reference + "draft-johnson-dns-ipn-cla-07"; + } + + revision 2024-07-18 { + description "Registered RR Type NXNAME 128."; + reference + "draft-ietf-dnsop-generalized-notify-03"; + } + + revision 2024-06-21 { + description "Registered RR Type WALLET 262."; + } + revision 2023-11-27 { description "Registered RR Type RESINFO 261."; + reference + "RFC 9606"; } revision 2023-11-08 { @@ -51,6 +76,8 @@ module iana-dns-class-rr-type { reference to 64 and 65 with RFC 9460: Service Binding and Parameter Specification via the DNS (SVCB and HTTPS Resource Records)."; + reference + "RFC 9640"; } revision 2023-04-25 { @@ -437,7 +464,7 @@ Plan - Name Service, April 1987."; "SINK"; reference "- Donald E. Eastlake, III - - http://tools.ietf.org/html/draft-eastlake-kitchen-sink"; + - http://tools.ietf.org/html/draft-eastlake-kitchen-sink-02"; } enum OPT { value 41; @@ -614,6 +641,13 @@ Plan - Name Service, April 1987."; reference "RFC 9460"; } + enum DSYNC { + value 66; + description + "Endpoint discovery for delegation synchronization"; + reference + "draft-ietf-dnsop-generalized-notify-03"; + } enum SPF { value 99; description @@ -691,6 +725,13 @@ Plan - Name Service, April 1987."; reference "RFC 7043"; } + enum NXNAME { + value 128; + description + "NXDOMAIN indicator for Compact Denial of Existence"; + reference + "draft-ietf-dnsop-compact-denial-of-existence-04"; + } enum TKEY { value 249; description @@ -770,7 +811,7 @@ Plan - Name Service, April 1987."; description "Digital Object Architecture"; reference - "draft-durand-doa-over-dns"; + "draft-durand-doa-over-dns-02"; } enum AMTRELAY { value 260; @@ -784,7 +825,28 @@ Plan - Name Service, April 1987."; description "Resolver Information as Key/Value Pairs"; reference - "draft-ietf-add-resolver-info-06"; + "RFC 9606"; + } + enum WALLET { + value 262; + description + "Public wallet address"; + reference + "Paul Hoffman "; + } + enum CLA { + value 263; + description + "BP Convergence Layer Adapter"; + reference + "draft-johnson-dns-ipn-cla-07"; + } + enum IPN { + value 264; + description + "BP Node Number"; + reference + "draft-johnson-dns-ipn-cla-07"; } enum TA { value 32768; diff --git a/standard/iana/yang-parameters.xml b/standard/iana/yang-parameters.xml index 7f89fa2a8..8eb138502 100644 --- a/standard/iana/yang-parameters.xml +++ b/standard/iana/yang-parameters.xml @@ -4,7 +4,7 @@ YANG Parameters 2010-06-10 - 2024-11-22 + 2024-12-11 YANG Module Names @@ -54,10 +54,10 @@ FTP (ftp://ftp.iana.org/assignments/yang-parameters/). Registration procedure: Expert Review, as described in . Expert(s): Kent Watsen. - + iana-dns-class-rr-type Y - iana-dns-class-rr-type@2023-11-27.yang + iana-dns-class-rr-type@2024-12-10.yang urn:ietf:params:xml:ns:yang:iana-dns-class-rr-type dnsct @@ -2099,15 +2099,15 @@ and Subsequent Address Family Identi - + ietf-tcg-algs N - + ietf-tcg-algs@2024-12-05.yang urn:ietf:params:xml:ns:yang:ietf-tcg-algs taa - - 's module file will be posted upon the document's publication as an RFC. + + ietf-tcp @@ -2239,15 +2239,15 @@ and Subsequent Address Family Identi - + ietf-tpm-remote-attestation N - + ietf-tpm-remote-attestation@2024-12-05.yang urn:ietf:params:xml:ns:yang:ietf-tpm-remote-attestation tpm - - 's module file will be posted upon the document's publication as an RFC. + + ietf-truststore diff --git a/standard/ietf/RFC/ietf-tcg-algs.yang b/standard/ietf/RFC/ietf-tcg-algs.yang new file mode 120000 index 000000000..f5b5752fa --- /dev/null +++ b/standard/ietf/RFC/ietf-tcg-algs.yang @@ -0,0 +1 @@ +ietf-tcg-algs@2024-12-05.yang \ No newline at end of file diff --git a/standard/ietf/RFC/ietf-tcg-algs@2024-12-05.yang b/standard/ietf/RFC/ietf-tcg-algs@2024-12-05.yang new file mode 100644 index 000000000..2183c1c2a --- /dev/null +++ b/standard/ietf/RFC/ietf-tcg-algs@2024-12-05.yang @@ -0,0 +1,715 @@ +module ietf-tcg-algs { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:ietf-tcg-algs"; + prefix taa; + + organization + "IETF RATS (Remote ATtestation procedureS) Working Group"; + contact + "WG Web: + WG List: + Author: Eric Voit "; + description + "This module defines identities for asymmetric algorithms. + + 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 9684; see the + RFC itself for full legal notices."; + + revision 2024-12-05 { + description + "Initial version"; + reference + "RFC 9684: A YANG Data Model for Challenge-Response-Based + Remote Attestation (CHARRA) Procedures Using Trusted Platform + Modules (TPMs)"; + } + + /*****************/ + /* Features */ + /*****************/ + + feature tpm12 { + description + "This feature indicates algorithm support for the TPM 1.2 API + per Section 4.8 of TPM1.2-Structures."; + reference + "TPM1.2-Structures: TPM Main Part 2 TPM Structures, + https://trustedcomputinggroup.org/wp-content/uploads/ + TPM-Main-Part-2-TPM-Structures_v1.2_rev116_01032011.pdf + TPM_ALGORITHM_ID values, Section 4.8"; + } + + feature tpm20 { + description + "This feature indicates algorithm support for the TPM 2.0 API + per Section 11.4 of Trusted Platform Module Library Part 1: + Architecture."; + reference + "TPM2.0-Arch: Trusted Platform Module Library Part 1: + Architecture, https://trustedcomputinggroup.org/wp-content/ + uploads/TPM-2.0-1.83-Part-1-Architecture.pdf, Section 11.4"; + } + + /*****************/ + /* Identities */ + /*****************/ + + identity asymmetric { + description + "A TCG-recognized asymmetric algorithm with a public and + private key."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2, + https://trustedcomputinggroup.org/resource/ + tcg-algorithm-registry/TCG-_Algorithm_Registry_r1p32_pub"; + } + + identity symmetric { + description + "A TCG-recognized symmetric algorithm with only a private + key."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity hash { + description + "A TCG-recognized hash algorithm that compresses input data to + a digest value or indicates a method that uses a hash."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity signing { + description + "A TCG-recognized signing algorithm"; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity anonymous_signing { + description + "A TCG-recognized anonymous signing algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity encryption_mode { + description + "A TCG-recognized encryption mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity method { + description + "A TCG-recognized method such as a mask generation function."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity object_type { + description + "A TCG-recognized object type."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 2"; + } + + identity cryptoprocessor { + description + "Base identity identifying a crytoprocessor."; + } + + identity tpm12 { + if-feature "tpm12"; + base cryptoprocessor; + description + "Supportable by a TPM 1.2."; + reference + "TPM1.2-Structures: + TPM Main Part 2 TPM Structures, + https://trustedcomputinggroup.org/wp-content/uploads/ + TPM-Main-Part-2-TPM-Structures_v1.2_rev116_01032011.pdf + TPM_ALGORITHM_ID values, Section 4.8"; + } + + identity tpm20 { + if-feature "tpm20"; + base cryptoprocessor; + description + "Supportable by a TPM 2.0"; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf"; + } + + identity TPM_ALG_RSA { + if-feature "tpm12 or tpm20"; + base tpm12; + base tpm20; + base asymmetric; + base object_type; + description + "RSA algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8017. ALG_ID: 0x0001"; + } + + identity TPM_ALG_TDES { + if-feature "tpm12"; + base tpm12; + base symmetric; + description + "Block cipher with various key sizes (Triple Data Encryption + Algorithm, commonly called Triple Data Encryption Standard) + Note: Was banned in TPM 1.2, v94"; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 18033-3. ALG_ID: 0x0003"; + } + + identity TPM_ALG_SHA1 { + if-feature "tpm12 or tpm20"; + base hash; + base tpm12; + base tpm20; + description + "SHA1 algorithm - Deprecated due to insufficient cryptographic + protection. However, it is still useful for hash algorithms + where protection is not required."; + reference + "TCG-Algos: TCG Algorithm Registry Rev1.34, Table 3, and + ISO/IEC 10118-3. ALG_ID: 0x0004"; + } + + identity TPM_ALG_HMAC { + if-feature "tpm12 or tpm20"; + base tpm12; + base tpm20; + base hash; + base signing; + description + "Hash Message Authentication Code (HMAC) algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 9797-2, and + RFC 2104. ALG_ID: 0x0005"; + } + + identity TPM_ALG_AES { + if-feature "tpm12"; + base tpm12; + base symmetric; + description + "The AES algorithm with various key sizes."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 18033-3. ALG_ID: 0x0006"; + } + + identity TPM_ALG_MGF1 { + if-feature "tpm20"; + base tpm20; + base hash; + base method; + description + "Hash-based mask-generation function."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + IEEE Std 1363-2000, and + IEEE Std 1363a-2004. + ALG_ID: 0x0007"; + } + + identity TPM_ALG_KEYEDHASH { + if-feature "tpm20"; + base tpm20; + base hash; + base object_type; + description + "An encryption or signing algorithm using a keyed hash. These + may use XOR for encryption or an HMAC for signing and may + also refer to a data object that is neither signing nor + encrypting."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x0008"; + } + + identity TPM_ALG_XOR { + if-feature "tpm12 or tpm20"; + base tpm12; + base tpm20; + base hash; + base symmetric; + description + "The XOR encryption algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x000A"; + } + + identity TPM_ALG_SHA256 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The SHA-256 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10118-3. ALG_ID: 0x000B"; + } + + identity TPM_ALG_SHA384 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The SHA-384 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10118-3. ALG_ID: 0x000C"; + } + + identity TPM_ALG_SHA512 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The SHA-512 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10118-3. ALG_ID: 0x000D"; + } + + identity TPM_ALG_NULL { + if-feature "tpm20"; + base tpm20; + description + "Null algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x0010"; + } + + identity TPM_ALG_SM3_256 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The ShangMi 3 (SM3) hash algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10118-3:2018. ALG_ID: 0x0012"; + } + + identity TPM_ALG_SM4 { + if-feature "tpm20"; + base tpm20; + base symmetric; + description + "ShangMi 4 (SM4) symmetric block cipher."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x0013"; + } + + identity TPM_ALG_RSASSA { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + description + "Signature algorithm defined in Section 8.2 + (RSASSA-PKCS1-v1_5) of RFC 8017."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8017. ALG_ID: 0x0014"; + } + + identity TPM_ALG_RSAES { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base encryption_mode; + description + "Signature algorithm defined in Section 7.2 + (RSAES-PKCS1-v1_5) of RFC 8017."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8017. ALG_ID: 0x0015"; + } + + identity TPM_ALG_RSAPSS { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + description + "Padding algorithm defined in Section 8.1 (RSASSA-PSS) + of RFC 8017."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8017. ALG_ID: 0x0016"; + } + + identity TPM_ALG_OAEP { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base encryption_mode; + description + "Padding algorithm defined in Section 7.1 (RSAES-OAEP) + of RFC 8017."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8017. ALG_ID: 0x0017"; + } + + identity TPM_ALG_ECDSA { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + description + "Signature algorithm using elliptic curve cryptography (ECC)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 14888-3. ALG_ID: 0x0018"; + } + + identity TPM_ALG_ECDH { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base method; + description + "Secret sharing using ECC."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-56A. ALG_ID: 0x0019"; + } + + identity TPM_ALG_ECDAA { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + base anonymous_signing; + description + "Elliptic-curve-based, anonymous signing scheme."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + TCG TPM 2.0 Library. ALG_ID: 0x001A"; + } + + identity TPM_ALG_SM2 { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + base encryption_mode; + base method; + description + "SM2 - depending on context, either an elliptic-curve based, + signature algorithm, an encryption scheme, or a key exchange + protocol."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x001B"; + } + + identity TPM_ALG_ECSCHNORR { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + description + "Elliptic-curve-based Schnorr signature."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3. + ALG_ID: 0x001C"; + } + + identity TPM_ALG_ECMQV { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base method; + description + "Two-phase elliptic-curve key."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-56A. ALG_ID: 0x001D"; + } + + identity TPM_ALG_KDF1_SP800_56A { + if-feature "tpm20"; + base tpm20; + base hash; + base method; + description + "Concatenation key derivation function."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-56A (approved alternative1) Section 5.8.1. + ALG_ID: 0x0020"; + } + + identity TPM_ALG_KDF2 { + if-feature "tpm20"; + base tpm20; + base hash; + base method; + description + "Key derivation function."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + IEEE 1363a-2004, KDF2, Section 13.2. ALG_ID: 0x0021"; + } + + identity TPM_ALG_KDF1_SP800_108 { + base TPM_ALG_KDF2; + description + "A key derivation method."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3 and + NIST SP800-108, Section 4.1, KDF. ALG_ID: 0x0022"; + } + + identity TPM_ALG_ECC { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base object_type; + description + "Prime field ECC."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 15946-1. ALG_ID: 0x0023"; + } + + identity TPM_ALG_SYMCIPHER { + if-feature "tpm20"; + base tpm20; + base symmetric; + base object_type; + description + "Object type for a symmetric block cipher."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + TCG TPM 2.0 Library. ALG_ID: 0x0025"; + } + + identity TPM_ALG_CAMELLIA { + if-feature "tpm20"; + base tpm20; + base symmetric; + description + "The Camellia algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 18033-3. ALG_ID: 0x0026"; + } + + identity TPM_ALG_SHA3_256 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "ISO/IEC 10118-3 - the SHA-256 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST FIPS 202. ALG_ID: 0x0027"; + } + + identity TPM_ALG_SHA3_384 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The SHA-384 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST FIPS 202. ALG_ID: 0x0028"; + } + + identity TPM_ALG_SHA3_512 { + if-feature "tpm20"; + base tpm20; + base hash; + description + "The SHA-512 algorithm."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST FIPS 202. ALG_ID: 0x0029"; + } + + identity TPM_ALG_CMAC { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + description + "Block Cipher-based Message Authentication Code (CMAC)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 9797-1:2011, Algorithm 5. ALG_ID: 0x003F"; + } + + identity TPM_ALG_CTR { + if-feature "tpm20"; + base tpm20; + base symmetric; + base encryption_mode; + description + "Counter mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10116. ALG_ID: 0x0040"; + } + + identity TPM_ALG_OFB { + base tpm20; + base symmetric; + base encryption_mode; + description + "Output Feedback mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10116. ALG_ID: 0x0041"; + } + + identity TPM_ALG_CBC { + if-feature "tpm20"; + base tpm20; + base symmetric; + base encryption_mode; + description + "Cipher Block Chaining mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10116. ALG_ID: 0x0042"; + } + + identity TPM_ALG_CFB { + if-feature "tpm20"; + base tpm20; + base symmetric; + base encryption_mode; + description + "Cipher Feedback mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10116. ALG_ID: 0x0043"; + } + + identity TPM_ALG_ECB { + if-feature "tpm20"; + base tpm20; + base symmetric; + base encryption_mode; + description + "Electronic Codebook mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + ISO/IEC 10116. ALG_ID: 0x0044"; + } + + identity TPM_ALG_CCM { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + base encryption_mode; + description + "Counter with Cipher Block Chaining--Message Authentication + Code (CCM)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-38C. ALG_ID: 0x0050"; + } + + identity TPM_ALG_GCM { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + base encryption_mode; + description + "Galois/Counter Mode (GCM)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-38D. ALG_ID: 0x0051"; + } + + identity TPM_ALG_KW { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + base encryption_mode; + description + "AES Key Wrap (KW)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-38F. ALG_ID: 0x0052"; + } + + identity TPM_ALG_KWP { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + base encryption_mode; + description + "AES Key Wrap with Padding (KWP)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-38F. ALG_ID: 0x0053"; + } + + identity TPM_ALG_EAX { + if-feature "tpm20"; + base tpm20; + base symmetric; + base signing; + base encryption_mode; + description + "Authenticated-Encryption Mode."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + NIST SP800-38F. ALG_ID: 0x0054"; + } + + identity TPM_ALG_EDDSA { + if-feature "tpm20"; + base tpm20; + base asymmetric; + base signing; + description + "Edwards-curve Digital Signature Algorithm (PureEdDSA)."; + reference + "TCG-Algos: TCG Algorithm Registry, Rev1.34, Table 3, and + RFC 8032. ALG_ID: 0x0060"; + } +} diff --git a/standard/ietf/RFC/ietf-tpm-remote-attestation.yang b/standard/ietf/RFC/ietf-tpm-remote-attestation.yang new file mode 120000 index 000000000..68a3e86b2 --- /dev/null +++ b/standard/ietf/RFC/ietf-tpm-remote-attestation.yang @@ -0,0 +1 @@ +ietf-tpm-remote-attestation@2024-12-05.yang \ No newline at end of file diff --git a/standard/ietf/RFC/ietf-tpm-remote-attestation@2024-12-05.yang b/standard/ietf/RFC/ietf-tpm-remote-attestation@2024-12-05.yang new file mode 100644 index 000000000..aa80900ec --- /dev/null +++ b/standard/ietf/RFC/ietf-tpm-remote-attestation@2024-12-05.yang @@ -0,0 +1,1183 @@ +module ietf-tpm-remote-attestation { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang" + + ":ietf-tpm-remote-attestation"; + prefix tpm; + + import ietf-yang-types { + prefix yang; + } + import ietf-hardware { + prefix hw; + } + import ietf-keystore { + prefix ks; + } + import ietf-tcg-algs { + prefix taa; + } + + organization + "IETF RATS (Remote ATtestation procedureS) Working Group"; + contact + "WG Web : + WG List : + Author : Eric Voit + Author : Henk Birkholz + Author : Michael Eckel + Author : Shwetha Bhandari + Author : Bill Sulzen + Author : Liang Xia (Frank) + Author : Tom Laffey + Author : Guy C. Fedorkow "; + description + "A YANG module to enable remote attestation procedures based + on TPM 1.2 and TPM 2.0 using a challenge-response + interaction model and the Quote primitive operations defined + by TPM 1.2 and TPM 2.0. + + 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 9684; see the + RFC itself for full legal notices."; + + revision 2024-12-05 { + description + "Initial version"; + reference + "RFC 9684: A YANG Data Model for Challenge-Response-Based + Remote Attestation (CHARRA) Procedures Using Trusted Platform + Modules (TPMs)"; + } + + /*****************/ + /* Features */ + /*****************/ + + feature mtpm { + description + "The device supports the remote attestation of multiple + TPM-based cryptoprocessors."; + } + + feature bios { + description + "The device supports the BIOS logs."; + reference + "BIOS-Log: + TCG PC Client Platform Firmware Profile Specification, + https://trustedcomputinggroup.org/wp-content/uploads/ + TCG-PC-Client-Platform-Firmware-Profile-Version-1.06- + Revision-52_pub-2.pdf, Section 10.4.5.2"; + } + + feature ima { + description + "The device supports Integrity Measurement Architecture logs. + Many variants of IMA logs exist in the deployment. Each + encodes the log entry contents as the specific measurements + that get hashed into a PCRs as Evidence. See the reference + below for one example of such an encoding."; + reference + "CEL: + Canonical Event Log Format, + https://www.trustedcomputinggroup.org/wp-content/uploads/ + TCG_IWG_CEL_v1_r0p41_pub.pdf, Section 5.1.6"; + } + + feature netequip_boot { + description + "The device supports the netequip_boot logs."; + reference + "RFC 9684: A YANG Data Model for Challenge-Response-Based + Remote Attestation (CHARRA) Procedures Using Trusted Platform + Modules (TPMs), Appendix B"; + } + + /*****************/ + /* Typedefs */ + /*****************/ + + typedef pcr { + type uint8 { + range "0..31"; + } + description + "Valid index number for a PCR. A PCR index compliant with + TPM 2.0 extends from 0-31. At this time, a typical TPM would + have no more than 32 PCRs."; + } + + typedef compute-node-ref { + type leafref { + path "/tpm:rats-support-structures/tpm:compute-nodes" + + "/tpm:compute-node/tpm:node-id"; + } + description + "This type is used to reference a hardware node. Note that an + implementer might include an alternative leafref pointing to a + different YANG module node specifying hardware structures."; + } + + typedef certificate-name-ref { + type leafref { + path "/tpm:rats-support-structures/tpm:tpms/tpm:tpm" + + "/tpm:certificates/tpm:certificate/tpm:name"; + } + description + "A type that allows identification of a TPM-based + certificate."; + } + + /******************/ + /* Identities */ + /******************/ + + identity attested_event_log_type { + description + "Base identity allowing categorization of the reasons why an + attested measurement has been taken on an Attester."; + } + + identity ima { + base attested_event_log_type; + description + "An event type recorded in IMA."; + } + + identity bios { + base attested_event_log_type; + description + "An event type associated with BIOS/UEFI."; + } + + identity netequip_boot { + base attested_event_log_type; + description + "An event type associated with Network Equipment Boot."; + } + + /*****************/ + /* Groupings */ + /*****************/ + + grouping tpm20-hash-algo { + description + "The cryptographic algorithm used to hash the PCRs compliant + with TPM 2.0. This must be from the list of platform- + supported options."; + leaf tpm20-hash-algo { + type identityref { + base taa:hash; + } + must '. = /tpm:rats-support-structures' + + '/tpm:attester-supported-algos/tpm:tpm20-hash' { + error-message "This platform does not support " + + "tpm20-hash-algo"; + } + description + "The hash scheme that is used to hash a PCR compliant with + TPM 2.0. This must be one of those supported by a platform. + Where this object does not appear, the default value of + 'taa:TPM_ALG_SHA256' will apply."; + } + } + + grouping tpm12-hash-algo { + description + "The cryptographic algorithm used to hash the PCRs compliant + with TPM 1.2."; + leaf tpm12-hash-algo { + type identityref { + base taa:hash; + } + must '. = /tpm:rats-support-structures' + + '/tpm:attester-supported-algos/tpm:tpm12-hash' { + error-message "This platform does not support " + + "tpm12-hash-algo"; + } + description + "The hash scheme that is used to hash a PCR compliant with + TPM 1.2. This MUST be one of those supported by a platform. + Where this object does not appear, the default value of + 'taa:TPM_ALG_SHA1' will apply."; + } + } + + grouping nonce { + description + "A random number intended to guarantee freshness and for use + as part of a replay-detection mechanism."; + leaf nonce-value { + type binary; + mandatory true; + description + "A cryptographically generated random number that should + not be predictable prior to its issuance from a random + number generation function. The random number MUST be + derived from an entropy source external to the Attester. + + Note that a nonce sent into a TPM will typically be 160 or + 256 binary digits long. (This is 20 or 32 bytes.) So if + fewer binary digits are sent, this nonce object will be + padded with leading zeros within Quotes returned from the + TPM. Additionally, if more bytes are sent, the nonce will + be trimmed to the most significant binary digits."; + } + } + + grouping tpm12-pcr-selection { + description + "A Verifier can request one or more PCR values using its + individually created Attestation Key Certificate (AC). + The corresponding selection filter is represented in this + grouping."; + leaf-list pcr-index { + type pcr; + description + "The numbers/indexes of the PCRs. In addition, any selection + of PCRs MUST verify that the set of PCRs requested are a + subset of the set of PCRs exposed in the leaf-list + /tpm:rats-support-structures + /tpm:tpms/tpm:tpm[name=current()]/tpm:tpm12-pcrs"; + } + } + + grouping tpm20-pcr-selection { + description + "A Verifier can acquire one or more PCR values, which are + hashed together in a TPM2B_DIGEST coming from the TPM2. + The selection list of desired PCRs and the hash algorithm + is represented in this grouping."; + list tpm20-pcr-selection { + unique "tpm20-hash-algo"; + description + "Specifies the list of PCRs and hash algorithms that can be + returned within a TPM2B_DIGEST."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 10.9.7"; + uses tpm20-hash-algo; + leaf-list pcr-index { + type pcr; + description + "The numbers of the PCRs that are being tracked + with a hash based on the tpm20-hash-algo. In addition, + any selection of PCRs MUST verify that the set of PCRs + requested are a subset of the set of selected PCR indexes + available for that specific TPM."; + } + } + } + + grouping certificate-name-ref { + description + "Identifies a certificate in a keystore."; + leaf certificate-name { + type certificate-name-ref; + mandatory true; + description + "Identifies a certificate in a keystore."; + } + } + + grouping tpm-name { + description + "A unique TPM on a device."; + leaf name { + type string; + description + "Unique system-generated name for a TPM on a device."; + } + } + + grouping node-uptime { + description + "Uptime in seconds of the node."; + leaf up-time { + type uint32; + description + "Uptime in seconds of this node reporting its data."; + } + } + + grouping tpm12-attestation { + description + "Contains an instance of cryptoprocessor measurements signed + according to TPM 1.2. It is supplemented by unsigned + Attester information."; + uses node-uptime; + leaf pcr-data { + type binary; + description + "The value created and signed for the quote + (type TPM_PCR_INFO_SHORT), i.e., the 'pcrData' part of + a TPM1.2 Quote2 operation result."; + reference + "TPM1.2-Commands: + TPM Main Part 3 Commands, Rev116, + https://trustedcomputinggroup.org/wp-content/uploads + /TPM-Main-Part-3-Commands_v1.2_rev116_01032011.pdf, + Section 16.5"; + } + leaf version-info { + type binary; + description + "The version info (type TPM_CAP_VERSION_INFO), + i.e., the 'versionInfo' part of a TPM1.2 Quote2 + operation result."; + reference + "TPM1.2-Commands: + TPM Main Part 3 Commands, Rev116, + https://trustedcomputinggroup.org/wp-content/uploads + /TPM-Main-Part-3-Commands_v1.2_rev116_01032011.pdf, + Section 16.5"; + } + leaf sig { + type binary; + description + "The signature generated across the signed data, + i.e., the 'sig' part of a TPM1.2 Quote2 operation + result."; + reference + "TPM1.2-Commands: + TPM Main Part 3 Commands, Rev116, + https://trustedcomputinggroup.org/wp-content/uploads + /TPM-Main-Part-3-Commands_v1.2_rev116_01032011.pdf, + Section 16.5"; + } + } + + grouping tpm20-attestation { + description + "Contains an instance of cryptoprocessor measurements signed + according to TPM 2.0. It is supplemented by unsigned + Attester information."; + leaf quote-data { + type binary; + mandatory true; + description + "A hash of the latest PCR values (and the hash algorithm + used) that have been returned from an Attester for the + selected PCRs and hash algorithms."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 10.12.1"; + } + leaf quote-signature { + type binary; + description + "Quote signature returned by TPM Quote. The signature was + generated using the key associated with the + certificate 'name'."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 11.2.1"; + } + uses node-uptime; + list unsigned-pcr-values { + description + "PCR values in each PCR bank. This might appear redundant + with the TPM2B_DIGEST, but that digest is calculated across + multiple PCRs. Having to verify across multiple PCRs does + not necessarily make it easy for a Verifier to appraise just + the minimum set of PCR information that has changed since + the last received TPM2B_DIGEST. Put another way, why should + a Verifier reconstruct the proper value of all PCR Quotes + when only a single PCR has changed? + To help this happen, if the Attester does know specific PCR + values, the Attester can provide these individual values via + 'unsigned-pcr-values'. By comparing this information to + what has previously been validated, it is possible for a + Verifier to confirm the Attester's signature while + eliminating significant processing. Note that there should + never be a result where an unsigned PCR value differs from + what may be reconstructed from within the PCR quote and + the event logs. + If there is a difference, a signed result that has been + verified from retrieved logs is considered definitive."; + uses tpm20-hash-algo; + list pcr-values { + key "pcr-index"; + description + "List of one PCR bank."; + leaf pcr-index { + type pcr; + description + "PCR index number."; + } + leaf pcr-value { + type binary; + description + "PCR value."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 10.9.7"; + } + } + } + } + + grouping log-identifier { + description + "Identifier for type of log to be retrieved."; + leaf log-type { + type identityref { + base attested_event_log_type; + } + mandatory true; + description + "The corresponding identity of the measurement log type."; + } + } + + grouping boot-event-log { + description + "Defines a specific instance of an event log entry + and corresponding to the information used to + extend the PCR."; + leaf event-number { + type uint32; + description + "Unique event number of this event, which monotonically + increases within a given event log. The maximum event + number should not be reached, nor is wrapping back to + an earlier number supported."; + } + leaf event-type { + type uint32; + description + "BIOS log event type."; + reference + "BIOS-Log: + TCG PC Client Platform Firmware Profile Specification, + https://trustedcomputinggroup.org/wp-content/uploads/ + TCG-PC-Client-Platform-Firmware-Profile-Version-1.06- + Revision-52_pub-2.pdf, Section 10.4.1"; + } + leaf pcr-index { + type pcr; + description + "Defines the PCR index that this event extended."; + } + list digest-list { + description + "Hash of event data."; + leaf hash-algo { + type identityref { + base taa:hash; + } + description + "The hash scheme that is used to compress the event data in + each of the leaf-list digest items."; + } + leaf-list digest { + type binary; + description + "The hash of the event data using the algorithm of the + 'hash-algo' against 'event data'."; + } + } + leaf event-size { + type uint32; + description + "Size of the event data."; + } + leaf-list event-data { + type binary; + description + "The event data. This is a binary structure + of size 'event-size'. For more on what + might be recorded within this object + see BIOS-Log, Section 10, which details + viable events that might be recorded."; + reference + "BIOS-Log: + TCG PC Client Platform Firmware Profile Specification, + https://trustedcomputinggroup.org/wp-content/uploads/ + TCG-PC-Client-Platform-Firmware-Profile-Version-1.06- + Revision-52_pub-2.pdf, Section 10"; + } + } + + grouping bios-event-log { + description + "Measurement log created by the BIOS/UEFI."; + list bios-event-entry { + key "event-number"; + description + "Ordered list of the TCG-described event log + that extended the PCRs in the order they + were logged."; + uses boot-event-log; + } + } + + grouping ima-event { + description + "Defines a hash log extend event for IMA measurements."; + reference + "CEL: + Canonical Event Log Format, + https://www.trustedcomputinggroup.org/wp-content/uploads/ + TCG_IWG_CEL_v1_r0p41_pub.pdf, Section 4.3"; + leaf event-number { + type uint64; + description + "Unique event number of this event, which monotonically + increases. The maximum event number should not be + reached, nor is wrapping back to an earlier number + supported."; + } + leaf ima-template { + type string; + description + "Name of the template used for event logs, + e.g., ima, ima-ng, ima-sig."; + } + leaf filename-hint { + type string; + description + "File name (including the path) that was measured."; + } + leaf filedata-hash { + type binary; + description + "Hash of filedata as updated based upon the + filedata-hash-algorithm."; + } + leaf filedata-hash-algorithm { + type string; + description + "Algorithm used for filedata-hash."; + } + leaf template-hash-algorithm { + type string; + description + "Algorithm used for template-hash."; + } + leaf template-hash { + type binary; + description + "hash(filedata-hash, filename-hint)"; + } + leaf pcr-index { + type pcr; + description + "Defines the PCR index that this event extended."; + } + leaf signature { + type binary; + description + "Digital file signature that provides a + fingerprint for the file being measured."; + } + } + + grouping ima-event-log { + description + "Measurement log created by IMA."; + list ima-event-entry { + key "event-number"; + description + "Ordered list of IMA event logs by event-number."; + uses ima-event; + } + } + + grouping network-equipment-boot-event-log { + description + "Measurement log created by Network Equipment Boot. The + Network Equipment Boot format is identical to the IMA + format. In contrast to the IMA log, the Network Equipment + Boot log includes every measurable event from an Attester, + including the boot stages of BIOS, Bootloader, etc. In + essence, the scope of events represented in this format + combines the scope of BIOS events and IMA events."; + list boot-event-entry { + key "event-number"; + description + "Ordered list of Network Equipment Boot event logs + by event-number, using the IMA event format."; + uses ima-event; + } + } + + grouping event-logs { + description + "A selector for the log and its type."; + choice attested_event_log_type { + mandatory true; + description + "Event log type determines the event log's content."; + case bios { + if-feature "bios"; + description + "BIOS/UEFI event logs."; + container bios-event-logs { + description + "BIOS/UEFI event logs."; + uses bios-event-log; + } + } + case ima { + if-feature "ima"; + description + "IMA event logs."; + container ima-event-logs { + description + "IMA event logs."; + uses ima-event-log; + } + } + case netequip_boot { + if-feature "netequip_boot"; + description + "Network Equipment Boot event logs."; + container boot-event-logs { + description + "Network Equipment Boot event logs."; + uses network-equipment-boot-event-log; + } + } + } + } + + /**********************/ + /* RPC operations */ + /**********************/ + + rpc tpm12-challenge-response-attestation { + if-feature "taa:tpm12"; + description + "This RPC accepts the input for TSS TPM 1.2 commands made to + the attesting device."; + input { + container tpm12-attestation-challenge { + description + "This container includes every information element defined + in the reference challenge-response interaction model for + remote attestation. Corresponding values are based on + TPM 1.2 structure definitions"; + uses tpm12-pcr-selection; + uses nonce; + leaf-list certificate-name { + if-feature "tpm:mtpm"; + type certificate-name-ref; + must "/tpm:rats-support-structures/tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm12']" + + "/tpm:certificates/" + + "/tpm:certificate[name=current()]" { + error-message "Not an available TPM1.2 AIK certificate."; + } + description + "When populated, the RPC will only get a Quote for the + TPMs associated with these certificate(s)."; + } + } + } + output { + list tpm12-attestation-response { + unique "certificate-name"; + description + "The binary output of TPM 1.2 TPM_Quote/TPM_Quote2, + including the PCR selection and other associated + attestation evidence metadata."; + uses certificate-name-ref { + description + "Certificate associated with this tpm12-attestation."; + } + uses tpm12-attestation; + } + } + } + + rpc tpm20-challenge-response-attestation { + if-feature "taa:tpm20"; + description + "This RPC accepts the input for TSS TPM 2.0 commands of the + managed device. Composite devices may contain several TPMs; + /hardware/component/physical-index from the hardware + management YANG module is used to refer to dedicated TPMs in + composite devices; however, devices without TPMs are not + covered."; + input { + container tpm20-attestation-challenge { + description + "This container includes every information element defined + in the reference challenge-response interaction model for + remote attestation. Corresponding values are based on + TPM 2.0 structure definitions."; + uses nonce; + uses tpm20-pcr-selection; + leaf-list certificate-name { + if-feature "tpm:mtpm"; + type certificate-name-ref; + must "/tpm:rats-support-structures/tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm20']" + + "/tpm:certificates/" + + "/tpm:certificate[name=current()]" { + error-message "Not an available TPM2.0 AIK certificate."; + } + description + "When populated, the RPC will only get a Quote for the + TPMs associated with the certificates."; + } + } + } + output { + list tpm20-attestation-response { + unique "certificate-name"; + description + "The binary output of TPM2_Quote from one TPM of the + node which is identified by node-id: an attestation + structure (TPMS_ATTEST), including a length, and a + signature (TPMT_SIGNATURE) over that structure."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 10.12.12"; + uses certificate-name-ref { + description + "Certificate associated with this tpm20-attestation."; + } + uses tpm20-attestation; + } + } + } + + rpc log-retrieval { + description + "Log entries are identified either via indices or by providing + the last line received. The number of lines returned can be + limited. The type of log is a choice that can be augmented."; + input { + uses log-identifier; + list log-selector { + description + "Only log entries that meet all of the provided selection + criteria are to be returned by the RPC output."; + leaf-list name { + type string; + description + "Name of one or more unique TPMs on a device. If this + object exists, a selection should pull only the objects + related to these TPM(s). If it does not exist, all + qualifying TPMs that are 'hardware-based' equals true + on the device are selected. When this selection + criteria is provided, it will be considered as a logical + AND with any other selection criteria provided."; + } + choice index-type { + description + "Last log entry received, log index number, or + timestamp."; + case last-entry { + description + "The last entry of the log already retrieved."; + leaf last-entry-value { + type binary; + description + "Content of a log event that matches 1:1 with a + unique event record contained within the log. Log + entries after this will be passed to the + requester. Note: if log entry values are not + unique, this MUST return an error."; + } + } + case index { + description + "Numeric index of the last log entry retrieved, or + zero."; + leaf last-index-number { + type uint64; + description + "The last numeric index number of a log entry. + Zero means to start at the beginning of the log. + Entries after this will be passed to the + requester."; + } + } + case timestamp { + leaf timestamp { + type yang:date-and-time; + description + "Timestamp from which to start the extraction. The + next log entry after this timestamp is to + be sent."; + } + description + "Timestamp from which to start the extraction."; + } + } + leaf log-entry-quantity { + type uint16; + description + "The number of log entries to be returned. If omitted, it + means all of them."; + } + } + } + output { + container system-event-logs { + description + "The requested data of the measurement event logs."; + list node-data { + unique "name"; + description + "Event logs of a node in a distributed system + identified by the node name."; + uses tpm-name; + uses node-uptime; + container log-result { + description + "The requested entries of the corresponding log."; + uses event-logs; + } + } + } + } + } + + /****************************************/ + /* Config and Oper accessible nodes */ + /****************************************/ + + container rats-support-structures { + description + "The datastore definition enabling Verifiers or Relying + Parties to discover the information necessary to use the + remote attestation RPCs appropriately."; + container compute-nodes { + if-feature "tpm:mtpm"; + description + "Holds the set of device subsystems/components in this + composite device that support TPM operations."; + list compute-node { + key "node-id"; + unique "node-name"; + config false; + min-elements 2; + description + "A component within this composite device that + supports TPM operations."; + leaf node-id { + type string; + description + "ID of the compute node, such as Board Serial Number."; + } + leaf node-physical-index { + if-feature "hw:entity-mib"; + type int32 { + range "1..2147483647"; + } + config false; + description + "The entPhysicalIndex for the compute node."; + reference + "RFC 6933: Entity MIB (Version 4) - entPhysicalIndex"; + } + leaf node-name { + type string; + description + "Name of the compute node."; + } + leaf node-location { + type string; + description + "Location of the compute node, such as slot number."; + } + } + } + container tpms { + description + "Holds the set of TPMs within an Attester."; + list tpm { + key "name"; + unique "path"; + description + "A list of TPMs in this composite device that RATS + can be conducted with."; + uses tpm-name; + leaf hardware-based { + type boolean; + config false; + mandatory true; + description + "System-generated indication of whether this is a + hardware-based TPM."; + } + leaf physical-index { + if-feature "hw:entity-mib"; + type int32 { + range "1..2147483647"; + } + config false; + description + "The entPhysicalIndex for the TPM."; + reference + "RFC 6933: Entity MIB (Version 4) - entPhysicalIndex"; + } + leaf path { + type string; + config false; + description + "Device path to a unique TPM on a device. This can + change across reboots."; + } + leaf compute-node { + if-feature "tpm:mtpm"; + type compute-node-ref; + config false; + mandatory true; + description + "Indicates the compute node measured by this TPM."; + } + leaf manufacturer { + type string; + config false; + description + "TPM manufacturer name."; + } + leaf firmware-version { + type identityref { + base taa:cryptoprocessor; + } + mandatory true; + description + "Identifies the cryptoprocessor API set supported. This + is automatically configured by the device and should not + be changed."; + } + uses tpm12-hash-algo { + when "derived-from-or-self(firmware-version, 'taa:tpm12')"; + if-feature "taa:tpm12"; + refine "tpm12-hash-algo" { + description + "The hash algorithm overwrites the default used for + PCRs on this TPM1.2-compliant cryptoprocessor."; + } + } + leaf-list tpm12-pcrs { + when "derived-from-or-self(../firmware-version, " + + "'taa:tpm12')"; + if-feature "taa:tpm12"; + type pcr; + description + "The PCRs that may be extracted from this TPM1.2- + compliant cryptoprocessor."; + } + list tpm20-pcr-bank { + when "derived-from-or-self(../firmware-version, " + + "'taa:tpm20')"; + if-feature "taa:tpm20"; + key "tpm20-hash-algo"; + description + "Specifies the list of PCRs that may be extracted for + a specific hash algorithm on this TPM2-compliant + cryptoprocessor. A bank is a set of PCRs that are + extended using a particular hash algorithm."; + reference + "TPM2.0-Structures: + Trusted Platform Module Library Part 2: Structures, + Revision 01.83, https://trustedcomputinggroup.org/ + wp-content/uploads/TPM-2.0-1.83-Part-2-Structures.pdf, + Section 10.9.7"; + leaf tpm20-hash-algo { + type identityref { + base taa:hash; + } + must '/tpm:rats-support-structures' + + '/tpm:attester-supported-algos' + + '/tpm:tpm20-hash' { + error-message "This platform does not support " + + "tpm20-hash-algo"; + } + description + "The hash scheme actively being used to hash + one or more TPM2.0 PCRs."; + } + leaf-list pcr-index { + type tpm:pcr; + description + "Defines which TPM2.0 PCRs are available to be + extracted."; + } + } + leaf status { + type enumeration { + enum operational { + value 0; + description + "The TPM currently is running normally and + is ready to accept and process TPM quotes."; + reference + "TPM2.0-Arch: Trusted Platform Module Library + Part 1: Architecture, + https://trustedcomputinggroup.org/wp-content/ + uploads/TPM-2.0-1.83-Part-1-Architecture.pdf, + Section 12"; + } + enum non-operational { + value 1; + description + "TPM is in a state such as startup or shutdown, which + precludes the processing of TPM quotes."; + } + } + config false; + mandatory true; + description + "TPM chip self-test status."; + } + container certificates { + description + "The TPM's certificates, including EK Certificates + and Attestation Key Certificates."; + list certificate { + key "name"; + description + "Three types of certificates can be accessed via + this statement, including Initial Attestation + Key Certificate, Local Attestation Key Certificate, or + Endorsement Key Certificate."; + leaf name { + type string; + description + "An arbitrary name uniquely identifying a certificate + associated with a key within a TPM."; + } + leaf keystore-ref { + if-feature "ks:central-keystore-supported"; + if-feature "ks:asymmetric-keys"; + type leafref { + path "/ks:keystore/ks:asymmetric-keys" + + "/ks:asymmetric-key/ks:name"; + } + description + "A reference to a specific certificate of an + asymmetric key in the keystore."; + } + leaf type { + type enumeration { + enum endorsement-certificate { + value 0; + description + "Endorsement Key (EK) Certificate type."; + reference + "TPM2.0-Key: + TPM 2.0 Keys for Device Identity and Attestation + https://trustedcomputinggroup.org/wp-content/ + uploads/TPM-2p0-Keys-for-Device-Identity- + and-Attestation_v1_r12_pub10082021.pdf, + Section 3.11"; + } + enum initial-attestation-certificate { + value 1; + description + "Initial Attestation Key (IAK) Certificate + type."; + reference + "TPM2.0-Key: + TPM 2.0 Keys for Device Identity and Attestation + https://trustedcomputinggroup.org/wp-content/ + uploads/TPM-2p0-Keys-for-Device-Identity- + and-Attestation_v1_r12_pub10082021.pdf, + Section 3.2"; + } + enum local-attestation-certificate { + value 2; + description + "Local Attestation Key (LAK) Certificate type."; + reference + "TPM2.0-Key: + TPM 2.0 Keys for Device Identity and Attestation + https://trustedcomputinggroup.org/wp-content/ + uploads/TPM-2p0-Keys-for-Device-Identity- + and-Attestation_v1_r12_pub10082021.pdf, + Section 3.2"; + } + } + description + "Function supported by this certificate from within + the TPM."; + } + } + } + } + } + container attester-supported-algos { + description + "Identifies which TPM algorithms are available for use on an + attesting platform."; + leaf-list tpm12-asymmetric-signing { + when "../../tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm12']"; + if-feature "taa:tpm12"; + type identityref { + base taa:asymmetric; + } + description + "Platform-supported TPM1.2 asymmetric algorithms."; + } + leaf-list tpm12-hash { + when "../../tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm12']"; + if-feature "taa:tpm12"; + type identityref { + base taa:hash; + } + description + "Platform-supported TPM1.2 hash algorithms."; + } + leaf-list tpm20-asymmetric-signing { + when "../../tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm20']"; + if-feature "taa:tpm20"; + type identityref { + base taa:asymmetric; + } + description + "Platform-supported TPM2.0 asymmetric algorithms."; + } + leaf-list tpm20-hash { + when "../../tpm:tpms" + + "/tpm:tpm[tpm:firmware-version='taa:tpm20']"; + if-feature "taa:tpm20"; + type identityref { + base taa:hash; + } + description + "Platform-supported TPM2.0 hash algorithms."; + } + } + } +}