Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module iana-ioam-integrity-protection-methods {
"IOAM Integrity Protection Methods
(https://www.iana.org/assignments/ioam/ioam.xhtml)";

revision 2026-04-22 {
revision 2026-05-08 {
description
"Initial version.";
reference
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ module ietf-ioam-integrity {
Pre-allocated Trace Option. Therefore, the model does not
impose constraints that would prevent such use cases.";

revision 2026-04-22 {
revision 2026-05-08 {
description
"Initial version.";
reference
Expand Down Expand Up @@ -127,6 +127,7 @@ module ietf-ioam-integrity {
when "derived-from-or-self(../node-action,
'ioam:action-encapsulate')";
type iana-ioam-ipm:method-id;
mandatory true;
description
"This object indicates the Integrity Protection Method for
this profile. 'int-method' is only defined at the
Expand Down Expand Up @@ -179,7 +180,7 @@ module ietf-ioam-integrity {
leaf pot-type {
type ioam:ioam-pot-type;
description
"The type of a particular POT variant that specifies
"Type of a particular POT variant that specifies
the POT data that is included.";
}
leaf node-action {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,6 @@ module ietf-oam-test-sequence {
description "References to the ietf-oam-unitary-tests.";

uses "oamut:oam-unitary-test";

leaf numexecutions {
type uint32;
default 1;
description
"Number of times the test sequence should be
executed.";
}
}
uses schedule:schedule-status;
leaf test-sequence-status {
Expand All @@ -162,6 +154,14 @@ module ietf-oam-test-sequence {
description
"The OAM test takes effect based on a recurrence rule.";
uses schedule:recurrence-basic;
leaf execution-count {
type uint32;
description
"If set, limits how many times the test sequence is
executed for this recurrence. If the leaf is absent, there
is no limit: executions follow the recurrence until the
test is removed from the system.";
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,6 @@ module ietf-oam-unitary-test {
"Base identity of basic test type.";
}

identity twamp {
base basic-test-type;
description
"Identity for twamp protocol.";
}

grouping oam-unitary-test {
description
"Specifies a grouping for OAM unitary test for network
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ module ietf-srv6-base {
(NMDA version)";
}

import iana-msd-types {
prefix iana-msd-types;
reference "RFC 9702: YANG Data Model for MSD Types";
}

import ietf-segment-routing {
prefix sr;
reference "draft-ietf-spring-sr-yang";
Expand All @@ -55,7 +60,6 @@ module ietf-srv6-base {

Editor: Xufeng Liu
<mailto:xufeng.liu.ietf@gmail.com>

Editor: Zhibo Hu
<mailto:huzhibo@huawei.com>

Expand Down Expand Up @@ -103,6 +107,15 @@ module ietf-srv6-base {
// RFC Editor: replace XXXX with actual RFC number and remove
// this note

revision 2026-05-06 {
description
"Re-use MSD types (from iana-msd-types) for SRH";
reference
"RFC XXXX: YANG Data Model for SRv6 Base";
// RFC Editor: replace XXXX with actual RFC number and remove
// this note
}

revision 2025-07-07 {
description
"Adding compressed SID and few other missing def";
Expand Down Expand Up @@ -299,8 +312,9 @@ grouping srv6-csid-next16-cfg-grouping {
container local-id-block {
description "Configure LIB parameters";
reference "RFC XXXX: YANG Data Model for SRv6 - Section 3.4.2";

leaf start {
type uint16; // TODO: range
type uint16;
description "LIB space follows GIB space. An implementation may chose
the default index for the start of LIB - e.g. LIB starting
from 0xE000. This configuration item allows to change the start of
Expand All @@ -323,13 +337,6 @@ grouping srv6-csid-next16-cfg-grouping {
}
}

/* TODO
grouping srv6-csid-replace-cfg-grouping {
description "REPLACE-CSID common grouping";
// TODO CFG
}
*/

grouping srv6-sid-formats {
description "SRv6 SID formats grouping";

Expand Down Expand Up @@ -381,12 +388,6 @@ grouping srv6-csid-replace-cfg-grouping {
description "Configuration specific to NEXT-CSID with 16b CSIDs";
uses srv6-csid-next16-cfg-grouping;
}

container csid-replace {
// TODO: when clause if/as needed
description "REPLACE-CSID specific items";
// TODO: uses srv6-csid-replace-cfg-grouping;
}
}
}
}
Expand Down Expand Up @@ -442,6 +443,7 @@ grouping srv6-csid-replace-cfg-grouping {
}
}
}

grouping srv6-remote-locators-state {

description "SRv6 Remote Locator state grouping";
Expand Down Expand Up @@ -538,6 +540,7 @@ grouping srv6-csid-replace-cfg-grouping {

uses srv6-locator-state;
}

uses srv6-remote-locators-state;
}
}
Expand Down Expand Up @@ -630,7 +633,6 @@ grouping srv6-csid-replace-cfg-grouping {
type if:interface-ref;
description "The outgoing Layer2 interface";
}

leaf lookup-table-id {
when "../../../../next-hop-type = 'l2_lookup'" {
description "This leaf is valid only when the nexthop type
Expand Down Expand Up @@ -678,7 +680,6 @@ grouping srv6-csid-replace-cfg-grouping {

description "L3 information";
}

uses path-out-sids-choice;
}

Expand Down Expand Up @@ -727,7 +728,6 @@ grouping srv6-csid-replace-cfg-grouping {

grouping srv6-state-sid {
description "SRv6 SID state grouping";

container sids {

description "My SID state";
Expand Down Expand Up @@ -833,31 +833,23 @@ grouping srv6-csid-replace-cfg-grouping {
grouping srv6-msd-signaled {
description "SRv6 MSD signaled parameter support grouping";

container msd {
container msd {
description "SRv6 signaled MSD parameter support";

leaf max-sl {
type uint8;
description "Maximum value of the SL field in the SRH of
a received packet before applying the Endpoint behavior
associated with a SID";
}
leaf max-end-pop {
type uint8;
description "Maximum number of SIDs in the top SRH in an
SRH stack to which the router can apply
PSP or USP flavors";
}
leaf max-h_encap {
type uint8;
description "Maximum number of SIDs that can be pushed as
part of the H.Encaps* behavior";
}
leaf max-end_d {
type uint8;
description "Maximum number of SIDs in an SRH when applying
End.D* behaviors (e.g. End.X6 and End.DT6)";
}
list msds {
key "msd-type";
description "List of MSD types as defined in iana-msd-types";

leaf msd-type {
type identityref { base iana-msd-types:msd-base-srh; }
description "MSD types";
}

leaf msd-value {
type uint8;
description "MSD value, in the range of 0-255.";
}
}
}
}

Expand Down Expand Up @@ -918,6 +910,7 @@ grouping srv6-csid-replace-cfg-grouping {

container srv6 {
description "Segment Routing with IPv6 dataplane";

/* config */
leaf enable {
type boolean;
Expand Down
Loading
Loading