From da0b16ec175df9670bd05d88e174cae29a4a1e56 Mon Sep 17 00:00:00 2001 From: Joe Clarke Date: Sun, 6 Oct 2024 13:05:57 -0400 Subject: [PATCH] yc.o sync (#1588) * Cronjob - daily check of IETF modules. --------- Co-authored-by: Miroslav Kovac --- ... => ietf-system-datastore@2024-09-29.yang} | 4 +- .../ietf-system-secure-tacacs@2024-05-23.yang | 105 ++---- standard/iana/yang-parameters.xml | 10 +- .../ietf/RFC/ietf-microwave-topology.yang | 1 + .../ietf-microwave-topology@2024-09-30.yang | 318 ++++++++++++++++++ 5 files changed, 362 insertions(+), 76 deletions(-) rename experimental/ietf-extracted-YANG-modules/{ietf-system-datastore@2024-06-18.yang => ietf-system-datastore@2024-09-29.yang} (95%) create mode 120000 standard/ietf/RFC/ietf-microwave-topology.yang create mode 100644 standard/ietf/RFC/ietf-microwave-topology@2024-09-30.yang diff --git a/experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-06-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-09-29.yang similarity index 95% rename from experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-06-18.yang rename to experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-09-29.yang index d438f733b..d92998423 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-06-18.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-system-datastore@2024-09-29.yang @@ -23,7 +23,7 @@ module ietf-system-datastore { "; description "This module defines a new YANG identity that uses the - ds:datastore identity defined in [RFC8342]. + ds:conventional identity defined in [RFC8342]. Copyright (c) 2024 IETF Trust and the persons identified as authors of the code. All rights reserved. @@ -39,7 +39,7 @@ module ietf-system-datastore { (https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself for full legal notices."; - revision 2024-06-18 { + revision 2024-09-29 { description "Initial version."; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-system-secure-tacacs@2024-05-23.yang b/experimental/ietf-extracted-YANG-modules/ietf-system-secure-tacacs@2024-05-23.yang index 2b1467456..492b5353e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-system-secure-tacacs@2024-05-23.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-system-secure-tacacs@2024-05-23.yang @@ -258,7 +258,7 @@ module ietf-system-secure-tacacs { and requested by the TLS server when establishing a TLS session, these credentials are passed in the Certificate message."; - choice ref-or-explicit { + choice ref-or-explicit { description "A choice between a reference of explicit configuration."; case ref { @@ -347,11 +347,10 @@ module ietf-system-secure-tacacs { using configured external PSKs."; } } - grouping server-authentication-with-ref { description "Specifies how the TLS client can authenticate TLS servers."; - choice ref-or-explicit { + choice ref-or-explicit { description "A choice between a reference of explicit configuration."; case ref { @@ -371,37 +370,6 @@ module ietf-system-secure-tacacs { } } - grouping test-peer-aliveness { - description - "Configures the keep-alive policy to proactively test - the aliveness of the TLS server. An unresponsive TLS - server is dropped after approximately max-wait - * max-attempts seconds."; - reference - "RFC 6520: Transport Layer Security (TLS) and Datagram - Transport Layer Security (DTLS) Heartbeat - Extension"; - leaf max-wait { - type uint16 { - range "1..max"; - } - units "seconds"; - default "30"; - description - "Sets the amount of time in seconds after which if no data - has been received from the TLS server, a TLS-level message - will be sent to test the aliveness of the TLS server."; - } - leaf max-attempts { - type uint8; - default "3"; - description - "Sets the maximum number of sequential keep-alive messages - that can fail to obtain a response from the TLS server - before assuming the TLS server is no longer alive."; - } - } - grouping hello-params { description "Configurable parameters for the TLS hello message."; @@ -424,32 +392,6 @@ module ietf-system-secure-tacacs { } } - grouping keepalives { - description - "Configures the keepalive policy for the TLS client."; - nacm:default-deny-write; - leaf peer-allowed-to-send { - type empty; - description - "Indicates that the remote TLS server is allowed to send - HeartbeatRequest messages to this TLS client."; - reference - "RFC 6520: Transport Layer Security (TLS) and Datagram - Transport Layer Security (DTLS) Heartbeat - Extension"; - } - container test-peer-aliveness { - presence "Indicates that the TLS client proactively tests the - aliveness of the remote TLS server."; - description - "Configures the keep-alive policy to proactively test the - aliveness of the TLS server. An unresponsive TLS server is - dropped after approximately max-wait * max-attempts - seconds."; - uses test-peer-aliveness; - } - } - grouping tls-client { description "A grouping for configuring a TLS client without any @@ -480,12 +422,6 @@ module ietf-system-secure-tacacs { "Configurable parameters for the TLS hello message."; uses hello-params; } - container keepalives { - if-feature "tlsc:tls-client-keepalives"; - description - "Configures the keepalive policy for the TLS client."; - uses keepalives; - } } grouping tcp-server-info { @@ -512,6 +448,38 @@ module ietf-system-secure-tacacs { } } + // currently not used + + grouping tls-grouping-reuse { + description + "A grouping for TLS with TLS1.2 and keepalive removed."; + uses tlsc:tls-client-grouping { + refine "client-identity/auth-type/tls12-psk" { + if-feature "not tlsc:client-ident-tls12-psk"; + } + refine "server-authentication/tls12-psks" { + if-feature "not tlsc:server-auth-tls12-psk"; + } + refine "hello-params/tls-versions/min" { + must "not(derived-from-or-self(current(), " + + "'tlscmn:tls12'))" { + error-message + "TLS 1.2 is not supported as min TLS version"; + } + } + refine "hello-params/tls-versions/max" { + must "not(derived-from-or-self(current(), " + + "'tlscmn:tls12'))" { + error-message + "TLS 1.2 is not supported as max TLS version"; + } + } + refine "keepalives" { + if-feature "not tlsc:tls-client-keepalives"; + } + } + } + augment "/sys:system/sys-tcs-plus:tacacs-plus" { description "A list of client credentials to be referenced."; @@ -571,9 +539,8 @@ module ietf-system-secure-tacacs { } } - augment - "/sys:system/sys-tcs-plus:tacacs-plus/sys-tcs-plus:server" - + "/sys-tcs-plus:security" { + augment "/sys:system/sys-tcs-plus:tacacs-plus/sys-tcs-plus:server" + + "/sys-tcs-plus:security" { description "Adds TLS case."; case tls { diff --git a/standard/iana/yang-parameters.xml b/standard/iana/yang-parameters.xml index 3265f82f5..05b641e60 100644 --- a/standard/iana/yang-parameters.xml +++ b/standard/iana/yang-parameters.xml @@ -4,7 +4,7 @@ YANG Parameters 2010-06-10 - 2024-09-27 + 2024-10-02 YANG Module Names @@ -1229,15 +1229,15 @@ and Subsequent Address Family Identi - + ietf-microwave-topology N - + ietf-microwave-topology@2024-09-30.yang urn:ietf:params:xml:ns:yang:ietf-microwave-topology mwt - - 's module file will be posted upon the document's publication as an RFC. + + ietf-microwave-types diff --git a/standard/ietf/RFC/ietf-microwave-topology.yang b/standard/ietf/RFC/ietf-microwave-topology.yang new file mode 120000 index 000000000..7942ba0a7 --- /dev/null +++ b/standard/ietf/RFC/ietf-microwave-topology.yang @@ -0,0 +1 @@ +ietf-microwave-topology@2024-09-30.yang \ No newline at end of file diff --git a/standard/ietf/RFC/ietf-microwave-topology@2024-09-30.yang b/standard/ietf/RFC/ietf-microwave-topology@2024-09-30.yang new file mode 100644 index 000000000..bc4cdc1ab --- /dev/null +++ b/standard/ietf/RFC/ietf-microwave-topology@2024-09-30.yang @@ -0,0 +1,318 @@ +module ietf-microwave-topology { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:ietf-microwave-topology"; + prefix mwt; + + import ietf-network { + prefix nw; + reference + "RFC 8345: A YANG Data Model for Network Topologies"; + } + import ietf-network-topology { + prefix nt; + reference + "RFC 8345: A YANG Data Model for Network Topologies"; + } + import ietf-te-topology { + prefix tet; + reference + "RFC 8795: YANG Data Model for Traffic Engineering + (TE) Topologies"; + } + import ietf-microwave-types { + prefix mw-types; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + + organization + "Internet Engineering Task Force (IETF) CCAMP WG"; + contact + "WG Web: + WG List: + + Editor: Jonas Ahlberg + + Editor: Scott Mansfield + + Editor: Min Ye + + Editor: Italo Busi + + Editor: Xi Li + + Editor: Daniela Spreafico + + "; + description + "This is a module for microwave topology. + + 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 9656; see + the RFC itself for full legal notices."; + + revision 2024-09-30 { + description + "Initial revision."; + reference + "RFC 9656: A YANG Data Model for Microwave Topology"; + } + + grouping rlt-mode { + description + "This grouping provides a flexible definition of the number + of bonded carriers and protecting carriers of a radio + link."; + leaf num-bonded-carriers { + type uint32; + mandatory true; + description + "Number of bonded carriers."; + } + leaf num-protecting-carriers { + type uint32; + mandatory true; + description + "Number of protecting carriers."; + } + } + + grouping microwave-radio-link-attributes { + description + "Grouping used for attributes describing a microwave + radio link."; + container rlt-mode { + description + "This grouping provides a flexible definition of the number + of bonded carriers and protecting carriers of a radio + link."; + uses rlt-mode; + } + } + + grouping microwave-carrier-attributes { + description + "Grouping used for attributes describing a microwave + carrier."; + leaf tx-frequency { + type uint32; + units "kHz"; + description + "Selected transmitter frequency. + Related to the data node tx-frequency in RFC 8561."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + leaf actual-rx-frequency { + type uint32; + units "kHz"; + config false; + description + "Computed receiver frequency. + Related to the data node actual-rx-frequency in RFC 8561."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + leaf channel-separation { + type uint32; + units "kHz"; + description + "The amount of bandwidth allocated to a carrier. The + distance between adjacent channels in a radio + frequency channel arrangement. + Related to the data node channel-separation in RFC 8561."; + reference + "ETSI EN 302 217-1 and + RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + leaf actual-tx-cm { + type identityref { + base mw-types:coding-modulation; + } + config false; + description + "Actual coding/modulation in transmitting direction. + Related to the data node actual-tx-cm in RFC 8561."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + leaf actual-snir { + type decimal64 { + fraction-digits 1; + } + units "dB"; + config false; + description + "Actual signal-to-noise plus the interference ratio + (0.1 dB resolution). + Related to the data node actual-snir in RFC 8561."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + leaf actual-transmitted-level { + type decimal64 { + fraction-digits 1; + } + units "dBm"; + config false; + description + "Actual transmitted power level (0.1 dBm resolution). + Related to the data node actual-transmitted-level + in RFC 8561."; + reference + "ETSI EN 301 129 and + RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + } + + grouping microwave-bandwidth { + description + "Grouping used for microwave bandwidth."; + leaf mw-bandwidth { + type uint64; + units "bits/seconds"; + config false; + description + "Nominal microwave radio link and carrier bandwidth."; + } + } + + augment "/nw:networks/nw:network/nw:network-types/" + + "tet:te-topology" { + description + "Augment network types to define a microwave network + topology type."; + container mw-topology { + presence "Indicates a topology type of microwave."; + description + "Microwave topology type"; + } + } + + augment "/nw:networks/nw:network/nw:node/tet:te" + + "/tet:te-node-attributes" { + when '../../../nw:network-types' + + '/tet:te-topology/mwt:mw-topology' { + description + "Augmentation parameters apply only to networks with a + microwave network topology type."; + } + description + "Augment network node to indicate a microwave node."; + container mw-node { + presence "Indicates a microwave node."; + description + "Microwave node"; + } + } + + augment "/nw:networks/nw:network/nw:node/nt:termination-point/" + + "tet:te" { + when '../../../nw:network-types/tet:te-topology/' + + 'mwt:mw-topology' { + description + "Augmentation parameters apply only for networks with a + microwave network topology type."; + } + description + "Augmentation to add microwave-technology-specific + characteristics to a termination point."; + container mw-tp { + presence "Denotes a microwave termination point."; + description + "Specification of type of termination point."; + choice mw-tp-option { + description + "Selection of type of termination point."; + case microwave-rltp { + container microwave-rltp { + presence + "Denotes a microwave radio link termination point. + It corresponds to a microwave RLT interface as + defined in RFC 8561."; + description + "Denotes and describes a microwave radio link + termination point."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + } + case microwave-ctp { + container microwave-ctp { + presence "Denotes a microwave carrier termination point. + It corresponds to a microwave CT interface as + defined in RFC 8561."; + description + "Denotes and describes a microwave carrier + termination point."; + reference + "RFC 8561: A YANG Data Model for Microwave Radio Link"; + } + } + } + } + } + + augment "/nw:networks/nw:network/nt:link/tet:te/" + + "tet:te-link-attributes" { + when '../../../nw:network-types/tet:te-topology/' + + 'mwt:mw-topology' { + description + "Augmentation parameters apply only for networks with a + microwave network topology type."; + } + description + "Augmentation to add microwave-technology-specific + characteristics to a link."; + container mw-link { + presence "This indicates a microwave link"; + description + "Specification of type of link."; + choice mw-link-option { + mandatory true; + description + "Selection of type of link."; + case microwave-radio-link { + container microwave-radio-link { + presence "Denotes a microwave radio link"; + description + "Denotes and describes a microwave radio link."; + uses microwave-radio-link-attributes; + } + } + case microwave-carrier { + container microwave-carrier { + presence "Denotes a microwave carrier"; + description + "Denotes and describes a microwave carrier."; + uses microwave-carrier-attributes; + } + } + } + } + } + + augment "/nw:networks/nw:network/nt:link/tet:te/" + + "tet:te-link-attributes/" + + "tet:max-link-bandwidth/" + + "tet:te-bandwidth" { + when '../../../../../nw:network-types/tet:te-topology/' + + 'mwt:mw-topology' { + description + "Augmentation parameters apply only for networks with a + microwave network topology type."; + } + description + "Augmentation for TE bandwidth."; + uses microwave-bandwidth; + } +}