Skip to content

Commit 906679d

Browse files
authored
yc.o sync (#1654)
1 parent ed73740 commit 906679d

File tree

3 files changed

+224
-56
lines changed

3 files changed

+224
-56
lines changed
Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
module ietf-schc-icmpv6 {
2+
yang-version 1.1;
3+
namespace "urn:ietf:params:xml:ns:yang:ietf-schc-icmpv6";
4+
prefix schc-icmpv6;
5+
6+
import ietf-schc {
7+
prefix schc;
8+
}
9+
10+
organization
11+
"IETF Static Context Header Compression (schc) working group";
12+
contact
13+
"WG Web: <https://datatracker.ietf.org/wg/schc/about/>
14+
WG List: <mailto:[email protected]>
15+
Editor: Laurent Toutain
16+
17+
Editor: Ana Minaburo
18+
<mailto:[email protected]>";
19+
description
20+
"
21+
Copyright (c) 2021 IETF Trust and the persons identified as
22+
authors of the code. All rights reserved.
23+
24+
Redistribution and use in source and binary forms, with or
25+
without modification, is permitted pursuant to, and subject to
26+
the license terms contained in, the Simplified BSD License set
27+
forth in Section 4.c of the IETF Trust's Legal Provisions
28+
Relating to IETF Documents
29+
(https://trustee.ietf.org/license-info).
30+
31+
This version of this YANG module is part of RFC XXXX
32+
(https://www.rfc-editor.org/info/rfcXXXX); see the RFC itself
33+
for full legal notices.
34+
35+
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL
36+
NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED',
37+
'MAY', and 'OPTIONAL' in this document are to be interpreted as
38+
described in BCP 14 (RFC 2119) (RFC 8174) when, and only when,
39+
they appear in all capitals, as shown here.
40+
41+
*******************************************************************
42+
43+
This module extends the ietf-schc module to include the
44+
describe ICMPv6 Field IDs, MO and CDA described in RFC YYYY.
45+
It does not introduce new leaf in the Data Model.";
46+
47+
revision 2024-11-20 {
48+
description
49+
"Initial version for RFC YYYY ";
50+
reference
51+
"RFC YYYY: ICMPv6";
52+
}
53+
54+
identity fid-icmpv6-base-type {
55+
base schc:fid-base-type;
56+
description
57+
"Field IP base type for ICMPv6 headers described in RFC 4443";
58+
reference
59+
"RFC 4443 Internet Control Message Protocol (ICMPv6)
60+
for the Internet Protocol Version 6 (IPv6)
61+
Specification";
62+
}
63+
64+
// ICMPv6 Fields
65+
66+
identity fid-icmpv6-type {
67+
base fid-icmpv6-base-type;
68+
description
69+
"ICMPv6 code field present in all ICMPv6 messages.";
70+
}
71+
72+
identity fid-icmpv6-code {
73+
base fid-icmpv6-base-type;
74+
description
75+
"ICMPv6 code field present in all ICMPv6 messages.";
76+
}
77+
78+
identity fid-icmpv6-checksum {
79+
base fid-icmpv6-base-type;
80+
description
81+
"ICMPv6 checksum field present in all ICMPv6 messages.";
82+
}
83+
84+
identity fid-icmpv6-mtu {
85+
base fid-icmpv6-base-type;
86+
description
87+
"ICMPv6 MTU, present in Packet Too Big message.";
88+
}
89+
90+
identity fid-icmpv6-pointer {
91+
base fid-icmpv6-base-type;
92+
description
93+
"ICMPv6 Pointer, present in Parameter Problem message.";
94+
}
95+
96+
identity fid-icmpv6-identifier {
97+
base fid-icmpv6-base-type;
98+
description
99+
"ICMPv6 identifier field, present in Echo Request/Reply
100+
message.";
101+
}
102+
103+
identity fid-icmpv6-sequence {
104+
base fid-icmpv6-base-type;
105+
description
106+
"ICMPv6 sequence number field, present in Echo Request/Reply
107+
message.";
108+
}
109+
110+
identity fid-icmpv6-payload {
111+
base fid-icmpv6-base-type;
112+
description
113+
"ICMPv6 payload following ICMPv6 header.
114+
If payload is empty, this field exists with a length of 0.";
115+
}
116+
117+
// MO and CDA
118+
119+
identity mo-rule-match {
120+
base schc:mo-base-type;
121+
description
122+
"Macthing operator return true, if the TV matches a rule
123+
keeping UP and DOWN direction.";
124+
}
125+
126+
identity mo-rev-rule-match {
127+
base schc:mo-base-type;
128+
description
129+
"Macthing operator return true, if the TV matches a rule
130+
reversing UP and DOWN direction.";
131+
}
132+
133+
identity cda-compress-sent {
134+
base schc:mo-base-type;
135+
description
136+
"Send a compressed version of TV keeping UP and
137+
DOWN direction.";
138+
}
139+
140+
identity cda-rev-compress-sent {
141+
base schc:mo-base-type;
142+
description
143+
"Send a compressed version of TV reversing UP and
144+
DOWN direction.";
145+
}
146+
}
Lines changed: 66 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ module ietf-telemetry-message {
1010
}
1111
import ietf-inet-types {
1212
prefix inet;
13+
reference
14+
"RFC 6991: Common YANG Data Types";
1315
}
1416
import ietf-platform-manifest {
1517
prefix p-mf;
@@ -27,8 +29,9 @@ module ietf-telemetry-message {
2729
Thomas Graf
2830
<mailto:[email protected]>";
2931
description
30-
"This YANG modules defines a model for a telemetry collector to send
31-
collected YANG data from the network.
32+
"This YANG module defines an extensible message schema to be used at
33+
the data collection to transform Network Telemetry messages into
34+
external systems such as Message Brokers.
3235
3336
Copyright (c) 2025 IETF Trust and the persons identified as
3437
authors of the code. All rights reserved.
@@ -42,7 +45,7 @@ module ietf-telemetry-message {
4245
This version of this YANG module is part of RFC XXXX; see the RFC
4346
itself for full legal notices.";
4447

45-
revision 2025-04-17 {
48+
revision 2025-06-10 {
4649
description
4750
"Initial revision.";
4851
reference
@@ -79,6 +82,16 @@ module ietf-telemetry-message {
7982
"RFC 8040.";
8083
}
8184

85+
feature network-node-manifest {
86+
description
87+
"This feature indicates the network node manifest support.";
88+
}
89+
90+
feature data-collection-manifest {
91+
description
92+
"This feature indicates the data collection manifest support.";
93+
}
94+
8295
typedef telemetry-notification-event-type {
8396
type enumeration {
8497
enum log {
@@ -108,78 +121,86 @@ module ietf-telemetry-message {
108121
base session-protocol;
109122
}
110123
description
111-
"Notification protocol used to deliver the notification to the
112-
data collection.";
124+
"Network Telemetry protocol used to deliver the notification
125+
between the network node and the data collection.";
113126
}
114127

115128
container message {
116129
config false;
117130
description
118-
"Telemetry message used in Data Mesh";
119-
leaf timestamp {
120-
type yang:date-and-time;
121-
mandatory true;
122-
description
123-
"Timestamp when the data collection collected the payload
124-
from the network element or an update or delete event is
125-
triggered.";
126-
}
127-
leaf session-protocol {
128-
type telemetry-session-protocol-type;
129-
mandatory true;
130-
description
131-
"Session protocol used to collect the payload of this message
132-
from the network";
133-
}
131+
"Telemetry message used within the Data Mesh";
134132
container network-node-manifest {
133+
if-feature "network-node-manifest";
135134
description
136-
"Address of network element from which the payload is
137-
collected.";
138-
uses p-mf:platform-details;
139-
}
140-
container data-collection-manifest {
141-
description
142-
"Address of the telemetry data collection.";
135+
"Contains the Data Manifest about the network node that
136+
exported Network Telemetry data.";
143137
uses p-mf:platform-details;
144138
}
145139
container telemetry-message-metadata {
146140
description
147-
"Extensible message and protocol specific metadata";
148-
leaf event-time {
141+
"contains the session information about the session between the
142+
collector and the network node.";
143+
leaf node-export-timestamp {
149144
type yang:date-and-time;
150145
description
151-
"NETCONF eventTime. Redefined in here since NETCONF header is
152-
XML not YANG.";
146+
"Timestamp when the Network Telemetry data has been exported
147+
from network element.";
153148
}
154-
}
155-
container data-collection-metadata {
156-
description
157-
"Metadata added by data collection.";
158-
leaf remote-address {
149+
leaf collection-timestamp {
150+
type yang:date-and-time;
151+
mandatory true;
152+
description
153+
"Timestamp when the data collection collected the Network
154+
Telemetry data from the network element.";
155+
}
156+
leaf session-protocol {
157+
type telemetry-session-protocol-type;
158+
mandatory true;
159+
description
160+
"Session protocol used to collect the Network Telemetry data
161+
from the network node.";
162+
}
163+
leaf export-address {
159164
type inet:host;
160165
mandatory true;
161166
description
162-
"Network node IP address.";
167+
"Network node IP address from where the Network Telemetry data
168+
was exported from.";
163169
}
164-
leaf remote-port {
170+
leaf export-port {
165171
type inet:port-number;
166172
description
167-
"Network node transport port number.";
173+
"Network node transport port number from where the Network
174+
Telemetry data was exported.";
168175
}
169-
leaf local-address {
176+
leaf collection-address {
170177
type inet:host;
171178
description
172-
"Data collection IP address.";
179+
"Data collection IP address at which the Network Telemetry
180+
data was collected.";
173181
}
174-
leaf local-port {
182+
leaf collection-port {
175183
type inet:port-number;
176184
description
177-
"Data collection transport port number.";
185+
"Data collection transport port number at which the Network
186+
Telemetry data was collected.";
178187
}
188+
}
189+
container data-collection-manifest {
190+
if-feature "data-collection-manifest";
191+
description
192+
"Contains the Data Manifest of the data collection which
193+
collected the Network Telemetry data.";
194+
uses p-mf:platform-details;
195+
}
196+
container network-operator-metadata {
197+
description
198+
"Network operator specific metadata added by the Network
199+
Telemetry data collection.";
179200
list labels {
180201
key "name";
181202
description
182-
"Arbiterary labels assinged by the data collection.";
203+
"Abritrary labels assinged by the data collection.";
183204
leaf name {
184205
type string {
185206
length "1..max";
Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ module ietf-yang-push-telemetry-message {
1212
import ietf-telemetry-message {
1313
prefix tm;
1414
reference
15-
"XXX";
15+
"draft-netana-nmop-message-broker-telemetry-message: Extensible
16+
YANG Model for Network Telemetry Messages";
1617
}
1718
import ietf-yang-push {
1819
prefix yp;
@@ -33,14 +34,13 @@ module ietf-yang-push-telemetry-message {
3334
import ietf-yang-revisions {
3435
prefix rev;
3536
reference
36-
"RFC YYYY: draft-ietf-netmod-yang-module-versioning-11,
37-
Updated YANG Module Revision Handling";
37+
"draft-ietf-netmod-yang-module-versioning: Updated YANG Module
38+
Revision Handling";
3839
}
3940
import ietf-yang-semver {
4041
prefix ysver;
4142
reference
42-
"RFC ZZZZ: draft-ietf-netmod-yang-semver-15, YANG Semantic
43-
Versioning";
43+
"draft-ietf-netmod-yang-semver: YANG Semantic Versioning";
4444
}
4545

4646
organization
@@ -52,8 +52,9 @@ module ietf-yang-push-telemetry-message {
5252
Thomas Graf
5353
<mailto:[email protected]>";
5454
description
55-
"Augments the ietf-telemetry-message with YANG Push specific
56-
fields.
55+
"Adds YANG-Push specific subscription metadata to the data
56+
collection protocol provenance of the ietf-telemetry-message
57+
envelope.
5758
5859
The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL',
5960
'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED',
@@ -74,7 +75,7 @@ module ietf-yang-push-telemetry-message {
7475
This version of this YANG module is part of RFC XXXX; see the RFC
7576
itself for full legal notices.";
7677

77-
revision 2025-04-17 {
78+
revision 2025-06-10 {
7879
description
7980
"Initial revision.";
8081
reference
@@ -84,11 +85,11 @@ module ietf-yang-push-telemetry-message {
8485
augment "/tm:message/tm:telemetry-message-metadata" {
8586
description
8687
"Augments telemetry-message-metadata with YANG-Push specific
87-
metadata";
88+
subscription metadata";
8889
container yang-push-subscription {
8990
config false;
9091
description
91-
"YANG-Push specific metadata";
92+
"YANG-Push specific subscription metadata";
9293
leaf id {
9394
type sn:subscription-id;
9495
description
@@ -105,7 +106,7 @@ module ietf-yang-push-telemetry-message {
105106
Section 6.";
106107
reference
107108
"RFC 6241: Network Configuration Protocol (NETCONF),
108-
Section 6.";
109+
Section 6.";
109110
}
110111
leaf xpath-filter {
111112
type yang:xpath1.0;

0 commit comments

Comments
 (0)