From 036d25ad539de69bf35468cdc5397d40310951ce Mon Sep 17 00:00:00 2001 From: Miroslav Kovac Date: Fri, 30 Jun 2023 18:06:13 +0000 Subject: [PATCH] Cronjob - daily check of IETF modules. --- ...f-bgp-origin-as-validation@2022-10-18.yang | 25 +- .../ietf-bgp-sec@2022-10-18.yang | 237 ++++++++++++++++++ ...ng => ietf-ospf-flex-algo@2023-06-27.yang} | 42 ++-- ...pf-graceful-link-shutdown@2023-06-27.yang} | 3 +- ...ng => ietf-ospf-link-attr@2023-06-27.yang} | 7 +- ...=> ietf-ospf-lls-local-id@2023-06-27.yang} | 9 +- ...-02.yang => ietf-ospf-msd@2023-06-27.yang} | 4 +- ...ietf-ospf-two-part-metric@2023-06-27.yang} | 4 +- ... ietf-ospfv3-extended-lsa@2023-06-29.yang} | 11 +- ...02.yang => ietf-ospfv3-te@2023-06-27.yang} | 2 +- .../ietf-rpki-rtr@2022-10-18.yang | 94 ++++++- 11 files changed, 374 insertions(+), 64 deletions(-) create mode 100644 experimental/ietf-extracted-YANG-modules/ietf-bgp-sec@2022-10-18.yang rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-flex-algo@2023-01-02.yang => ietf-ospf-flex-algo@2023-06-27.yang} (95%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-graceful-link-shutdown@2023-01-02.yang => ietf-ospf-graceful-link-shutdown@2023-06-27.yang} (99%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-link-attr@2023-01-02.yang => ietf-ospf-link-attr@2023-06-27.yang} (98%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-lls-local-id@2023-01-02.yang => ietf-ospf-lls-local-id@2023-06-27.yang} (94%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-msd@2023-01-02.yang => ietf-ospf-msd@2023-06-27.yang} (98%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospf-two-part-metric@2023-01-02.yang => ietf-ospf-two-part-metric@2023-06-27.yang} (98%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospfv3-extended-lsa@2023-06-26.yang => ietf-ospfv3-extended-lsa@2023-06-29.yang} (99%) rename experimental/ietf-extracted-YANG-modules/{ietf-ospfv3-te@2023-01-02.yang => ietf-ospfv3-te@2023-06-27.yang} (99%) diff --git a/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang index e7a43ed3c..575450655 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-bgp-origin-as-validation@2022-10-18.yang @@ -37,7 +37,7 @@ module ietf-bgp-origin-as-validation { description "This module describes configuration of the BGP origin AS - validation based on the Validated ROA Payload (VRP). + validation. This YANG model conforms to the Network Management Datastore Architecture (NMDA) as described in RFC 8342. @@ -66,20 +66,7 @@ module ietf-bgp-origin-as-validation { description "Initial Version"; reference - "RFC XXXX, YANG Data Model for RPKI to Router Protocol - and BGP Origin AS Validation"; - } - - identity vrp-protocol { - description - "Base identity from which VRP source protocol identities - are derived."; - } - - identity rpki-rtr { - base vrp-protocol; - description - "RPKI to Router Protocol"; + "RFC XXXX, YANG Data Model for BGP Origin AS Validation"; } identity ineligible-orgin-as { @@ -124,13 +111,6 @@ module ietf-bgp-origin-as-validation { description "Whether origin-AS validation of BGP prefix is enabled."; } - leaf source-protocol { - type identityref { - base vrp-protocol; - } - description - "Type of the protocol from which the VRP originated."; - } leaf redistribution-as { type inet:as-number; description @@ -301,7 +281,6 @@ module ietf-bgp-origin-as-validation { uses origin-as-validity-advertisement; uses export-origin-as-validation-config; } - augment "/rt:routing/rt:control-plane-protocols" + "/rt:control-plane-protocol/bgp:bgp/bgp:peer-groups" + "/bgp:peer-group/bgp:afi-safis/bgp:afi-safi" diff --git a/experimental/ietf-extracted-YANG-modules/ietf-bgp-sec@2022-10-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-bgp-sec@2022-10-18.yang new file mode 100644 index 000000000..c39f0f68e --- /dev/null +++ b/experimental/ietf-extracted-YANG-modules/ietf-bgp-sec@2022-10-18.yang @@ -0,0 +1,237 @@ +module ietf-bgp-sec { + yang-version "1.1"; + namespace "urn:ietf:params:xml:ns:yang:" + + "ietf-bgp-sec"; + prefix "oav"; + + import ietf-routing { + prefix "rt"; + reference + "RFC 8349, A YANG Data Model for Routing Management + (NMDA Version)."; + } + + import ietf-bgp { + prefix "bgp"; + reference + "RFC XXXX: BGP YANG Model for Service Provider Networks"; + } + + import iana-bgp-types { + prefix "bt"; + reference + "RFC XXXX: BGP YANG Model for Service Provider Networks"; + } + + organization + "IETF SIDROPS Working Group"; + + contact + "TBD"; + + description + "This module describes configuration of BGPsec. + + This YANG model conforms to the Network Management + Datastore Architecture (NMDA) as described in RFC 8342. + + Copyright (c) 2022 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. + + 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."; + + reference "RFC XXXX"; + + revision 2022-10-18 { + description + "Initial Version"; + reference + "RFC XXXX, YANG Data Model for BGPSec"; + } + + identity ineligible-bgp { + base bgp:ineligible-route-reason; + description + "Route was ineligible due to bgpsec"; + } + + typedef bgpsec-validity-state { + type enumeration { + enum valid { + description + "The BGPsec UPDATE message is valid."; + } + enum invalid { + description + "The BGPsec UPDATE message is invalid."; + } + enum disabled { + description + "BGPsec validation is not enabled."; + } + } + description + "BGPsec validation state of BGP routes."; + reference + "RFC 8205, BGPsec Protocol Specification."; + } + grouping bgpsec-validation-config { + description + "BGPsec validation of BGP prefix."; + container bgpsec-validation { + leaf enabled { + type boolean; + default "false"; + description + "Whether BGPsec validation of BGP prefix is enabled."; + } + description + "BGPsec validation of BGP prefix."; + } + } + + grouping bgpsec-selection-option { + description + "BGPsec option for BGP route selection."; + container bgpsec { + leaf enabled { + type boolean; + default "false"; + description + "When enabled allows the BGPsec validity states to be + taken into consideration in the best-path calculation."; + } + leaf allow-invalid { + type boolean; + default "false"; + description + "When enabled allows the route with 'invalid' BGPsec + to be taken into consideration in the best-path + calculation."; + } + description + "BGPsec option for BGP route selection."; + } + } + + grouping export-bgpsec-validation-config { + description + "Export BGPsec validation of BGP prefix."; + container export-bgpsec-validation { + leaf enabled { + type boolean; + default "false"; + description + "When enabled allows the BGPsec validity states to be + taken into consideration in BGP export."; + } + description + "Export BGPsec validation of BGP prefix."; + } + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:global" + + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast" { + description + "BGPSec augmentation of BGP IPv4 Unicast Address Family."; + uses bgpsec-validation-config; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:global" + + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast" { + description + " BGPSec augmentation of BGP IPv6 Unicast Address Family."; + uses bgpsec-validation-config; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:rib" + + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv4-unicast" + + "/bgp:loc-rib/bgp:routes/bgp:route" { + description + " BGPSec augmentation of BGP IPv4 Unicast route."; + leaf bgpsec-validity { + type bgpsec-validity-state; + description + "BGPsec validity of BGP IPv4 Unicast prefix"; + } + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:rib" + + "/bgp:afi-safis/bgp:afi-safi/bgp:ipv6-unicast" + + "/bgp:loc-rib/bgp:routes/bgp:route" { + description + "BGPSec augmentation of BGP IPv6 Unicast route."; + leaf bgpsec-validity { + type bgpsec-validity-state; + description + "BGPsec validity of BGP IPv6 Unicast prefix"; + } + } + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:global" + + "/bgp:afi-safis/bgp:afi-safi" + + "/bgp:route-selection-options" { + when "derived-from-or-self(../bgp:name, 'bt:ipv4-unicast') or " + + "derived-from-or-self(../bgp:name, 'bt:ipv6-unicast')" { + description + "This augmentation is valid for IPv4 and IPv6 Unicast."; + } + description + "augmentation of BGP route selection options"; + uses bgpsec-selection-option; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:neighbors" + + "/bgp:neighbor/bgp:afi-safis/bgp:afi-safi" + + "/bgp:ipv4-unicast" { + description + "augmentation of BGPSec for IPv4 Unicast neighbor"; + uses export-bgpsec-validation-config; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:neighbors" + + "/bgp:neighbor/bgp:afi-safis/bgp:afi-safi" + + "/bgp:ipv6-unicast" { + description + "augmentation of BGPSec for IPv6 Unicast neighbor"; + uses export-bgpsec-validation-config; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:peer-groups" + + "/bgp:peer-group/bgp:afi-safis/bgp:afi-safi" + + "/bgp:ipv4-unicast" { + description + "augmentation of BGPSec for IPv4 Unicast peer group"; + uses export-bgpsec-validation-config; + } + + augment "/rt:routing/rt:control-plane-protocols" + + "/rt:control-plane-protocol/bgp:bgp/bgp:peer-groups" + + "/bgp:peer-group/bgp:afi-safis/bgp:afi-safi" + + "/bgp:ipv6-unicast" { + description + "augmentation of BGPSec for IPv6 Unicast peer group"; + uses export-bgpsec-validation-config; + } +} diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-06-27.yang similarity index 95% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-06-27.yang index 1b5db260f..f7d9f498b 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-flex-algo@2023-06-27.yang @@ -40,6 +40,7 @@ module ietf-ospf-flex-algo { contact "WG Web: WG List: + Author: Yingzhen Qu Author: Acee Lindem @@ -59,8 +60,8 @@ module ietf-ospf-flex-algo { 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 + 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). @@ -76,10 +77,11 @@ module ietf-ospf-flex-algo { reference "RFC XXXX: YANG Data Model for OSPF Flexible Algorithm."; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial Version"; - reference "RFC XXXX: YANG Data Model for OSPF Flexible Algorithm."; + reference + "RFC XXXX: YANG Data Model for OSPF Flexible Algorithm."; } /* Identities */ @@ -285,7 +287,7 @@ module ietf-ospf-flex-algo { "Flex-algo prefix metric sub-tlvs."; } description - "Flexible Algorithm Prefix Metric (FAPM) sub TLVs."; + "Flexible Algorithm Prefix Metric (FAPM) sub-TLVs."; } grouping faam-sub-tlvs { @@ -504,7 +506,8 @@ module ietf-ospf-flex-algo { } description - "Flex-algo definition TLVs for OSPFv3 Router Information LSA."; + "Flex-algo definition TLVs for OSPFv3 Router + Information (RI) LSA."; uses fad-tlvs; } @@ -523,7 +526,8 @@ module ietf-ospf-flex-algo { } description - "Flex-algo definition TLVs for OSPFv3 Router Information LSA."; + "Flex-algo definition TLVs for OSPFv3 Router + Information (RI) LSA."; uses fad-tlvs; } @@ -559,8 +563,8 @@ module ietf-ospf-flex-algo { "This augmentation is only valid for OSPFv2."; } description - "Flex-algo prefix metric sub TLVs for OSPFv2 extended prefix TLV - in type 9 opaque LSA."; + "Flex-algo prefix metric sub-TLVs for OSPFv2 extended + prefix TLV in type 9 opaque LSA."; uses fapm-sub-tlvs; } @@ -578,8 +582,8 @@ module ietf-ospf-flex-algo { "This augmentation is only valid for OSPFv2."; } description - "Flex-algo prefix metric sub TLVs for OSPFv2 extended prefix TLV - in type 10 opaque LSA."; + "Flex-algo prefix metric sub-TLVs for OSPFv2 extended + prefix TLV in type 10 opaque LSA."; uses fapm-sub-tlvs; } @@ -589,26 +593,29 @@ module ietf-ospf-flex-algo { + "ospf:as-scope-lsa-type/ospf:as-scope-lsas/" + "ospf:as-scope-lsa/ospf:version/ospf:ospfv2/" + "ospf:ospfv2/ospf:body/ospf:opaque/" - + "ospf:extended-prefix-opaque/ospf:extended-prefix-tlv" { + + "ospf:extended-prefix-opaque/" + + "ospf:extended-prefix-tlv" { when "../../../../../../../../../../" + "rt:type = 'ospf:ospfv2'" { description "This augmentation is only valid for OSPFv2."; } description - "Flex-algo prefix metric sub TLVs for OSPFv2 extended prefix TLV - in type 11 opaque LSA."; + "Flex-algo prefix metric sub-TLVs for OSPFv2 extended + prefix TLV in type 11 opaque LSA."; uses fapm-sub-tlvs; } - /* Flex-algo prefix metric Sub-TLV in OSPFv3 Inter-Area Prefix TLV */ + /* Flex-algo prefix metric Sub-TLV in OSPFv3 Inter-Area + Prefix TLV */ augment "/rt:routing/" + "rt:control-plane-protocols/rt:control-plane-protocol/" + "ospf:ospf/ospf:areas/ospf:area/ospf:database/" + "ospf:area-scope-lsa-type/ospf:area-scope-lsas/" + "ospf:area-scope-lsa/ospf:version/ospf:ospfv3/" + "ospf:ospfv3/ospf:body/ospfv3-e-lsa:e-inter-area-prefix/" - + "ospfv3-e-lsa:e-inter-prefix-tlvs/ospfv3-e-lsa:inter-prefix-tlv" { + + "ospfv3-e-lsa:e-inter-prefix-tlvs/" + + "ospfv3-e-lsa:inter-prefix-tlv" { when "../../../../../../../../../../../../" + "rt:type = 'ospf:ospfv3'" { description @@ -627,7 +634,8 @@ module ietf-ospf-flex-algo { + "ospf:as-scope-lsa-type/ospf:as-scope-lsas/" + "ospf:as-scope-lsa/ospf:version/ospf:ospfv3/" + "ospf:ospfv3/ospf:body/ospfv3-e-lsa:e-as-external/" - + "ospfv3-e-lsa:e-external-tlvs/ospfv3-e-lsa:external-prefix-tlv" { + + "ospfv3-e-lsa:e-external-tlvs/" + + "ospfv3-e-lsa:external-prefix-tlv" { when "'ospf:../../../../../../../../../" + "rt:type' = 'ospf:ospfv3'" { description diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-06-27.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-06-27.yang index db47331c0..9a2293288 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-graceful-link-shutdown@2023-06-27.yang @@ -61,7 +61,7 @@ module ietf-ospf-graceful-link-shutdown { reference "RFC XXXX"; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial version"; reference @@ -111,7 +111,6 @@ module ietf-ospf-graceful-link-shutdown { description "OSPF graceful link shutdown for OSPFv2 extended link TLV in type 10 opaque LSA."; - container graceful-link-shutdown-sub-tlv { presence "Enable graceful link shutdown"; description diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-06-27.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-06-27.yang index 33707ce1f..ea5f70c5e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-link-attr@2023-06-27.yang @@ -19,6 +19,7 @@ module ietf-ospf-link-attr { import ietf-ospfv3-extended-lsa { prefix "ospfv3-e-lsa"; } + organization "IETF LSR - Link State Routing Working Group"; @@ -62,17 +63,17 @@ module ietf-ospf-link-attr { reference "RFC XXXX"; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial version"; reference - "RFC XXXX: A YANG Data Model for OSPF application specific + "RFC XXXX: A YANG Data Model for OSPF application-specific link attributes."; } identity sabm-bit { description - "Base identity for sabm bits."; + "Base identity for SABM bits."; } identity rsvp-te-bit { diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-06-27.yang similarity index 94% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-06-27.yang index e24c563fd..c2a29ad4e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-lls-local-id@2023-06-27.yang @@ -46,14 +46,13 @@ module ietf-ospf-lls-local-id { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - reference "RFC XXXX"; - - revision 2023-01-02 { + revision 2023-06-27 { description "Initial version"; reference - "RFC XXXX: A YANG Data Model for OSPF Link-Local Signaling (LLS) - Extensions for Local Interface ID Advertisement."; + "RFC XXXX: A YANG Data Model for OSPF Link-Local Signaling + (LLS) Extensions for Local Interface ID + Advertisement."; } augment "/rt:routing/rt:control-plane-protocols" diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-06-27.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-06-27.yang index 1b5533955..e9301c430 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-msd@2023-06-27.yang @@ -11,6 +11,8 @@ module ietf-ospf-msd { import ietf-ospf { prefix ospf; + reference "RFC 9129 - YANG Data Model for the OSPF + Protocol"; } import ietf-ospfv3-extended-lsa { @@ -61,7 +63,7 @@ module ietf-ospf-msd { reference "RFC XXXX: YANG Data Model for OSPF MSD."; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial Version"; reference "RFC XXXX: YANG Data Model for OSPF MSD."; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-06-27.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-06-27.yang index 40dfafe09..08c21d5b2 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospf-two-part-metric@2023-06-27.yang @@ -50,11 +50,11 @@ module ietf-ospf-two-part-metric { reference "RFC XXXX"; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial version"; reference - "RFC XXXX: A YANG Data Model for OSPF."; + "RFC XXXX: A YANG Data Model for OSPF Two-Part Metric."; } identity two-part-metric { diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-26.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-29.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-26.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-29.yang index f2711a0d4..abdd11fb2 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-26.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-extended-lsa@2023-06-29.yang @@ -76,12 +76,13 @@ module ietf-ospfv3-extended-lsa { reference "RFC XXXX - YANG Model for OSPFv3 Extended LSAs"; - revision 2023-06-26 { + revision 2023-06-29 { description "Initial revision."; reference "RFC XXXX: YANG Data Model for OSPFv3 Extended LSAs."; } + /* * OSPFv3 Extend LSA Type Identities */ @@ -610,6 +611,7 @@ module ietf-ospfv3-extended-lsa { reference "RFC 8362: OSPFv3 Link State Advertisement (LSA) Extensibility, Section 4"; + container e-router { when "../../ospf:header/ospf:type = " + "'ospfv3-e-lsa:ospfv3-e-router-lsa'" { @@ -706,16 +708,11 @@ module ietf-ospfv3-extended-lsa { "Attached Router TLV Length - Variable dependent on sub-TLVs"; } - leaf-list Adjacent-neighbor-router-id { + leaf-list adjacent-neighbor-router-id { type rt-types:router-id; description "Adjacent Neighbor's Router ID"; } - list sub-tlvs { - description - "Attached Router TLV Sub-TLVs"; - uses unknown-sub-tlv; - } } } } diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-01-02.yang b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-06-27.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-01-02.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-06-27.yang index a7f98874c..2c412d254 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-01-02.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ospfv3-te@2023-06-27.yang @@ -63,7 +63,7 @@ module ietf-ospfv3-te { reference "RFC XXXX"; - revision 2023-01-02 { + revision 2023-06-27 { description "Initial version"; reference diff --git a/experimental/ietf-extracted-YANG-modules/ietf-rpki-rtr@2022-10-18.yang b/experimental/ietf-extracted-YANG-modules/ietf-rpki-rtr@2022-10-18.yang index ff5944b33..d84b5f11c 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-rpki-rtr@2022-10-18.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-rpki-rtr@2022-10-18.yang @@ -34,7 +34,7 @@ module ietf-rpki-rtr { } import ietf-key-chain { - prefix "key-chain"; + prefix key-chain; reference "RFC 8177: YANG Key Chain."; } @@ -76,8 +76,7 @@ module ietf-rpki-rtr { description "Initial Version"; reference - "RFC XXXX, YANG Data Model for RPKI to Router Protocol - and BGP Origin AS Validation"; + "RFC XXXX, YANG Data Model for RPKI to Router Protocol"; } typedef ipv4-pfx-len { @@ -96,6 +95,14 @@ module ietf-rpki-rtr { "IPv6 Prefix Length."; } + typedef subject-key-id { + type binary { + length 20; + } + description + "Subject Key Identifier."; + } + container rpki-rtr { description "Configuration parameters for the RPKI to Router Protocol."; @@ -176,6 +183,49 @@ module ietf-rpki-rtr { } } } + container router-key-table { + config false; + description + "Table of router keys received from all RPKI cache + servers."; + container router-keys { + config false; + description + "Router keys received from the RPKI cache server."; + list router-key { + key "ski asn key server-address"; + description + "An entry of router key."; + leaf ski { + type subject-key-id; + description + "A router key's Subject Key Identifier (SKI)."; + reference + "RFC 6487: A Profile for X.509 PKIX Resource + Certificates"; + } + leaf asn { + type inet:as-number; + description + "The AS number of the router which the key + belongs to."; + } + leaf key { + type string; + description + "A router key's subjectPublicKeyInfo value."; + reference + "RFC 8608: BGPsec Algorithms, Key Formats, and + Signature Formats"; + } + leaf server-address { + type inet:ip-address; + description + "IP address of the RPKI cache server."; + } + } + } + } container cache-servers { description "Parameters of RPKI cache servers."; @@ -501,6 +551,44 @@ module ietf-rpki-rtr { RFC 8210, The Resource Public Key Infrastructure (RPKI) to Router Protocol, Version 1"; } + container router-key-table { + config false; + description + "Table of router keys received from all RPKI cache + servers."; + container router-keys { + config false; + description + "Router keys received from the RPKI cache server."; + list router-key { + key "ski asn key"; + description + "An entry of router key."; + leaf ski { + type subject-key-id; + description + "A router key's Subject Key Identifier (SKI)."; + reference + "RFC 6487: A Profile for X.509 PKIX Resource + Certificates"; + } + leaf asn { + type inet:as-number; + description + "The AS number of the router which the key + belongs to."; + } + leaf key { + type string; + description + "A router key's subjectPublicKeyInfo value."; + reference + "RFC 8608: BGPsec Algorithms, Key Formats, and + Signature Formats"; + } + } + } + } } } }