diff --git a/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang b/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-05-08.yang similarity index 99% rename from experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang rename to experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-05-08.yang index 65cb0261f..1b70848d3 100644 --- a/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-04-22.yang +++ b/experimental/ietf-extracted-YANG-modules/iana-ioam-integrity-protection-methods@2026-05-08.yang @@ -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 diff --git a/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang b/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-05-08.yang similarity index 98% rename from experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang rename to experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-05-08.yang index 327237306..b252dd16e 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-04-22.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-ioam-integrity@2026-05-08.yang @@ -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 @@ -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 @@ -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 { diff --git a/experimental/ietf-extracted-YANG-modules/ietf-oam-test-sequence@2026-01-13.yang b/experimental/ietf-extracted-YANG-modules/ietf-oam-test-sequence@2026-01-13.yang index c0a22ca05..8a23a8d28 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-oam-test-sequence@2026-01-13.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-oam-test-sequence@2026-01-13.yang @@ -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 { @@ -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."; + } } } } diff --git a/experimental/ietf-extracted-YANG-modules/ietf-oam-unitary-test@2026-01-13.yang b/experimental/ietf-extracted-YANG-modules/ietf-oam-unitary-test@2026-01-13.yang index f63917581..2c0e2c752 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-oam-unitary-test@2026-01-13.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-oam-unitary-test@2026-01-13.yang @@ -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 diff --git a/experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2025-07-07.yang b/experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2026-05-06.yang similarity index 95% rename from experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2025-07-07.yang rename to experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2026-05-06.yang index b2d5a693d..87d9db0af 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2025-07-07.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-srv6-base@2026-05-06.yang @@ -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"; @@ -55,7 +60,6 @@ module ietf-srv6-base { Editor: Xufeng Liu - Editor: Zhibo Hu @@ -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"; @@ -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 @@ -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"; @@ -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; - } } } } @@ -442,6 +443,7 @@ grouping srv6-csid-replace-cfg-grouping { } } } + grouping srv6-remote-locators-state { description "SRv6 Remote Locator state grouping"; @@ -538,6 +540,7 @@ grouping srv6-csid-replace-cfg-grouping { uses srv6-locator-state; } + uses srv6-remote-locators-state; } } @@ -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 @@ -678,7 +680,6 @@ grouping srv6-csid-replace-cfg-grouping { description "L3 information"; } - uses path-out-sids-choice; } @@ -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"; @@ -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."; + } + } } } @@ -918,6 +910,7 @@ grouping srv6-csid-replace-cfg-grouping { container srv6 { description "Segment Routing with IPv6 dataplane"; + /* config */ leaf enable { type boolean; diff --git a/experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2025-07-07.yang b/experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2026-05-06.yang similarity index 78% rename from experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2025-07-07.yang rename to experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2026-05-06.yang index a7a13d96d..6c427774f 100644 --- a/experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2025-07-07.yang +++ b/experimental/ietf-extracted-YANG-modules/ietf-srv6-types@2026-05-06.yang @@ -73,6 +73,16 @@ module ietf-srv6-types { // RFC Editor: replace XXXX with actual RFC number and remove // this note + revision 2026-05-06 { + description + "Add missing behaviors in the srv6-endpoint-type identity and + srv6-headend-type identity"; + reference + "RFC XXXX: YANG Data Model for SRv6 types"; + // 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"; @@ -90,6 +100,7 @@ module ietf-srv6-types { // RFC Editor: replace XXXX with actual RFC number and remove // this note } + revision 2024-03-04 { description "Renamed some of End identities"; @@ -247,14 +258,20 @@ module ietf-srv6-types { "RFC 8986"; } - // TODO: End.B6.Insert + identity End.B6.Insert { + base srv6-endpoint-type; + description + "Endpoint bound to an SRv6 Policy, where SIDlist is encoded + using the Insert mode"; + reference + "Pablo Camarillo (pcamaril@cisco.com)"; + } identity End.B6.Encaps { base srv6-endpoint-type; description - "Endpoint bound to an SRv6 Policy - where the SRv6 Policy also includes an - IPv6 Source Address A."; + "Endpoint bound to an SRv6 Policy, where SIDlist is encoded + using the Encap mode (new IPv6 header)"; reference "RFC 8986"; } @@ -347,7 +364,14 @@ module ietf-srv6-types { "RFC 8986"; } - // TODO: End.B6.Insert.Red + identity End.B6.Insert.Red { + base srv6-endpoint-type; + description + "This is a reduced encap variation of the End.B6.Insert + behavior."; + reference + "Pablo Camarillo (pcamaril@cisco.com)"; + } identity End.B6.Encaps.Red { base srv6-endpoint-type; @@ -483,9 +507,7 @@ module ietf-srv6-types { description "End SID with the NEXT-ONLY-CSID flavor"; reference - "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note + "Pablo Camarillo (pcamaril@cisco.com)"; } identity END.NEXT-CSID { @@ -494,8 +516,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_PSP { @@ -504,8 +524,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID PSP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_USP { @@ -514,8 +532,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_PSP_USP { @@ -524,8 +540,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID PSP/USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_USD { @@ -534,8 +548,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_PSP_USD { @@ -544,8 +556,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID PSP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_USP_USD { @@ -554,8 +564,6 @@ module ietf-srv6-types { "End SID with the NEXT-CSID USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.NEXT-CSID_PSP_USP_USD { @@ -564,18 +572,14 @@ module ietf-srv6-types { "End SID with the NEXT-CSID PSP/USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } - identity END.NEXT-CSID_ONLY { + identity END.X.NEXT-ONLY-CSID { base srv6-endpoint-type; description "End.X SID with the NEXT-ONLY-CSID flavor"; reference - "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note + "Pablo Camarillo (pcamaril@cisco.com)"; } identity END.X.NEXT-CSID { @@ -584,8 +588,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_PSP { @@ -594,9 +596,7 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID PSP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note - } + } identity END.X.NEXT-CSID_USP { base srv6-endpoint-type; @@ -604,8 +604,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_PSP_USP { @@ -614,8 +612,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID PSP/USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_USD { @@ -624,8 +620,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_PSP_USD { @@ -634,8 +628,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID PSP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_USP_USD { @@ -644,8 +636,6 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.NEXT-CSID_PSP_USP_USD { @@ -654,23 +644,22 @@ module ietf-srv6-types { "End.X SID with the NEXT-CSID PSP/USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity End.DX6.NEXT-CSID { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and cross-connect - to an array of IPv6 adjacencies"; + to an array of IPv6 adjacencies - uDX6"; reference "RFC 9800"; } + identity End.DX4.NEXT-CSID { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and cross-connect - to an array of IPv4 adjacencies"; + to an array of IPv4 adjacencies - uDX4"; reference "RFC 9800"; } @@ -679,7 +668,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific - IPv6 table lookup"; + IPv6 table lookup - uDT6"; reference "RFC 9800"; } @@ -688,7 +677,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific - IPv4 table lookup"; + IPv4 table lookup - uDT4"; reference "RFC 9800"; } @@ -697,7 +686,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific IP - (IPv4 or IPv6) table lookup"; + (IPv4 or IPv6) table lookup - uDT46"; reference "RFC 9800"; } @@ -706,7 +695,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and Layer-2 - cross-connect to an L2 interface"; + cross-connect to an L2 interface - uDX2"; reference "RFC 9800"; } @@ -715,7 +704,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific - VLAN L2 table lookup"; + VLAN L2 table lookup - uDX2V"; reference "RFC 9800"; } @@ -724,7 +713,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific - unicast MAC L2 table lookup"; + unicast MAC L2 table lookup - uDT2U"; reference "RFC 9800"; } @@ -733,7 +722,7 @@ module ietf-srv6-types { base srv6-endpoint-type; description "NEXT-CSID Endpoint with decapsulation and specific L2 table - flooding"; + flooding - uDT2M"; reference "RFC 9800"; } @@ -773,14 +762,125 @@ module ietf-srv6-types { } /* DMM end */ - // TODO: END.DTM - // TODO: End.M - // TODO: End.Replicate - // TODO: End.DTMC4 - // TODO: End.DTMC6 - // TODO: End.DTMC46 + identity End.DTM { + base srv6-endpoint-type; + description + "Endpoint with decapsulation and lookup in MPLS table"; + reference + "draft-ietf-spring-srv6-mpls-interworking-02"; + } + + identity End.M { + base srv6-endpoint-type; + description + "Endpoint behavior to steer traffic to a protector egress + upon failure of the primary egress"; + reference + "draft-ietf-rtgwg-srv6-egress-protection-23"; + } + + identity End.Replicate { + base srv6-endpoint-type; + description + "Endpoint with replication and/or decapsulate"; + reference + "RFC 9524"; + } + + identity End.DTMC4 { + base srv6-endpoint-type; + description + "Endpoint with Decapsulation and IPv4 Multicast Table Lookup"; + reference + "draft-ietf-bess-mvpn-evpn-sr-p2mp-18"; + } + + identity End.DTMC6 { + base srv6-endpoint-type; + description + "Endpoint with Decapsulation and IPv6 Multicast Table Lookup"; + reference + "draft-ietf-bess-mvpn-evpn-sr-p2mp-18"; + } + + identity End.DTMC46 { + base srv6-endpoint-type; + description + "Endpoint with Decapsulation and IP Multicast Table Lookup"; + reference + "draft-ietf-bess-mvpn-evpn-sr-p2mp-18"; + } + identity End.NSH { + base srv6-endpoint-type; + description + "Endpoint behavior for NSH processing"; + reference + "RFC 9491"; + } + + identity End.T.NEXT-CSID { + base srv6-endpoint-type; + description + "End.T SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_PSP { + base srv6-endpoint-type; + description + "End.T PSP SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_USP { + base srv6-endpoint-type; + description + "End.T USP SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_PSP_USP { + base srv6-endpoint-type; + description + "End.T PSP_USP SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_USD { + base srv6-endpoint-type; + description + "End.T USD SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } - // TODO: End.T NEXT-CSID ... + identity End.T.NEXT-CSID_PSP_USD { + base srv6-endpoint-type; + description + "End.T PSP_USD SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_USP_USD { + base srv6-endpoint-type; + description + "End.T USP_USD SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } + + identity End.T.NEXT-CSID_PSP_USP_USD { + base srv6-endpoint-type; + description + "End.T PSP_USP_USD SID with the NEXT-CSID flavor."; + reference + "RFC 9800"; + } identity END.B6.Encaps.NEXT-CSID { base srv6-endpoint-type; @@ -788,8 +888,6 @@ module ietf-srv6-types { "End.B6.Encaps SID with the NEXT-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.B6.Encaps.Red.NEXT-CSID { @@ -798,8 +896,6 @@ module ietf-srv6-types { "End.B6.Encaps.Red SID with the NEXT-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.BM.NEXT-CSID { @@ -808,8 +904,46 @@ module ietf-srv6-types { "End.BM SID with the NEXT-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note + } + + identity END.LBS.NEXT-CSID { + base srv6-endpoint-type; + description + "End behavior variant to modify the locator-block of the active CSID sequence in NEXT-CSID"; + reference + "RFC 9800"; + } + + identity END.XLBS.NEXT-CSID { + base srv6-endpoint-type; + description + "End.X behavior variant to modify the locator-block of the active CSID sequence in NEXT-CSID"; + reference + "RFC 9800"; + } + + identity END.B6.Encaps.Red.NEXT-CSID_PSP_USD { + base srv6-endpoint-type; + description + "End.B6.Encaps.Red PSP_USD SID variant with the NEXT-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.B6.Insert.Red.NEXT-CSID_PSP_USD { + base srv6-endpoint-type; + description + "End.B6.Insert.Red PSP_USD SID variant with the NEXT-CSID flavor"; + reference + "Pablo Camarillo (pcamaril@cisco.com)"; + } + + identity END.PSID { + base srv6-endpoint-type; + description + "Endpoint behavior associated with SRv6 path segment"; + reference + "draft-ietf-spring-srv6-path-segment-02"; } identity END.REPLACE-SID { @@ -818,8 +952,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_PSP { @@ -828,8 +960,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID PSP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_USP { @@ -838,8 +968,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_PSP_USP { @@ -848,8 +976,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID PSP/USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID { @@ -858,8 +984,6 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_PSP { @@ -868,8 +992,6 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID PSP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_USP { @@ -878,21 +1000,47 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID USP flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_PSP_USP { base srv6-endpoint-type; description - "End SID with the REPLACE-CSID PSP/USP flavor"; + "End.X SID with the REPLACE-CSID PSP/USP flavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID { + base srv6-endpoint-type; + description + "End.T SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID_PSP { + base srv6-endpoint-type; + description + "End.T PSP SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID_USP { + base srv6-endpoint-type; + description + "End.T USP SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } - // TODO: End.T REPLACE-CSID + identity END.T.REPLACE-CSID_PSP_USP { + base srv6-endpoint-type; + description + "End.T PSP/USP SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } identity END.B6.Encaps.REPLACE-CSID { base srv6-endpoint-type; @@ -900,18 +1048,13 @@ module ietf-srv6-types { "End.B6.Encaps SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } - identity END.BM.REPLACE-CSID { base srv6-endpoint-type; description "End.BM.Red SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DX6.REPLACE-CSID { @@ -920,8 +1063,6 @@ module ietf-srv6-types { "End.DX6 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DX4.REPLACE-CSID { @@ -930,8 +1071,6 @@ module ietf-srv6-types { "End.DX4 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DT6.REPLACE-CSID { @@ -940,8 +1079,6 @@ module ietf-srv6-types { "End.DT6 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DT4.REPLACE-CSID { @@ -950,8 +1087,6 @@ module ietf-srv6-types { "End.DT4 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DT46.REPLACE-CSID { @@ -960,8 +1095,6 @@ module ietf-srv6-types { "End.DT46 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DX2.REPLACE-CSID { @@ -970,8 +1103,6 @@ module ietf-srv6-types { "End.DX2 SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DX2V.REPLACE-CSID { @@ -980,8 +1111,6 @@ module ietf-srv6-types { "End.DX2V SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DT2U.REPLACE-CSID { @@ -990,8 +1119,6 @@ module ietf-srv6-types { "End.DT2U SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.DT2M.REPLACE-CSID { @@ -1000,8 +1127,6 @@ module ietf-srv6-types { "End.DT2M SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.B6.Encaps.Red.REPLACE-CSID { @@ -1010,8 +1135,6 @@ module ietf-srv6-types { "End.B6.Encaps.Red SID with the REPLACE-CSID flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_USD { @@ -1020,8 +1143,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_PSP_USD { @@ -1030,8 +1151,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID PSP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_USP_USD { @@ -1040,8 +1159,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.REPLACE-SID_PSP_USP_USD { @@ -1050,8 +1167,6 @@ module ietf-srv6-types { "End SID with the REPLACE-CSID PSP/USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_USD { @@ -1060,8 +1175,6 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_PSP_USD { @@ -1070,8 +1183,6 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID PSP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_USP_USD { @@ -1080,8 +1191,6 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } identity END.X.REPLACE-CSID_PSP_USP_USD { @@ -1090,12 +1199,79 @@ module ietf-srv6-types { "End.X SID with the REPLACE-CSID PSP/USP/USD flavor"; reference "RFC 9800"; - // RFC Editor: replace with actual RFC number and remove this - // note } - // TODO: End.T w/ REPLACE-CSID *USD - // TODO: End.DX1* + identity END.T.REPLACE-CSID_USD { + base srv6-endpoint-type; + description + "End.T USD SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID_PSP_USD { + base srv6-endpoint-type; + description + "End.T PSP/USD SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID_USP_USD { + base srv6-endpoint-type; + description + "End.T USP/USD SID with the REPLACE-CSID lavor"; + reference + "RFC 9800"; + } + + identity END.T.REPLACE-CSID_PSP_USP_USD { + base srv6-endpoint-type; + description + "End.T PSP/USP/USD SID with the REPLACE-CSID flavor"; + reference + "RFC 9800"; + } + + identity END.LBS.REPLACE-CSID { + base srv6-endpoint-type; + description + "End behavior variant to modify the locator-block of the active CSID sequence in REPLACE-CSID"; + reference + "RFC 9800"; + } + + identity END.XLBS.REPLACE-CSID { + base srv6-endpoint-type; + description + "End.X behavior variant to modify the locator-block of the active CSID sequence in REPLACE-CSID"; + reference + "RFC 9800"; + } + + identity END.DX1 { + base srv6-endpoint-type; + description + "Endpoint with decapsulation and bit-stream cross-connect"; + reference + "RFC 9801"; + } + + identity END.DX1.NEXT-CSID { + base srv6-endpoint-type; + description + "End.DX1 behavior for NEXT-CSID flavour"; + reference + "RFC 9801"; + } + + identity END.DX1.REPLACE-CSID { + base srv6-endpoint-type; + description + "End.DX1 behavior for REPLACE-CSID flavour"; + reference + "RFC 9801"; + } /* Endpoints defined under * draft-ietf-spring-sr-service-programming */ @@ -1177,45 +1353,61 @@ module ietf-srv6-types { derived."; } + identity H.Insert { + base srv6-headend-type; + description + "Headend rule H.Insert for SRv6 SIDlist imposition on an IPv6 packet. + This refers to encoding SIDlist's first SID in the packet DA and encode other + SIDs, if any, in the new SRH. The original DA of the packet is also encoded as the + last segment of the SRH"; + } + + identity H.Insert.Red { + base srv6-headend-type; + description + "Reduced variant for H.Insert headend rule"; + } + identity H.Encaps { base srv6-headend-type; description - "Headend rule H.Encaps with encapsulated of an SRv6 policy"; - reference - "draft-ietf-spring-srv6-network-programming-16"; - // RFC Editor: replace with actual RFC number and remove this - // note + "Headend rule H.Encaps for SRv6 SIDlist imposition on L3 packet"; + reference "RFC 8986"; } identity H.Encaps.Red { base srv6-headend-type; description - "Headend rule H.Encaps.Red with reduced encap of an - SRv6 policy"; - reference - "draft-ietf-spring-srv6-network-programming-16"; - // RFC Editor: replace with actual RFC number and remove this - // note + "Reduced variant for H.Encaps headend rule"; + reference "RFC 8986"; } identity H.Encaps.L2 { base srv6-headend-type; description "Headend rule H.Encaps.l2 on the received L2 frame"; - reference - "draft-ietf-spring-srv6-network-programming-16"; - // RFC Editor: replace with actual RFC number and remove this - // note + reference "RFC 8986"; } identity H.Encaps.L2.Red { base srv6-headend-type; description - "Headend rule H.Encaps.L2.Red on the received L2 frame"; - reference - "draft-ietf-spring-srv6-network-programming-16"; - // RFC Editor: replace with actual RFC number and remove this - // note + "Reduced variant for H.Encaps.L2 headend rule"; + reference "RFC 8986"; + } + + identity H.Encaps.M { + base srv6-headend-type; + description + "Headend rule where H.Encaps is applied to an MPLS packet after label lookup"; + reference "draft-ietf-spring-srv6-mpls-interworking-02"; + } + + identity H.Encaps.M.Red { + base srv6-headend-type; + description + "Reduced variant of H.Encaps.M headend rule"; + reference "draft-ietf-spring-srv6-mpls-interworking-02"; } identity srv6-security-type { @@ -1289,6 +1481,7 @@ module ietf-srv6-types { description "SRv6 SID's FUNC Reserved values"; } + typedef srv6-locator-name-type { type string { length "1..59"; @@ -1337,6 +1530,7 @@ module ietf-srv6-types { description "This type defines a SID prefixlen with range constraints"; } + typedef sid-alloc-type { type enumeration { enum Dynamic { @@ -1498,7 +1692,4 @@ module ietf-srv6-types { FL=16 (or 32 for wide function), and AL=16 or more. The locator length for this format is 80 bits."; } - - // TODO: srv6-sid-fmt-crepl-XYZ - } // module