Skip to content

Commit

Permalink
Merge pull request #1439 from yang-catalog/main
Browse files Browse the repository at this point in the history
Cronjob - daily update of yang files.
  • Loading branch information
SlavomirMazurPantheon committed Jun 28, 2023
2 parents c507458 + 8da3258 commit 43bfe7f
Show file tree
Hide file tree
Showing 5 changed files with 362 additions and 94 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module iana-icmp-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
Expand Down
127 changes: 127 additions & 0 deletions experimental/ietf-extracted-YANG-modules/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ module ietf-acl-enh {
Control Lists (ACLs), Section 4.2";
}

import ietf-routing-types {
prefix rt-types;
reference
"RFC 8294: Common YANG Data Types for the Routing Area";
}

organization
"IETF NETMOD Working Group";
contact
Expand Down Expand Up @@ -72,6 +78,16 @@ module ietf-acl-enh {
"Match based on a ISID range of vlan list is supported.";
}

feature match-on-alias {
description
"Match based on aliases.";
}

feature match-on-mpls {
description
"Match based on MPLS headers.";
}

identity offset-type {
description
"Base identity for payload offset type.";
Expand Down Expand Up @@ -173,6 +189,29 @@ module ietf-acl-enh {
"RFC 9293: Transmission Control Protocol (TCP), Section 3.1";
}

identity mpls-acl-type {
base acl:acl-base;
description
"An ACL that matches on fields from the MPLS header.";
}

identity label-position {
description
"Base identity for deriving MPLS label position.";
}

identity top {
base label-position;
description
"Top of the label stack.";
}

identity bottom {
base label-position;
description
"Bottom of the label stack.";
}

typedef operator {
type bits {
bit not {
Expand Down Expand Up @@ -272,6 +311,14 @@ module ietf-acl-enh {
"Defines a reference to an ICMP type set.";
}

typedef alias-ref {
type leafref {
path "/acl-enh:aliases/acl-enh:alias/acl-enh:name";
}
description
"Defines a reference to an alias.";
}

grouping tcp-flags {
description
"Operations on TCP flags.";
Expand Down Expand Up @@ -323,6 +370,67 @@ module ietf-acl-enh {
}
}

grouping mpls-match-parameters-config {
description
"Parameters for the configuration of MPLS match rules.";

leaf traffic-class {
type uint8 {
range "0..7";
}
description
"The value of the MPLS traffic class (TC) bits,
formerly known as the EXP bits.";
}

leaf label-position {
type identityref {
base label-position;
}
description
"Position of the label";
}

leaf upper-label-range {
type rt-types:mpls-label;
description
"Match MPLS label value on the MPLS header.
The usage of this field indicated the upper
range value in the top of the stack.
This label value does not include the
encodings of Traffic Class and TTL.";
reference
"RFC 3032: MPLS Label Stack Encoding";
}

leaf lower-label-range {
type rt-types:mpls-label;
description
"Match MPLS label value on the MPLS header.
The usage of this field indicated the lower
range value in the top of the stack.
This label value does not include the
encodings of Traffic Class and TTL.";
reference
"RFC 3032: MPLS Label Stack Encoding";
}

leaf label-block-name {
type string;
description
"Reference to a label block predefiend in the
implementation.";
}

leaf ttl-value {
type uint8;
description
"Time-to-live MPLS packet value match.";
reference
"RFC 3032: MPLS Label Stack Encoding";
}
}

grouping payload {
description
"Operations on payload match.";
Expand Down Expand Up @@ -420,6 +528,25 @@ module ietf-acl-enh {
uses payload;
}
}
choice alias {
description
"Match on aliases.";
leaf-list alias-name {
type alias-ref;
description
"A set of aliases.";
}
}
choice mpls {
container mpls-values {
if-feature "match-on-mpls";
uses mpls-match-parameters-config;
description
"Rule set that matches MPLS headers.";
}
description
"Match MPLS headers, for example, label values";
}
}

augment "/acl:acls/acl:acl/acl:aces"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ module ietf-ioam {
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
for full legal notices.";

revision 2023-02-27 {
revision 2023-06-26 {
description "First revision.";
reference "RFC XXXX: A YANG Data Model for In-Situ OAM";
}
Expand All @@ -84,6 +84,14 @@ module ietf-ioam {
reference "RFC 9197: Data Fields for In-situ OAM";
}

feature direct-export
{
description
"This feature indicated that the direct export option is
supported.";
reference "RFC 9326: In-situ OAM Direct Exporting";
}

feature proof-of-transit
{
description
Expand Down Expand Up @@ -246,7 +254,6 @@ module ietf-ioam {
"It indicates presence of variable length Opaque State Snapshot
field.";
}

identity pot-type {
description
"Base identity to represent Proof of Transit (PoT) types.";
Expand Down Expand Up @@ -282,6 +289,7 @@ module ietf-ioam {
"It indicates the presence of timestamp seconds representing
the time at which the packet entered the IOAM-domain.";
}

identity e2e-timestamp-fraction {
base e2e-type;
description
Expand Down Expand Up @@ -452,6 +460,37 @@ module ietf-ioam {
}
}

grouping ioam-direct-export-profile {
description
"A grouping for direct export profile.";

leaf node-action {
type ioam-node-action;
description "This indicates what action the node will take,
e.g. encapsulation.";
}

uses encap-tracing {
when "derived-from-or-self(node-action,
'ioam:action-encapsulate')";
}

leaf flow-id {
when "derived-from-or-self(../node-action,
'ioam:action-encapsulate')";
type uint32;
description
"A 32-bit flow identifier. The field is set at the
encapsulating node. The Flow ID can be uniformly assigned
by a central controller or algorithmically generated by the
encapsulating node. The latter approach cannot guarantee
the uniqueness of Flow ID, yet the conflict probability is
small due to the large Flow ID space.flow-id is used to
correlate the exported data of the same flow from multiple
nodes and from multiple packets.";
}
}

grouping ioam-e2e-profile {
description
"A grouping for edge-to-edge profile.";
Expand Down Expand Up @@ -609,6 +648,21 @@ module ietf-ioam {
uses ioam-preallocated-tracing-profile;
}

container direct-export-profile {
if-feature direct-export;
description
"It describes the profile for direct-export option";

leaf enabled {
type boolean;
default false;
description
"When true, apply direct-export option to the
specified flow identified by the following filter.";
}

uses ioam-direct-export-profile;
}
container pot-profile {
if-feature proof-of-transit;
description
Expand Down
17 changes: 10 additions & 7 deletions ...ules/[email protected] → ...ules/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module ietf-te-packet-types {
Editor: Rakesh Gandhi
<mailto:[email protected]>
Editor: Vishnu Pavan Beeram
<mailto:[email protected]>
Expand Down Expand Up @@ -54,7 +55,7 @@ module ietf-te-packet-types {
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
for full legal notices.";

revision 2023-03-10 {
revision 2023-06-23 {
description
"Added common TE packet identities:
- bandwidth-profile-type.
Expand Down Expand Up @@ -547,7 +548,7 @@ module ietf-te-packet-types {
grouping te-packet-path-bandwidth {
description
"Path bandwidth for Packet. ";
leaf bandwidth-profile-name{
leaf bandwidth-profile-name {
type string;
description "Name of Bandwidth Profile.";
}
Expand All @@ -560,14 +561,14 @@ module ietf-te-packet-types {

leaf cir {
type uint64;
units "Kbps";
units "bits/second";
description
"Committed Information Rate in kilobits per second.";
}

leaf eir {
type uint64;
units "Kbps";
units "bytes";
/*
Need to indicate that EIR is not supported by RFC 2697
Expand All @@ -588,28 +589,30 @@ module ietf-te-packet-types {

leaf cbs {
type uint64;
units "KBytes";
units "bits/second";
description
"Committed Burst Size.";
}

leaf ebs {
type uint64;
units "KBytes";
units "bytes";
description
"Excess Burst Size.
In case of RFC 2698: PBS = CBS + EBS";
}
}

// CHANGE NOTE: The te-packet-path-bandwidth below has been
// added in this module revision
// RFC Editor: remove the note above and this note
grouping te-packet-link-bandwidth {
description
"Link Bandwidth for Packet. ";
leaf packet-bandwidth {
type te-types:bandwidth-scientific-notation;
type uint64;
units "bits/second";
description
"Available bandwith value expressed in kilobits per
second";
Expand Down
Loading

0 comments on commit 43bfe7f

Please sign in to comment.