Add support for duplicates in NH AFT state MPLS label stack by romeyod · Pull Request #1435 · openconfig/public

romeyod · 2026-02-09T21:03:29Z

Change Scope

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack and mpls-label-stack leafs as they do not support duplicates.
Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.
This change is backwards compatible

Context:
NH AFT state MPLS label stack doesn't support duplicates

Tree View

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--rw segment-routing
           |  +--ro te-policies
           |     +--ro te-policy* [color endpoint]
           |        +--ro candidate-paths
           |           +--ro candidate-path* [protocol-origin originator-asn originator-addr discriminator]
           |              +--ro segment-lists
           |                 +--ro segment-list* [id]
           |                    +--ro next-hops
           |                       +--ro next-hop* [index]
           |                          +--ro index            -> ../state/index
           |                          +--ro state
           |                          |  +--ro index?                     uint64
           |                          |  +--ro programmed-index?          uint64
           |                          |  +--ro ip-address?                oc-inet:ip-address
           |                          |  +--ro mac-address?               oc-yang:mac-address
           |                          |  +--ro pop-top-label?             boolean
  -        |                          |  +--ro pushed-mpls-label-stack*   oc-mplst:mpls-label
  +        |                          |  x--ro pushed-mpls-label-stack*   oc-mplst:mpls-label
  +        |                          +--ro encap-mpls-label-stacks
  +        |                          |  +--ro encap-mpls-label-stack* [id]
  +        |                          |     +--ro id       -> ../state/id
  +        |                          |     +--ro state
  +        |                          |        +--ro id?      uint8
  +        |                          |        +--ro label?   oc-mplst:mpls-label
           |                          |  +--ro encapsulate-header?        oc-aftt:encapsulation-header-type
           |                          |  +--ro decapsulate-header?        oc-aftt:encapsulation-header-type
           |                          |  +--ro origin-protocol?           identityref

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--ro afts
           |  +--ro mpls
           |  |  +--ro label-entry* [label]
           |  |     +--ro label    -> ../state/label
           |  |     +--ro state
           |  |        +--ro label?                                      oc-mplst:mpls-label
           |  |        +--ro counters
           |  |        |  x--ro packets-forwarded?   oc-yang:counter64
           |  |        |  x--ro octets-forwarded?    oc-yang:counter64
           |  |        +--ro entry-metadata?                             binary
  -        |  |        +--ro popped-mpls-label-stack*                    oc-mplst:mpls-label
  +        |  |        x--ro popped-mpls-label-stack*                    oc-mplst:mpls-label
  +        |  |     +--ro decap-mpls-label-stacks
  +        |  |     |  +--ro decap-mpls-label-stack* [id]
  +        |  |     |     +--ro id       -> ../state/id
  +        |  |     |     +--ro state
  +        |  |     |        +--ro id?      uint8
  +        |  |     |        +--ro label?   oc-mplst:mpls-label
           |  |        +--ro oc-aftni:next-hop-group?                    -> /oc-ni:network-instances/network-instance/afts/next-hop-groups/next-hop-group/state/id
           |  |        +--ro oc-aftni:next-hop-group-network-instance?   oc-ni:network-instance-ref
           |  |
           |  |
           |  +--ro next-hops
           |  |  +--ro next-hop* [index]
           |  |     +--ro index            -> ../state/index
           |  |     +--ro state
           |  |     |  +--ro index?                       uint64
           |  |     |  +--ro programmed-index?            uint64
           |  |     |  +--ro ip-address?                  oc-inet:ip-address
           |  |     |  +--ro mac-address?                 oc-yang:mac-address
           |  |     |  +--ro pop-top-label?               boolean
  -        |  |     |  +--ro pushed-mpls-label-stack*     oc-mplst:mpls-label
  +        |  |     |  x--ro pushed-mpls-label-stack*     oc-mplst:mpls-label
           |  |     |  +--ro encapsulate-header?          oc-aftt:encapsulation-header-type
           |  |     |  +--ro decapsulate-header?          oc-aftt:encapsulation-header-type
           |  |     |  +--ro origin-protocol?             identityref
           |  |     |  +--ro lsp-name?                    string
           |  |     | 
           |  |     | 
           |  |     +--ro encap-headers
           |  |     |  +--ro encap-header* [index]
           |  |     |     +--ro index     -> ../state/index
           |  |     |     +--ro state
           |  |     |     |  +--ro index?   uint8
           |  |     |     |  +--ro type?    oc-aftt:encapsulation-header-type
           |  |     |     +--ro mpls
           |  |     |     |  +--ro state
           |  |     |     |     +--ro traffic-class?      oc-mplst:mpls-tc
  -        |  |     |     |     +--ro mpls-label-stack*   oc-mplst:mpls-label
  +        |  |     |     |     x--ro mpls-label-stack*         oc-mplst:mpls-label
  +        |  |     |     |  +--ro encap-mpls-label-stacks
  +        |  |     |     |     +--ro encap-mpls-label-stack* [id]
  +        |  |     |     |        +--ro id       -> ../state/id
  +        |  |     |     |        +--ro state
  +        |  |     |     |           +--ro id?      uint8
  +        |  |     |     |           +--ro label?   oc-mplst:mpls-label
           |  |     |     +--ro udp-v4
           |  |     |     |  +--ro state
           |  |     |     |     +--ro src-ip?         oc-inet:ipv4-address

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

dplore · 2026-02-09T21:16:21Z

/gcbrun

OpenConfigBot · 2026-02-09T21:18:26Z

No major YANG version changes in commit f75ab76

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

dplore · 2026-02-10T00:50:19Z

/gcbrun

dplore · 2026-02-10T00:52:28Z

In each case, the new list encap-mpls-label-stack should be moved up one level. For example:

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--rw segment-routing
           |  +--ro te-policies
           |     +--ro te-policy* [color endpoint]
           |        +--ro candidate-paths
           |           +--ro candidate-path* [protocol-origin originator-asn originator-addr discriminator]
           |              +--ro segment-lists
           |                 +--ro segment-list* [id]
           |                    +--ro next-hops
           |                       +--ro next-hop* [index]
           |                          +--ro index            -> ../state/index
  +        |                          +--ro encap-mpls-label-stack* [index]
  +        |                          |  +--ro index    -> ../state/index
  +        |                          |  +--ro state
  +        |                          |     +--ro index?   uint8
  +        |                          |     +--ro label?   oc-mplst:mpls-label

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

romeyod · 2026-02-10T21:40:47Z

In each case, the new list encap-mpls-label-stack should be moved up one level. For example:

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--rw segment-routing
           |  +--ro te-policies
           |     +--ro te-policy* [color endpoint]
           |        +--ro candidate-paths
           |           +--ro candidate-path* [protocol-origin originator-asn originator-addr discriminator]
           |              +--ro segment-lists
           |                 +--ro segment-list* [id]
           |                    +--ro next-hops
           |                       +--ro next-hop* [index]
           |                          +--ro index            -> ../state/index
  +        |                          +--ro encap-mpls-label-stack* [index]
  +        |                          |  +--ro index    -> ../state/index
  +        |                          |  +--ro state
  +        |                          |     +--ro index?   uint8
  +        |                          |     +--ro label?   oc-mplst:mpls-label

@dplore I don't fully understand this feedback. Maybe I am missing some OC coding guideline.
encap-mpls-label-stack needs to be under next-hop/state or mpls/state since its a status container

NOTE: I renamed new index leaf and references to id in latest diffs

dplore · 2026-02-10T22:04:13Z

/gcbrun

romeyod · 2026-02-24T14:02:25Z

In each case, the new list encap-mpls-label-stack should be moved up one level. For example:

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--rw segment-routing
           |  +--ro te-policies
           |     +--ro te-policy* [color endpoint]
           |        +--ro candidate-paths
           |           +--ro candidate-path* [protocol-origin originator-asn originator-addr discriminator]
           |              +--ro segment-lists
           |                 +--ro segment-list* [id]
           |                    +--ro next-hops
           |                       +--ro next-hop* [index]
           |                          +--ro index            -> ../state/index
  +        |                          +--ro encap-mpls-label-stack* [index]
  +        |                          |  +--ro index    -> ../state/index
  +        |                          |  +--ro state
  +        |                          |     +--ro index?   uint8
  +        |                          |     +--ro label?   oc-mplst:mpls-label

@dplore I don't fully understand this feedback. Maybe I am missing some OC coding guideline. encap-mpls-label-stack needs to be under next-hop/state or mpls/state since its a status container

NOTE: I renamed new index leaf and references to id in latest diffs

@dplore do let me know what your thoughts are. Also OC linter is not happy with this change

dplore · 2026-03-03T17:25:10Z

Opps, my earlier comment was not correct.

OC style requires a container to encapsulate a list. I think this is why the linter check is failing. For example:

module: openconfig-network-instance
  +--rw network-instances
     +--rw network-instance* [name]
           +--rw segment-routing
           |  +--ro te-policies
           |     +--ro te-policy* [color endpoint]
           |        +--ro candidate-paths
           |           +--ro candidate-path* [protocol-origin originator-asn originator-addr discriminator]
           |              +--ro segment-lists
           |                 +--ro segment-list* [id]
           |                    +--ro next-hops
           |                       +--ro next-hop* [index]
           |                          +--ro index            -> ../state/index
  +        |                          +--ro encap-stack-mpls-labels
  +        |                             +--ro encap-stack-mpls-label* [index]
  +        |                             |  +--ro index    -> ../state/index
  +        |                             |  +--ro state
  +        |                             |     +--ro index?   uint8
  +        |                             |     +--ro label?   oc-mplst:mpls-label

ElodinLaarz · 2026-03-03T17:25:38Z

Discussed in the OC Operators Meeting on March 3rd, 2026:

Seems like the lists are not contained in a specific container. (E.g. interfaces/interface[...] or network-instances/network-instance[...] etc.)

In this case, encap-mpls-label-stack should be in a container encap-mpls-label-stacks first.

Will re-review once the lint errors are addressed.

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

romeyod · 2026-03-04T16:23:33Z

@dplore @ElodinLaarz Thanks for the feedback and update. I have updates the latest diffs as per @dplore inputs.

dplore · 2026-03-04T18:10:28Z

/gcbrun

dplore · 2026-03-04T19:09:03Z

/gcbrun

…ft-mpls-label

dplore · 2026-03-04T21:24:36Z

/gcbrun

dplore · 2026-03-05T16:23:16Z

/gcbrun

romeyod · 2026-03-16T23:42:06Z

@dplore @ElodinLaarz seems like there are no objections as we had tabled this in OC public meeting earlier this month. Can you please move this to Last Call if there is no other feedback? Thanks!

dplore · 2026-03-17T21:30:25Z

/gcbrun

dplore · 2026-03-17T21:31:02Z

Setting to last call for March 31, 2026

dplore · 2026-04-07T16:48:57Z

/gcbrun

dplore

Reviewed in Apr 7, 2026 OC operators meeting without objection

romeyod added 2 commits February 9, 2026 19:17

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack

4eb8bea

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack

a99990d

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

romeyod requested a review from a team as a code owner February 9, 2026 21:03

github-project-automation Bot added this to OC Operator Review Feb 9, 2026

dplore moved this to Ready to discuss in OC Operator Review Feb 9, 2026

OpenConfigBot added the non-breaking label Feb 9, 2026

dplore reviewed Feb 9, 2026

View reviewed changes

Comment thread release/models/aft/openconfig-aft-common.yang

Comment thread release/models/aft/openconfig-aft-mpls.yang

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack

b6f4a94

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

dplore moved this from Ready to discuss to Waiting for author in OC Operator Review Feb 10, 2026

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack

8df3fad

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

romeyod and others added 2 commits March 4, 2026 01:04

Deprecate popped-mpls-label-stack and AFT NH pushed-mpls-label-stack

3c869de

and mpls-label-stack leafs as they do not support duplicates. Add decap-mpls-label-stack and AFT NH encah-mpls-label-stack and encap-mpls-label-stack leafs that support duplicates.

Merge branch 'master' into aft-mpls-label

8269ec8

config false

c4e72cc

romeyod added 2 commits March 4, 2026 20:35

config false

f76e4e0

Merge branch 'aft-mpls-label' of github.com:romeyod/aftNextHop into a…

d397c88

…ft-mpls-label

Add description to grouping

1fcac00

Merge branch 'master' into aft-mpls-label

cc4546f

dplore moved this from Waiting for author to last-call in OC Operator Review Mar 17, 2026

Merge branch 'master' into aft-mpls-label

f75ab76

dplore approved these changes Apr 7, 2026

View reviewed changes

dplore merged commit 187b120 into openconfig:master Apr 7, 2026
15 checks passed

Conversation

romeyod commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dplore commented Feb 9, 2026

Uh oh!

OpenConfigBot commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dplore commented Feb 10, 2026

Uh oh!

dplore commented Feb 10, 2026

Uh oh!

romeyod commented Feb 10, 2026

Uh oh!

dplore commented Feb 10, 2026

Uh oh!

romeyod commented Feb 24, 2026

Uh oh!

dplore commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ElodinLaarz commented Mar 3, 2026

Uh oh!

romeyod commented Mar 4, 2026

Uh oh!

dplore commented Mar 4, 2026

Uh oh!

dplore commented Mar 4, 2026

Uh oh!

dplore commented Mar 4, 2026

Uh oh!

dplore commented Mar 5, 2026

Uh oh!

romeyod commented Mar 16, 2026

Uh oh!

dplore commented Mar 17, 2026

Uh oh!

dplore commented Mar 17, 2026

Uh oh!

dplore commented Apr 7, 2026

Uh oh!

dplore left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

romeyod commented Feb 9, 2026 •

edited

Loading

OpenConfigBot commented Feb 9, 2026 •

edited

Loading

dplore commented Mar 3, 2026 •

edited

Loading