diff --git a/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang b/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang new file mode 100644 index 000000000..b215730d2 --- /dev/null +++ b/experimental/ietf-extracted-YANG-modules/iana-icmpv4-types@2020-09-25.yang @@ -0,0 +1,314 @@ +module iana-icmpv4-types { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:iana-icmpv4-types"; + prefix iana-icmpv4-types; + + organization + "Internet Assigned Numbers Authority (IANA)"; + + contact + "Internet Assigned Numbers Authority + + ICANN + 12025 Waterfront Drive, Suite 300 + Los Angeles, CA 90094 + + Tel: +1 424 254 5300 + + "; + + description + "This YANG module translates IANA registry 'ICMP Type Numbers' to + YANG derived types. + + Copyright (c) 2020 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 was generated from the + corresponding IANA registry using an XSLT stylesheet from the + 'iana-yang' project (https://github.com/llhotka/iana-yang)."; + + reference + "Internet Control Message Protocol (ICMP) Parameters + (https://www.iana.org/assignments/icmp-parameters/)"; + + revision 2020-09-25 { + description + "Current revision as of the revision date specified in the XML + representation of the registry page."; + reference + "https://www.iana.org/assignments/icmp-parameters/icmp-parameters.xml"; + } + + /* Typedefs */ + + typedef icmpv4-type-name { + type enumeration { + enum EchoReply { + value 0; + description + "Echo Reply"; + reference + "RFC 792"; + } + enum DestinationUnreachable { + value 3; + description + "Destination Unreachable"; + reference + "RFC 792"; + } + enum SourceQuench { + value 4; + status deprecated; + description + "Source Quench (Deprecated)"; + reference + "- RFC 792 + - RFC 6633"; + } + enum Redirect { + value 5; + description + "Redirect"; + reference + "RFC 792"; + } + enum AlternateHostAddress { + value 6; + status deprecated; + description + "Alternate Host Address (Deprecated)"; + reference + "RFC 6918"; + } + enum Echo { + value 8; + description + "Echo"; + reference + "RFC 792"; + } + enum RouterAdvertisement { + value 9; + description + "Router Advertisement"; + reference + "RFC 1256"; + } + enum RouterSolicitation { + value 10; + description + "Router Solicitation"; + reference + "RFC 1256"; + } + enum TimeExceeded { + value 11; + description + "Time Exceeded"; + reference + "RFC 792"; + } + enum ParameterProblem { + value 12; + description + "Parameter Problem"; + reference + "RFC 792"; + } + enum Timestamp { + value 13; + description + "Timestamp"; + reference + "RFC 792"; + } + enum TimestampReply { + value 14; + description + "Timestamp Reply"; + reference + "RFC 792"; + } + enum InformationRequest { + value 15; + status deprecated; + description + "Information Request (Deprecated)"; + reference + "- RFC 792 + - RFC 6918"; + } + enum InformationReply { + value 16; + status deprecated; + description + "Information Reply (Deprecated)"; + reference + "- RFC 792 + - RFC 6918"; + } + enum AddressMaskRequest { + value 17; + status deprecated; + description + "Address Mask Request (Deprecated)"; + reference + "- RFC 950 + - RFC 6918"; + } + enum AddressMaskReply { + value 18; + status deprecated; + description + "Address Mask Reply (Deprecated)"; + reference + "- RFC 950 + - RFC 6918"; + } + enum Traceroute { + value 30; + status deprecated; + description + "Traceroute (Deprecated)"; + reference + "- RFC 1393 + - RFC 6918"; + } + enum DatagramConversionError { + value 31; + status deprecated; + description + "Datagram Conversion Error (Deprecated)"; + reference + "- RFC 1475 + - RFC 6918"; + } + enum MobileHostRedirect { + value 32; + status deprecated; + description + "Mobile Host Redirect (Deprecated)"; + reference + "- David Johnson <> + - RFC 6918"; + } + enum IPv6Where-Are-You { + value 33; + status deprecated; + description + "IPv6 Where-Are-You (Deprecated)"; + reference + "- Bill Simpson + - RFC 6918"; + } + enum IPv6I-Am-Here { + value 34; + status deprecated; + description + "IPv6 I-Am-Here (Deprecated)"; + reference + "- Bill Simpson + - RFC 6918"; + } + enum MobileRegistrationRequest { + value 35; + status deprecated; + description + "Mobile Registration Request (Deprecated)"; + reference + "- Bill Simpson + - RFC 6918"; + } + enum MobileRegistrationReply { + value 36; + status deprecated; + description + "Mobile Registration Reply (Deprecated)"; + reference + "- Bill Simpson + - RFC 6918"; + } + enum DomainNameRequest { + value 37; + status deprecated; + description + "Domain Name Request (Deprecated)"; + reference + "- RFC 1788 + - RFC 6918"; + } + enum DomainNameReply { + value 38; + status deprecated; + description + "Domain Name Reply (Deprecated)"; + reference + "- RFC 1788 + - RFC 6918"; + } + enum SKIP { + value 39; + status deprecated; + description + "SKIP (Deprecated)"; + reference + "- Tom Markson + - RFC 6918"; + } + enum Photuris { + value 40; + description + "Photuris"; + reference + "RFC 2521"; + } + enum ICMPmessagesutilizedbyexperimentalmobilityprotocolssuchasSeamoby { + value 41; + description + "ICMP messages utilized by experimental mobility protocols + such as Seamoby"; + reference + "RFC 4065"; + } + enum ExtendedEchoRequest { + value 42; + description + "Extended Echo Request"; + reference + "RFC 8335"; + } + enum ExtendedEchoReply { + value 43; + description + "Extended Echo Reply"; + reference + "RFC 8335"; + } + } + description + "This enumeration type defines mnemonic names and corresponding + numeric values of ICMPv4 types."; + reference + "RFC 2708: IANA Allocation Guidelines For Values In the + Internet Protocol and Related Headers"; + } + + typedef icmpv4-type { + type union { + type uint8; + type icmpv4-type-name; + } + description + "This type allows reference to an ICMPv4 type using either the + assigned mnemonic name or numeric value."; + } +} diff --git a/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang b/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang new file mode 100644 index 000000000..16e13dded --- /dev/null +++ b/experimental/ietf-extracted-YANG-modules/iana-icmpv6-types@2023-04-28.yang @@ -0,0 +1,339 @@ +module iana-icmpv6-types { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:iana-icmpv6-types"; + prefix iana-icmpv6-types; + + organization + "Internet Assigned Numbers Authority (IANA)"; + + contact + "Internet Assigned Numbers Authority + + ICANN + 12025 Waterfront Drive, Suite 300 + Los Angeles, CA 90094 + + Tel: +1 424 254 5300 + + "; + + description + "This YANG module translates IANA registry 'ICMPv6 \"type\" + Numbers' to YANG derived types. + + Copyright (c) 2023 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 was generated from the + corresponding IANA registry using an XSLT stylesheet from the + 'iana-yang' project (https://github.com/llhotka/iana-yang)."; + + reference + "Internet Control Message Protocol version 6 (ICMPv6) Parameters + (https://www.iana.org/assignments/icmpv6-parameters/)"; + + revision 2023-04-28 { + description + "Current revision as of the revision date specified in the XML + representation of the registry page."; + reference + "https://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xml"; + } + + /* Typedefs */ + + typedef icmpv6-type-name { + type enumeration { + enum DestinationUnreachable { + value 1; + description + "Destination Unreachable."; + reference + "RFC 4443"; + } + enum PacketTooBig { + value 2; + description + "Packet Too Big."; + reference + "RFC 4443"; + } + enum TimeExceeded { + value 3; + description + "Time Exceeded."; + reference + "RFC 4443"; + } + enum ParameterProblem { + value 4; + description + "Parameter Problem."; + reference + "RFC 4443"; + } + enum EchoRequest { + value 128; + description + "Echo Request."; + reference + "RFC 4443"; + } + enum EchoReply { + value 129; + description + "Echo Reply."; + reference + "RFC 4443"; + } + enum MulticastListenerQuery { + value 130; + description + "Multicast Listener Query."; + reference + "RFC 2710"; + } + enum MulticastListenerReport { + value 131; + description + "Multicast Listener Report."; + reference + "RFC 2710"; + } + enum MulticastListenerDone { + value 132; + description + "Multicast Listener Done."; + reference + "RFC 2710"; + } + enum RouterSolicitation { + value 133; + description + "Router Solicitation."; + reference + "RFC 4861"; + } + enum RouterAdvertisement { + value 134; + description + "Router Advertisement."; + reference + "RFC 4861"; + } + enum NeighborSolicitation { + value 135; + description + "Neighbor Solicitation."; + reference + "RFC 4861"; + } + enum NeighborAdvertisement { + value 136; + description + "Neighbor Advertisement."; + reference + "RFC 4861"; + } + enum RedirectMessage { + value 137; + description + "Redirect Message."; + reference + "RFC 4861"; + } + enum RouterRenumbering { + value 138; + description + "Router Renumbering."; + reference + "RFC 2894"; + } + enum ICMPNodeInformationQuery { + value 139; + description + "ICMP Node Information Query."; + reference + "RFC 4620"; + } + enum ICMPNodeInformationResponse { + value 140; + description + "ICMP Node Information Response."; + reference + "RFC 4620"; + } + enum InverseNeighborDiscoverySolicitationMessage { + value 141; + description + "Inverse Neighbor Discovery Solicitation Message."; + reference + "RFC 3122"; + } + enum InverseNeighborDiscoveryAdvertisementMessage { + value 142; + description + "Inverse Neighbor Discovery Advertisement Message."; + reference + "RFC 3122"; + } + enum Version2MulticastListenerReport { + value 143; + description + "Version 2 Multicast Listener Report."; + reference + "RFC 3810"; + } + enum HomeAgentAddressDiscoveryRequestMessage { + value 144; + description + "Home Agent Address Discovery Request Message."; + reference + "RFC 6275"; + } + enum HomeAgentAddressDiscoveryReplyMessage { + value 145; + description + "Home Agent Address Discovery Reply Message."; + reference + "RFC 6275"; + } + enum MobilePrefixSolicitation { + value 146; + description + "Mobile Prefix Solicitation."; + reference + "RFC 6275"; + } + enum MobilePrefixAdvertisement { + value 147; + description + "Mobile Prefix Advertisement."; + reference + "RFC 6275"; + } + enum CertificationPathSolicitationMessage { + value 148; + description + "Certification Path Solicitation Message."; + reference + "RFC 3971"; + } + enum CertificationPathAdvertisementMessage { + value 149; + description + "Certification Path Advertisement Message."; + reference + "RFC 3971"; + } + enum ICMPmessagesutilizedbyexperimentalmobilityprotocolssuchasSeamoby { + value 150; + description + "ICMP messages utilized by experimental mobility protocols + such as Seamoby."; + reference + "RFC 4065"; + } + enum MulticastRouterAdvertisement { + value 151; + description + "Multicast Router Advertisement."; + reference + "RFC 4286"; + } + enum MulticastRouterSolicitation { + value 152; + description + "Multicast Router Solicitation."; + reference + "RFC 4286"; + } + enum MulticastRouterTermination { + value 153; + description + "Multicast Router Termination."; + reference + "RFC 4286"; + } + enum FMIPv6Messages { + value 154; + description + "FMIPv6 Messages."; + reference + "RFC 5568"; + } + enum RPLControlMessage { + value 155; + description + "RPL Control Message."; + reference + "RFC 6550"; + } + enum ILNPv6LocatorUpdateMessage { + value 156; + description + "ILNPv6 Locator Update Message."; + reference + "RFC 6743"; + } + enum DuplicateAddressRequest { + value 157; + description + "Duplicate Address Request."; + reference + "RFC 6775"; + } + enum DuplicateAddressConfirmation { + value 158; + description + "Duplicate Address Confirmation."; + reference + "RFC 6775"; + } + enum MPLControlMessage { + value 159; + description + "MPL Control Message."; + reference + "RFC 7731"; + } + enum ExtendedEchoRequest { + value 160; + description + "Extended Echo Request."; + reference + "RFC 8335"; + } + enum ExtendedEchoReply { + value 161; + description + "Extended Echo Reply."; + reference + "RFC 8335"; + } + } + description + "This enumeration type defines mnemonic names and corresponding + numeric values of ICMPv6 types."; + reference + "RFC 2708: IANA Allocation Guidelines For Values In the + Internet Protocol and Related Headers"; + } + + typedef icmpv6-type { + type union { + type uint8; + type icmpv6-type-name; + } + description + "This type allows reference to an ICMPv6 type using either the + assigned mnemonic name or numeric value."; + } +} diff --git a/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang b/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang new file mode 100644 index 000000000..764eb1cdf --- /dev/null +++ b/experimental/ietf-extracted-YANG-modules/iana-ipv6-ext-types@2023-09-29.yang @@ -0,0 +1,137 @@ +module iana-ipv6-ext-types { + yang-version 1.1; + namespace "urn:ietf:params:xml:ns:yang:iana-ipv6-ext-types"; + prefix iana-ipv6-ext-types; + + organization + "Internet Assigned Numbers Authority (IANA)"; + + contact + "Internet Assigned Numbers Authority + + ICANN + 12025 Waterfront Drive, Suite 300 + Los Angeles, CA 90094 + + Tel: +1 424 254 5300 + + "; + + description + "This YANG module translates IANA registry 'IPv6 Extension Header + Types' to YANG derived types. + + Copyright (c) 2023 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 was generated from the + corresponding IANA registry using an XSLT stylesheet from the + 'iana-yang' project (https://github.com/llhotka/iana-yang)."; + + reference + "Internet Protocol Version 6 (IPv6) Parameters + (https://www.iana.org/assignments/ipv6-parameters/)"; + + revision 2023-09-29 { + description + "Current revision as of the revision date specified in the XML + representation of the registry page."; + reference + "https://www.iana.org/assignments/ipv6-parameters/ipv6-parameters.xml"; + } + + /* Typedefs */ + + typedef ipv6-extension-header-type-name { + type enumeration { + enum IPv6Hop-by-HopOption { + value 0; + description + "IPv6 Hop-by-Hop Option"; + reference + "RFC 8200"; + } + enum RoutingHeaderforIPv6 { + value 43; + description + "Routing Header for IPv6"; + reference + "- RFC 8200 + - RFC 5095"; + } + enum FragmentHeaderforIPv6 { + value 44; + description + "Fragment Header for IPv6"; + reference + "RFC 8200"; + } + enum EncapsulatingSecurityPayload { + value 50; + description + "Encapsulating Security Payload"; + reference + "RFC 4303"; + } + enum AuthenticationHeader { + value 51; + description + "Authentication Header"; + reference + "RFC 4302"; + } + enum DestinationOptionsforIPv6 { + value 60; + description + "Destination Options for IPv6"; + reference + "RFC 8200"; + } + enum MobilityHeader { + value 135; + description + "Mobility Header"; + reference + "RFC 6275"; + } + enum HostIdentityProtocol { + value 139; + description + "Host Identity Protocol"; + reference + "RFC 7401"; + } + enum Shim6Protocol { + value 140; + description + "Shim6 Protocol"; + reference + "RFC 5533"; + } + } + description + "This enumeration type defines mnemonic names and corresponding + numeric values of IPv6 Extension header types."; + reference + "RFC 2708: IANA Allocation Guidelines For Values In the + Internet Protocol and Related Headers"; + } + + typedef ipv6-extension-header-type { + type union { + type uint8; + type ipv6-extension-header-type-name; + } + description + "This type allows reference to an IPv6 Extension header type + using either the assigned mnemonic name or the numeric + protocol number value."; + } +} diff --git a/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang b/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang index 2bf8a9685..5831b8c15 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-acl-enh@2022-10-24.yang @@ -20,12 +20,26 @@ module ietf-acl-enh { "RFC 8519: YANG Data Model for Network Access Control Lists (ACLs), Section 4.2"; } - import ietf-routing-types { prefix rt-types; reference "RFC 8294: Common YANG Data Types for the Routing Area"; - } + } + import iana-icmpv4-types { + prefix iana-icmpv4-types; + reference + "TBC"; + } + import iana-icmpv6-types { + prefix iana-icmpv6-types; + reference + "TBC"; + } + import iana-ipv6-ext-types { + prefix iana-ipv6-ext-types; + reference + "TBC"; + } organization "IETF NETMOD Working Group"; @@ -33,11 +47,11 @@ module ietf-acl-enh { "WG Web: https://datatracker.ietf.org/wg/netmod/ WG List: mailto:netmod@ietf.org - Author: Mohamed Boucadair + Author: Mohamed Boucadair mailto:mohamed.boucadair@orange.com - Author: Samier Barguil + Author: Samier Barguil mailto:samier.barguilgiraldo.ext@telefonica.com - Author: Oscar Gonzalez de Dios + Author: Oscar Gonzalez de Dios mailto:oscar.gonzalezdedios@telefonica.com"; description "This module contains YANG definitions for enhanced ACLs. @@ -93,6 +107,13 @@ module ietf-acl-enh { "Base identity for payload offset type."; } + identity layer2 { + base offset-type; + description + "The offset starts at the beginning of the Data Link layer + header."; + } + identity layer3 { base offset-type; description @@ -212,6 +233,30 @@ module ietf-acl-enh { "Bottom of the label stack."; } + identity log-types { + description + "Base identity for deriving the Log actions."; + } + + identity local-log { + base log-types; + description + "A local log is used to record the ACL results."; + } + + identity counter-type { + description + "Base identity for deriving the Counter actions."; + } + + identity counter-name { + base counter-type; + description + "Identity for counter name to be updated based on + the ACL match actions."; + + } + typedef operator { type bits { bit not { @@ -222,13 +267,13 @@ module ietf-acl-enh { bit match { position 1; description - "Match bit. This is a bitwise match operation defined as + "Match bit. This is a bitwise match operation defined as '(data & value) == value'."; } bit any { position 2; description - "Any bit. This is a match on any of the bits in bitmask. + "Any bit. This is a match on any of the bits in bitmask. It evaluates to 'true' if any of the bits in the value mask are set in the data, i.e., '(data & value) != 0'."; } @@ -302,13 +347,22 @@ module ietf-acl-enh { "Defines a reference to a protocol set."; } - typedef icmp-type-set-ref { + typedef icmpv4-type-set-ref { + type leafref { + path "/acl-enh:defined-sets/acl-enh:icmpv4-type-sets" + + "/acl-enh:icmpv4-type-set/acl-enh:name"; + } + description + "Defines a reference to an ICMPv4 type set."; + } + + typedef icmpv6-type-set-ref { type leafref { - path "/acl-enh:defined-sets/acl-enh:icmp-type-sets" - + "/acl-enh:icmp-type-set/acl-enh:name"; + path "/acl-enh:defined-sets/acl-enh:icmpv6-type-sets" + + "/acl-enh:icmpv6-type-set/acl-enh:name"; } description - "Defines a reference to an ICMP type set."; + "Defines a reference to an ICMPv6 type set."; } typedef alias-ref { @@ -349,6 +403,9 @@ module ietf-acl-enh { the TCP header. For clarity, the 4 bits of byte 12 corresponding to the TCP data offset field are not included in any matching."; + reference + "RFC 9293: Transmission Control Protocol (TCP), + Section 3.1"; } } } @@ -465,6 +522,11 @@ grouping mpls-match-parameters-config { grouping alias { description "Specifies an alias."; + leaf-list vlan { + type uint16; + description + "VLAN of the alias."; + } leaf-list prefix { type inet:ip-prefix; description @@ -496,10 +558,6 @@ grouping mpls-match-parameters-config { type uint8; description "Identifies the target protocol number. - - Values are taken from the IANA protocol registry: - https://www.iana.org/assignments/protocol-numbers/ - For example, 6 for TCP or 17 for UDP."; } leaf-list fqdn { @@ -514,27 +572,141 @@ grouping mpls-match-parameters-config { } } + grouping icmpv4-header-fields { + description + "Collection of ICMPv4 header fields that can be + used to set up a match filter."; + leaf type { + type iana-icmpv4-types:icmpv4-type; + description + "Also known as control messages."; + reference + "RFC 792: Internet Control Message Protocol."; + } + leaf code { + type uint8; + description + "ICMP subtype."; + reference + "RFC 792: Internet Control Message Protocol."; + } + leaf rest-of-header { + type binary; + description + "Unbounded in length, the contents vary based on the + ICMP type and code."; + reference + "RFC 792: Internet Control Message Protocol"; + } + } + + grouping icmpv6-header-fields { + description + "Collection of ICMPv6 header fields that can be + used to set up a match filter."; + leaf type { + type iana-icmpv6-types:icmpv6-type; + description + "Also known as control messages."; + reference + "RFC 4443: Internet Control Message Protocol (ICMPv6) + for Internet Protocol Version 6 (IPv6) + Specification."; + } + leaf code { + type uint8; + description + "ICMP code."; + reference + "RFC 4443: Internet Control Message Protocol (ICMPv6) + for Internet Protocol Version 6 (IPv6) + Specification."; + } + leaf rest-of-header { + type binary; + description + "Unbounded in length, the contents vary based on the + ICMP type and code. Also referred to as 'Message Body' + in ICMPv6."; + reference + "RFC 4443: Internet Control Message Protocol (ICMPv6) + for Internet Protocol Version 6 (IPv6) + Specification."; + } + } + + grouping acl-complementary-actions { + description + "Collection of complementary ACL actions."; + + container log-action { + description + "Container for defining log actions."; + + leaf log-type { + type identityref { + base acl-enh:log-types; + } + description + "The type of log action to be performed."; + } + leaf log-id { + when "../log-type = 'local-log'" { + description + "Name of the log file updated when type is 'local-log'."; + } + type string; + description + "The name of the counter action."; + } + } + + container counter-action { + description + "Container for defining counter actions."; + + leaf counter-type { + type identityref { + base acl-enh:counter-type; + } + description + "The type of counter action to be performed."; + } + leaf-list counter-name { + when "../counter-type = 'counter-name'" { + description + "Name for the counter or variable to update when counter-type + is 'counter-name'."; + } + type string; + description + "List of possible variables or counter names to + update based on match critieria."; + } + } + } + augment "/acl:acls/acl:acl/acl:aces/acl:ace" + "/acl:matches" { description - "Add a new match types."; + "Adds a match type based on the payload."; choice payload { description - "Match a prefix pattern."; + "Matches based upon a prefix pattern."; container prefix-pattern { if-feature "match-on-payload"; description - "Rule to perform payload-based match."; + "Indicates the rule to perform the payload-based match."; uses payload; } } choice alias { description - "Match on aliases."; + "Matches based upon aliases."; leaf-list alias-name { type alias-ref; description - "A set of aliases."; + "Indicates one or more aliases."; } } choice mpls { @@ -542,17 +714,17 @@ grouping mpls-match-parameters-config { if-feature "match-on-mpls"; uses mpls-match-parameters-config; description - "Rule set that matches MPLS headers."; + "Provides the rule set that matches MPLS headers."; } description - "Match MPLS headers, for example, label values"; + "Matches against MPLS headers, for example, label values"; } } augment "/acl:acls/acl:acl/acl:aces" + "/acl:ace/acl:matches/acl:l2" { description - "Handle the augmentation of MAC VLAN Filter."; + "Adds a match type based on MAC VLAN and ISID filters."; container vlan-filter { if-feature "match-on-vlan-filter"; description @@ -565,7 +737,7 @@ grouping mpls-match-parameters-config { } choice vlan-type { description - "vlan definition from range or operator."; + "VLAN definition from range or operator."; case range { leaf lower-vlan { type uint16; @@ -595,18 +767,12 @@ grouping mpls-match-parameters-config { leaf-list vlan { type uint16; description - "vlan number along with the operator on which to + "VLAN number along with the operator on which to match."; } } } } - } - - augment "/acl:acls/acl:acl/acl:aces" - + "/acl:ace/acl:matches/acl:l2" { - description - "Handle the augmentation of ISID Filter."; container isid-filter { if-feature "match-on-isid-filter"; description @@ -621,7 +787,7 @@ grouping mpls-match-parameters-config { type uint16; must '. <= ../upper-isid' { error-message - "The lower-vlan must be less than or equal to + "The lower-isid must be less than or equal to the upper-isid."; } mandatory true; @@ -654,7 +820,7 @@ grouping mpls-match-parameters-config { } augment "/acl:acls/acl:acl/acl:aces" - + "/acl:ace/acl:matches/acl:l3/acl:ipv4" { + + "/acl:ace/acl:matches/acl:l3/acl:ipv4/acl:ipv4" { description "Handle non-initial and initial fragments for IPv4 packets."; container ipv4-fragment { @@ -683,7 +849,7 @@ grouping mpls-match-parameters-config { } augment "/acl:acls/acl:acl/acl:aces" - + "/acl:ace/acl:matches/acl:l3/acl:ipv6" { + + "/acl:ace/acl:matches/acl:l3/acl:ipv6/acl:ipv6" { description "Handles non-initial and initial fragments for IPv6 packets."; container ipv6-fragment { @@ -707,6 +873,11 @@ grouping mpls-match-parameters-config { description "A reference to a protocol set to match the protocol field."; } + leaf extension-header { + type iana-ipv6-ext-types:ipv6-extension-header-type; + description + "IPv6 extension header value."; + } } augment "/acl:acls/acl:acl/acl:aces" @@ -750,10 +921,16 @@ grouping mpls-match-parameters-config { + "/acl:ace/acl:matches/acl:l4/acl:icmp" { description "Handle ICMP type sets."; - leaf icmp-set { - type icmp-type-set-ref; + leaf icmpv4-set { + type icmpv4-type-set-ref; description - "A reference to an ICMP type set to match the ICMP type + "A reference to an ICMPv4 type set to match the ICMPv4 type + field."; + } + leaf icmpv6-set { + type icmpv6-type-set-ref; + description + "A reference to an ICMPv6 type set to match the ICMPv6 type field."; } } @@ -761,7 +938,10 @@ grouping mpls-match-parameters-config { augment "/acl:acls/acl:acl/acl:aces" + "/acl:ace/acl:actions" { description - "Rate-limit action."; + "Complementary actions including Rate-limit action."; + + uses acl-complementary-actions; + leaf rate-limit { when "../acl:forwarding = 'acl:accept'" { description @@ -895,29 +1075,51 @@ grouping mpls-match-parameters-config { } } } - container icmp-type-sets { + container icmpv4-type-sets { description - "Data definitions for a list of ICMP types which can be + "Data definitions for a list of ICMPv4 types which can be matched in policies."; - list icmp-type-set { + list icmpv4-type-set { key "name"; description "List of ICMP type set definitions."; leaf name { type string; description - "Name of the ICMP type set -- this is used as a label to + "Name of the ICMPv4 type set -- this is used as a label to reference the set in match conditions."; } list types { key "type"; description - "Includes a list of ICMP types."; - uses packet-fields:acl-icmp-header-fields; + "Includes a list of ICMPv4 types."; + uses icmpv4-header-fields; } } } - } + container icmpv6-type-sets { + description + "Data definitions for a list of ICMPv6 types which can be + matched in policies."; + list icmpv6-type-set { + key "name"; + description + "List of ICMP type set definitions."; + leaf name { + type string; + description + "Name of the ICMPv6 type set -- this is used as a label to + reference the set in match conditions."; + } + list types { + key "type"; + description + "Includes a list of ICMPv6 types."; + uses icmpv6-header-fields; + } + } + } +} container aliases { description "Top-levl container for aliases."; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-external-transaction-id@2022-10-20.yang b/experimental/ietf-extracted-YANG-modules/ietf-external-transaction-id@2022-10-20.yang index 11f7c4e2e..f675d4215 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-external-transaction-id@2022-10-20.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-external-transaction-id@2022-10-20.yang @@ -12,8 +12,8 @@ module ietf-external-transaction-id { organization "IETF OPSAWG Working Group"; contact - "WG Web: - WG List: + "WG Web: + WG List: Author: Benoit Claise Author: Jean Quilbeuf "; description diff --git a/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2022-03-10.yang b/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2022-03-10.yang rename to experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang index a6ca066b5..60013a95b 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2022-03-10.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-otn-tunnel@2023-10-12.yang @@ -34,7 +34,7 @@ module ietf-otn-tunnel { Editor: Victor Lopez - + Editor: Yunbin Xu "; @@ -44,13 +44,12 @@ module ietf-otn-tunnel { The model fully conforms to the Network Management Datastore Architecture (NMDA). - - Copyright (c) 2022 IETF Trust and the persons + Copyright (c) 2023 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 + 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). @@ -58,9 +57,9 @@ module ietf-otn-tunnel { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2022-03-10" { + revision "2023-10-12" { description - "Updated revision to align with the latest TE tunnel model."; + "Initial version"; reference "RFC XXXX: OTN Tunnel YANG Model"; // RFC Ed.: replace XXXX with actual RFC number, update date @@ -93,7 +92,6 @@ module ietf-otn-tunnel { uses l1-types:otn-path-bandwidth; } } - augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:te-bandwidth/te:technology" { @@ -522,6 +520,7 @@ module ietf-otn-tunnel { uses l1-types:otn-label-start-end; } } + augment "/te:te/te:tunnels/te:tunnel/" + "te:primary-paths/te:primary-path/" + "te:path-out-segment/te:label-restrictions/" @@ -765,7 +764,6 @@ module ietf-otn-tunnel { uses l1-types:otn-label-hop; } } - augment "/te:te/te:tunnels/te:tunnel/" + "te:secondary-paths/te:secondary-path/" + "te:path-in-segment/te:label-restrictions/"