Skip to content

Commit bd2e35e

Browse files
italobusiitalobusi
committed
Updated based on 2020-07-03 TEAS Call
Models updated based on feedbacks received during the 2020-07-03 TEAS Call
1 parent 2609e72 commit bd2e35e

4 files changed

Lines changed: 64 additions & 250 deletions

File tree

‎ietf-mpls-te-types.yang‎

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module ietf-mpls-te-types {
3838
This version of this YANG module is part of RFC XXXX; see
3939
the RFC itself for full legal notices.";
4040

41-
revision 2020-06-26 {
41+
revision 2020-07-03 {
4242
description
4343
"Initial Version";
4444
reference
@@ -83,8 +83,6 @@ module ietf-mpls-te-types {
8383
*/
8484

8585
typedef load-balancing-type {
86-
description
87-
"The type of load balancing used on bundled links.";
8886
type enumeration {
8987
enum per-flow {
9088
description
@@ -104,6 +102,8 @@ module ietf-mpls-te-types {
104102
forwarded on the same component link.";
105103
}
106104
}
105+
description
106+
"The type of load balancing used on bundled links.";
107107
} // typedef load-balancing-type
108108

109109
/*
@@ -182,27 +182,12 @@ module ietf-mpls-te-types {
182182

183183
grouping te-mpls-label-hop {
184184
description
185-
"MPLS-TE Label. ";
185+
"MPLS-TE Label Hop.";
186186

187-
choice mpls-hop-type {
187+
leaf mpls-label {
188+
type rt-types:mpls-label;
188189
description
189-
"Whether the label-hop is a normal MPLS-TE
190-
label-hop or a PHP hop";
191-
192-
case php {
193-
leaf mpls-php {
194-
type empty;
195-
description
196-
"MPLS-TE PHP Label Hop.";
197-
}
198-
}
199-
case label-hop {
200-
leaf mpls-label {
201-
type rt-types:mpls-label-general-use;
202-
description
203-
"MPLS-TE Label Hop.";
204-
}
205-
}
190+
"MPLS Label.";
206191
}
207192
} // grouping te-mpls-label-hop
208193
}

‎ietf-mpls-te.tree‎

Lines changed: 52 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,30 @@ module: ietf-te-mpls
6868
| +--rw load-share? uint32
6969
| +--rw policy-class? uint8
7070
+--rw bandwidth-mpls
71-
+--rw specification-type?
72-
| te-packet-types:te-bandwidth-requested-type
73-
+--rw set-bandwidth? te-packet-types:bandwidth-kbps
74-
+--rw class-type? te-types:te-ds-class
75-
+--ro state
76-
| +--ro signaled-bandwidth? te-packet-types:bandwidth-kbps
77-
+--rw auto-bandwidth
78-
+--rw enabled? boolean
79-
+--rw min-bw? te-packet-types:bandwidth-kbps
80-
+--rw max-bw? te-packet-types:bandwidth-kbps
81-
+--rw adjust-interval? uint32
82-
+--rw adjust-threshold? rt-types:percentage
83-
+--rw overflow
84-
| +--rw enabled? boolean
85-
| +--rw overflow-threshold? rt-types:percentage
86-
| +--rw trigger-event-count? uint16
87-
+--rw underflow
88-
+--rw enabled? boolean
89-
+--rw underflow-threshold? rt-types:percentage
90-
+--rw trigger-event-count? uint16
91-
augment /te:te/te:tunnels/te:tunnel/te:primary-paths/te:primary-path:
71+
| +--rw specification-type?
72+
| | te-packet-types:te-bandwidth-requested-type
73+
| +--rw set-bandwidth? te-packet-types:bandwidth-kbps
74+
| +--rw class-type? te-types:te-ds-class
75+
| +--ro state
76+
| | +--ro signaled-bandwidth? te-packet-types:bandwidth-kbps
77+
| +--rw auto-bandwidth
78+
| +--rw enabled? boolean
79+
| +--rw min-bw? te-packet-types:bandwidth-kbps
80+
| +--rw max-bw? te-packet-types:bandwidth-kbps
81+
| +--rw adjust-interval? uint32
82+
| +--rw adjust-threshold? rt-types:percentage
83+
| +--rw overflow
84+
| | +--rw enabled? boolean
85+
| | +--rw overflow-threshold? rt-types:percentage
86+
| | +--rw trigger-event-count? uint16
87+
| +--rw underflow
88+
| +--rw enabled? boolean
89+
| +--rw underflow-threshold? rt-types:percentage
90+
| +--rw trigger-event-count? uint16
91+
+--rw load-balancing-type? mte-types:load-balancing-type
92+
+--rw uhp-required? empty
93+
augment /te:te/te:tunnels/te:tunnel/te:primary-paths
94+
/te:primary-path:
9295
+--rw static-lsp-name? mpls-static:static-lsp-ref
9396
augment /te:te/te:tunnels/te:tunnel/te:secondary-paths
9497
/te:secondary-path:
@@ -102,8 +105,8 @@ module: ietf-te-mpls
102105
+--rw class-type? te-types:te-ds-class
103106
+--ro state
104107
+--ro signaled-bandwidth? te-packet-types:bandwidth-kbps
105-
augment /te:te/te:tunnels/te:tunnel/te:primary-paths/te:primary-path
106-
/te:lsps/te:lsp:
108+
augment /te:te/te:tunnels/te:tunnel/te:primary-paths
109+
/te:primary-path/te:lsps/te:lsp:
107110
+--ro performance-metrics-one-way
108111
| +--ro one-way-delay? uint32
109112
| +--ro one-way-delay-normality?
@@ -148,3 +151,29 @@ module: ietf-te-mpls
148151
+--ro two-way-packet-loss? decimal64
149152
+--ro two-way-packet-loss-normality?
150153
te-types:performance-metrics-normality
154+
augment /te:te/te:tunnels/te:tunnel/te:primary-paths
155+
/te:primary-path/te:computed-paths-properties
156+
/te:computed-path-properties/te:path-properties
157+
/te:path-route-objects/te:path-route-object/te:type
158+
/te:label/te:label-hop/te:te-label/te:technology:
159+
+--:(mpls)
160+
+--ro mpls-label? rt-types:mpls-label
161+
augment /te:te/te:tunnels/te:tunnel/te:primary-paths
162+
/te:primary-path/te:lsps/te:lsp/te:path-properties
163+
/te:path-route-objects/te:path-route-object/te:type
164+
/te:label/te:label-hop/te:te-label/te:technology:
165+
+--:(mpls)
166+
+--ro mpls-label? rt-types:mpls-label
167+
augment /te:te/te:tunnels/te:tunnel/te:secondary-paths
168+
/te:secondary-path/te:computed-paths-properties
169+
/te:computed-path-properties/te:path-properties
170+
/te:path-route-objects/te:path-route-object/te:type
171+
/te:label/te:label-hop/te:te-label/te:technology:
172+
+--:(mpls)
173+
+--ro mpls-label? rt-types:mpls-label
174+
augment /te:te/te:tunnels/te:tunnel/te:secondary-paths
175+
/te:secondary-path/te:lsps/te:lsp/te:path-properties
176+
/te:path-route-objects/te:path-route-object/te:type
177+
/te:label/te:label-hop/te:te-label/te:technology:
178+
+--:(mpls)
179+
+--ro mpls-label? rt-types:mpls-label

‎ietf-te-mpls.tree‎

Lines changed: 0 additions & 197 deletions
This file was deleted.

‎ietf-te-mpls.yang‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ module ietf-te-mpls {
9999
// RFC Ed.: update the date below with the date of RFC publication
100100
// and remove this note.
101101

102-
revision "2020-06-26" {
102+
revision "2020-07-03" {
103103
description "Latest update to MPLS TE YANG module.";
104104
reference
105105
"RFCXXXX: A YANG Data Model for MPLS-TE Tunnels and LSP(s)";
@@ -411,9 +411,9 @@ module ietf-te-mpls {
411411
}
412412
}
413413

414-
grouping te-mpls-path-constraints {
414+
grouping te-mpls-tunnel-attributes {
415415
description
416-
"Path constraints for MPLS-TE LSP attributes";
416+
"MPLS-TE Tunnel attributes.";
417417

418418
leaf load-balancing-type {
419419
type mte-types:load-balancing-type;
@@ -451,14 +451,11 @@ module ietf-te-mpls {
451451
uses tunnel-igp-shortcuts;
452452
uses tunnel-forwarding-adjacency;
453453
uses tunnel-bandwidth_top;
454+
uses te-mpls-tunnel-attributes;
454455
}
455456

456457
/* MPLS TE path augmentations */
457-
augment "/te:te/te:tunnels/te:tunnel/" +
458-
"te:primary-paths/te:primary-path" {
459-
description "Augment primary path constraints.";
460-
uses te-mpls-path-constraints;
461-
}
458+
462459

463460
/* MPLS TE LSPs augmentations */
464461
augment "/te:te/te:tunnels/te:tunnel/" +

0 commit comments

Comments
 (0)