Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest yc.o merge #1574

Merged
merged 36 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
edad1ac
Cronjob - daily check of IETF modules.
Jul 20, 2024
899648d
Merge branch 'main' of https://github.com/YangModels/yang into fork-main
Jul 21, 2024
74fe3c3
Merge branch 'YangModels:main' into main
xorrkaz Jul 21, 2024
1a8be51
Merge branch 'fork-main' of https://github.com/ietf-tools/yang into f…
Jul 21, 2024
20410a1
Cronjob - daily check of IANA modules.
Jul 22, 2024
7caa24f
Merge pull request #1 from ietf-tools/fork-main
xorrkaz Jul 22, 2024
7294f2c
Merge pull request #2 from ietf-tools/fork_main
xorrkaz Jul 22, 2024
f6fa29f
Merge branch 'main' of https://github.com/ietf-tools/yang into fork-main
Jul 22, 2024
aec92af
Cronjob - daily check of IANA modules.
Jul 22, 2024
479048c
Cronjob - daily check of IANA modules.
Jul 23, 2024
1b76afb
Merge branch 'main' of https://github.com/ietf-tools/yang
Jul 24, 2024
d05140b
Cronjob - daily check of IANA modules.
Jul 26, 2024
c8aec66
Cronjob - daily check of IETF modules.
Jul 26, 2024
51a7f6b
Merge branch 'main' of https://github.com/YangModels/yang into fork-main
Jul 27, 2024
482141d
Cronjob - daily check of IANA modules.
Jul 22, 2024
3c66e40
Cronjob - daily check of IANA modules.
Jul 23, 2024
a35cf9a
Merge branch 'main' of https://github.com/ietf-tools/yang
Jul 28, 2024
70d87e3
Merge pull request #3 from ietf-tools/fork-main
xorrkaz Jul 28, 2024
b0b87f1
Cronjob - daily check of IETF modules.
Jul 28, 2024
08a2167
Merge branch 'YangModels:main' into main
xorrkaz Jul 29, 2024
442a0f7
Merge branch 'YangModels:main' into fork-main
xorrkaz Jul 29, 2024
f22146f
Merge pull request #4 from ietf-tools/fork-main
xorrkaz Jul 29, 2024
8165892
Merge branch 'main' of https://github.com/YangModels/yang into fork-main
Jul 29, 2024
177eef5
Merge branch 'main' of https://github.com/ietf-tools/yang into fork-main
Jul 29, 2024
b3093b6
Cronjob - daily check of IETF modules.
Jul 30, 2024
72d3c9b
Cronjob - daily check of IETF modules.
Jul 26, 2024
cb871b2
Cronjob - daily check of IETF modules.
Jul 26, 2024
af8a4f0
Cronjob - daily check of IETF modules.
Jul 28, 2024
2a00ea0
Cronjob - daily check of IETF modules.
Jul 30, 2024
002f5cb
Merge branch 'fork-main' of https://github.com/ietf-tools/yang into f…
Aug 2, 2024
4414840
Merge branch 'main' of https://github.com/YangModels/yang
Aug 2, 2024
fd44868
Fix mismerge
xorrkaz Aug 2, 2024
ffdeb01
Merge remote-tracking branch 'fork/main' into fork-main
Aug 2, 2024
1c5fc2e
Merge pull request #6 from ietf-tools/fork-main
xorrkaz Aug 2, 2024
3cd67a9
Cronjob - daily check of IANA modules.
Aug 3, 2024
83d29d1
Cronjob - daily check of IETF modules.
Aug 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions ...odules/[email protected] → ...odules/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module ietf-if-extensions {
namespace "urn:ietf:params:xml:ns:yang:ietf-if-extensions";

prefix if-ext;

import ietf-yang-types {
prefix yang;
reference "RFC 6991: Common YANG Data Types";
Expand All @@ -14,7 +15,6 @@ module ietf-if-extensions {
reference
"RFC 8343: A YANG Data Model For Interface Management";
}

import iana-if-type {
prefix ianaift;
reference "RFC 7224: IANA Interface Type YANG Module";
Expand All @@ -35,7 +35,7 @@ module ietf-if-extensions {
interface YANG model (RFC 8343) with common configurable layer 2
properties.

Copyright (c) 2023 IETF Trust and the persons identified as
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
Expand All @@ -55,9 +55,9 @@ module ietf-if-extensions {
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
they appear in all capitals, as shown here.";

revision 2023-01-26 {
revision 2024-07-31 {
description
"Initial revision.";
"Interface Extension YANG Module initial revision";

reference
"RFC XXXX, Common Interface Extension YANG Data Models";
Expand Down Expand Up @@ -104,6 +104,15 @@ module ietf-if-extensions {
reference "RFC XXXX, Section 2.6 Sub-interface";
}

feature peer-interface {
description
"This feature indicates that the device supports the
specification of peer-interfaces. A Peer-interface is defined
as logical peer that receives egress traffic of the given
interface on its ingress path and vice versa.";
reference "RFC XXXX, Section 2.8 Peer-interface";
}

/*
* Define common identities to help allow interface types to be
* assigned properties.
Expand Down Expand Up @@ -386,6 +395,7 @@ module ietf-if-extensions {
"All interface types that can have a configurable L2
encapsulation.";
}

description
"Holds the OSI layer 2 encapsulation associated with an
interface.";
Expand Down Expand Up @@ -453,6 +463,15 @@ module ietf-if-extensions {
"The forwarding mode that the interface is operating in.";
reference "RFC XXXX, Section 2.7 Forwarding Mode";
}
leaf peer-interface {
if-feature "peer-interface";

type if:interface-ref;

description
"The peer interface associated to this interface.";
reference "RFC XXXX, Section 2.8 Peer-interface";
}
}

/*
Expand Down Expand Up @@ -523,7 +542,6 @@ module ietf-if-extensions {
but are not included in in-unicast-pkts, in-multicast-pkts
or in-broadcast-pkts, because they are not delivered to a
higher layer.

Discontinuities in the values of this counter can occur at
re-initialization of the management system, and at other
times as indicated by the value of the 'discontinuity-time'
Expand Down
3 changes: 0 additions & 3 deletions experimental/ietf-extracted-YANG-modules/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ module ietf-if-flexible-encapsulation {
}
}
}

case dot1q-vlan-tagged {
container dot1q-vlan-tagged {
description
Expand Down Expand Up @@ -254,7 +253,6 @@ module ietf-if-flexible-encapsulation {
+ 'tag-type = "dot1q-types:c-vlan"' {

error-message "Only C-VLAN and S-VLAN tags can be pushed.";

description
"For IEEE 802.1Q interoperability, only C-VLAN and S-VLAN
tags can be pushed.";
Expand Down Expand Up @@ -303,7 +301,6 @@ module ietf-if-flexible-encapsulation {

container dot1q-tag-rewrite {
if-feature "dot1q-tag-rewrites";

description
"802.1Q VLAN tag rewrite.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ module ietf-if-vlan-encapsulation {
VLAN tagged Ethernet traffic by exactly matching the tag type
and VLAN identifier of one or two 802.1Q VLAN tags in the frame.

Copyright (c) 2023 IETF Trust and the persons identified as
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
Expand Down
89 changes: 15 additions & 74 deletions [email protected][email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,12 @@ module ietf-network-slice-service {
import ietf-te-types {
prefix te-types;
reference
"RFC 8776: Traffic Engineering Common YANG Types";
"RFC DDDD: Common YANG Types for Traffic Engineering";
}
import ietf-te-packet-types {
prefix te-packet-types;
reference
"RFC DDDD: Common YANG Data Types for Traffic Engineering";
}

organization
Expand Down Expand Up @@ -86,7 +91,8 @@ 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-05-09 {

revision 2024-07-29 {
description
"Initial revision.";
reference
Expand Down Expand Up @@ -374,6 +380,7 @@ module ietf-network-slice-service {
"RFC 7680: A One-Way Loss Metric for IP Performance
Metrics (IPPM)";
}

identity availability-type {
description
"Base identity for availability.";
Expand Down Expand Up @@ -839,80 +846,14 @@ module ietf-network-slice-service {
}
}

grouping one-way-performance-metrics {
description
"One-way PM metrics grouping.";
leaf one-way-min-delay {
type yang:gauge64;
description
"One-way minimum delay or latency in microseconds.";
}
leaf one-way-max-delay {
type yang:gauge64;
description
"One-way maximum delay or latency in microseconds.";
reference
"RFC 7679: A One-Way Delay Metric for IP Performance
Metrics (IPPM)";
}
leaf one-way-delay-variation {
type yang:gauge64;
description
"One-way delay variation in microseconds.";
reference
"RFC 3393: IP Packet Delay Variation Metric for IP Performance
Metrics (IPPM)";
}
leaf one-way-packet-loss {
type percentage;
description
"The ratio of packets dropped to packets transmitted between
two endpoints.";
reference
"RFC 7680: A One-Way Loss Metric for IP Performance
Metrics (IPPM)";
}
}

grouping two-way-performance-metrics {
description
"Two-way packet PM metrics grouping.";
leaf two-way-min-delay {
type yang:gauge64;
description
"Two-way minimum delay or latency in microseconds.";
reference
"RFC 2681: A Round-trip Delay Metric for IPPM";
}
leaf two-way-max-delay {
type yang:gauge64;
description
"Two-way maximum delay or latency in microseconds.";
reference
"RFC 2681: A Round-trip Delay Metric for IPPM";
}
leaf two-way-delay-variation {
type yang:gauge64;
description
"Two-way delay variation in microseconds.";
reference
"RFC 5481: Packet Delay Variation Applicability Statement";
}
leaf two-way-packet-loss {
type percentage;
description
"The ratio of packets dropped to packets transmitted between
two endpoints.";
}
}

grouping connectivity-construct-monitoring-metrics {
description
"Grouping for connectivity construct monitoring metrics.";
uses one-way-performance-metrics;
uses two-way-performance-metrics;
uses
te-packet-types:one-way-performance-metrics-gauge-packet;
uses
te-packet-types:two-way-performance-metrics-gauge-packet;
}

/* Main Network Slice Services Container */

container network-slice-services {
Expand Down Expand Up @@ -1137,8 +1078,8 @@ module ietf-network-slice-service {
leaf ac-svc-ref {
type ac-svc:attachment-circuit-reference;
description
"A reference to the AC service that have been created before
the slice creation.";
"A reference to the AC service that have been
created before the slice creation.";
reference
"RFC CCCC: YANG Data Models for Bearers and
'Attachment Circuits'-as-a-Service (ACaaS)";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module ietf-tpm-remote-attestation {
"WG Web : <https://datatracker.ietf.org/wg/rats/>
WG List : <mailto:[email protected]>
Author : Eric Voit <[email protected]>
Author : Henk Birkholz <henk.birkholz@ietf.contact>
Author : Henk Birkholz <henk.birkholz@sit.fraunhofer.de>
Author : Michael Eckel <[email protected]>
Author : Shwetha Bhandari <[email protected]>
Author : Bill Sulzen <[email protected]>
Expand Down
10 changes: 5 additions & 5 deletions standard/iana/yang-parameters.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<registry xmlns="http://www.iana.org/assignments" id="yang-parameters">
<title>YANG Parameters</title>
<created>2010-06-10</created>
<updated>2024-07-25</updated>
<updated>2024-08-02</updated>

<registry id="yang-parameters-1">
<title>YANG Module Names</title>
Expand Down Expand Up @@ -1779,15 +1779,15 @@ and <xref type="registry" data="safi-namespace">Subsequent Address Family Identi
<xref type="rfc" data="rfc9418"/>
<notes/>
</record>
<record date="2024-01-26">
<record date="2024-01-26" updated="2024-08-02">
<name>ietf-sid-file</name>
<iana>N</iana>
<file type="yang"/>
<file type="yang">[email protected]</file>
<namespace>urn:ietf:params:xml:ns:yang:ietf-sid-file</namespace>
<prefix>sid</prefix>
<module/>
<xref type="draft" data="RFC-ietf-core-sid-24"/>
<notes><xref type="draft" data="RFC-ietf-core-sid-24"/>'s module file will be posted upon the document's publication as an RFC.</notes>
<xref type="rfc" data="rfc9595"/>
<notes/>
</record>
<record date="2014-10-22">
<name>ietf-snmp</name>
Expand Down
1 change: 1 addition & 0 deletions standard/ietf/RFC/ietf-sid-file.yang
Loading
Loading