From 12e2887697966e467862b0fb1b18c33c394f8e7e Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Wed, 25 Dec 2019 16:02:11 +0800 Subject: [PATCH 01/18] YANG Doctor Review this pull request is to fix the comments proposed in https://mailarchive.ietf.org/arch/msg/ccamp/vpIjwy2HokZI74pKkIBrr0fziIw, and its followup discussion --- ietf-layer0-types.yang | 116 +++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 69 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 13c6156..dd78b52 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -1,6 +1,7 @@ module ietf-layer0-types { + yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-layer0-types"; - prefix "layer0-types"; + prefix "l0-types"; organization "IETF CCAMP Working Group"; @@ -43,7 +44,7 @@ module ietf-layer0-types { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2019-11-28" { + revision "2019-12-25" { description "Initial Version"; reference @@ -60,32 +61,7 @@ module ietf-layer0-types { reference "ITU-T G.698.2 (11/2018) Section 5.3"; } - typedef frequency-thz { - type decimal64 { - fraction-digits 6; - } - units THz; - description - "The DWDM frequency in THz, e.g., 193.112500"; - reference - "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; - } - - typedef frequency-ghz { - type decimal64 { - fraction-digits 3; - } - units GHz; - description - "The DWDM frequency in GHz, e.g., 193112.500"; - reference - "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; - } - - typedef dwdm-n - { + typedef dwdm-n { type int16; description "The given value 'N' is used to determine the nominal @@ -100,8 +76,7 @@ module ietf-layer0-types { Lambda-Switch-Capable (LSC) Label Switching Routers"; } - typedef cwdm-n - { + typedef cwdm-n { type int16; description "The given value 'N' is used to compute the channel @@ -112,13 +87,11 @@ module ietf-layer0-types { Lambda-Switch-Capable (LSC) Label Switching Routers"; } - typedef flexi-n - { + typedef flexi-n { type int16; description "The given value 'N' is used to determine the nominal central frequency. - The nominal central frequency, 'f' is defined by, f = 193100.000 GHz + N x 6.250 GHz, where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor @@ -128,10 +101,22 @@ module ietf-layer0-types { of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) Networks"; } + + typedef flexi-m { + type int16; + description + "M is used to determine the slot width. A slot width is + constrained to be M x SWG (that is, M x 12.500 GHz), + where M is a positive integer. "; + reference + "RFC7698: Framework and Requirements for GMPLS-Based Control + of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) + Networks"; + } identity layer0-node-type { description - "layer0 node type."; + "layer 0 node type."; reference "RFC6163:Framework for GMPLS and Path Computation Element (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; @@ -242,19 +227,19 @@ module ietf-layer0-types { "Physical layer termination"; } - identity term-otu { + identity term-OTU { base term-type; description "OTU (Optical Transport Unit) termination"; } - identity term-odu { + identity term-ODU { base term-type; description "ODU (Optical Data Unit) termination"; } - identity term-opu { + identity term-OPU { base term-type; description "OPU (Optical Payload Unit) termination"; @@ -273,67 +258,67 @@ module ietf-layer0-types { "ITU-T G.709: Interfaces for the Optical Transport Network"; } - identity bw-otu1 { + identity bw-OTU1 { base layer0-bandwidth-type; description "OTU1 (2.66G)"; } - identity bw-otu1e { + identity bw-OTU1e { base layer0-bandwidth-type; description "OTU1e (11.04G)"; } - identity bw-otu1f { + identity bw-OTU1f { base layer0-bandwidth-type; description "OTU1f (11.27G)"; } - identity bw-otu2 { + identity bw-OTU2 { base layer0-bandwidth-type; description "OTU2 (10.70G)"; } - identity bw-otu2e { + identity bw-OTU2e { base layer0-bandwidth-type; description "OTU2e (11.09G)"; } - identity bw-otu2f { + identity bw-OTU2f { base layer0-bandwidth-type; description "OTU2f (11.31G)"; } - identity bw-otu3 { + identity bw-OTU3 { base layer0-bandwidth-type; description "OTU3 (43.01G)"; } - identity bw-otu3e1 { + identity bw-OTU3e1 { base layer0-bandwidth-type; description "OTU3e1 (44.57G)"; } - identity bw-otu3e2 { + identity bw-OTU3e2 { base layer0-bandwidth-type; description "OTU3e2 (44.58G)"; } - identity bw-otu4 { + identity bw-OTU4 { base layer0-bandwidth-type; description "OTU4 (111.80G)"; } - identity bw-otucn { + identity bw-OTUCn { base layer0-bandwidth-type; description "OTUCn (beyond 100G)"; @@ -473,7 +458,7 @@ module ietf-layer0-types { "Label for DWDM or CWDM grid"; case dwdm { leaf dwdm-n { - type layer0-types:dwdm-n; + type l0-types:dwdm-n; description "The central frequency of DWDM. "; reference @@ -483,7 +468,7 @@ module ietf-layer0-types { } case cwdm { leaf cwdm-n { - type layer0-types:cwdm-n; + type l0-types:cwdm-n; description "Channel wavelength computing input. "; reference @@ -508,29 +493,27 @@ module ietf-layer0-types { description "single or super channel"; case single { leaf dwdm-n { - type layer0-types:dwdm-n; + type l0-types:dwdm-n; description "The central frequency of DWDM. "; } } case super { leaf-list subcarrier-dwdm-n { - type layer0-types:dwdm-n; + type l0-types:dwdm-n; description "List of center frequencies for each subcarrier channels."; reference - "ITU-T Recommendation G.694.1: Spectral girds for + "ITU-T Recommendation G.694.1: Spectral grids for WDM applications: DWDM frequency grid"; - } } } - } case cwdm { leaf cwdm-n { - type layer0-types:cwdm-n; + type l0-types:cwdm-n; description "Channel wavelength computing input. "; reference @@ -546,7 +529,7 @@ module ietf-layer0-types { grouping layer0-label-range-info { description - "Information for layer0 label range."; + "Information for layer 0 label range."; leaf grid-type { type identityref { @@ -556,7 +539,10 @@ module ietf-layer0-types { } leaf priority { type uint8; - description "Priority"; + description + "Priority in Interface Switching Capability + Descriptor (ISCD)."; + reference "RFC4203."; } reference "RFC6205: Generalized Labels for @@ -603,7 +589,7 @@ module ietf-layer0-types { grouping flexi-grid-node-attributes { description "Flexi-grid node attributes"; container flexi-grid-node { - description "Flexi-grid node attrtibutes"; + description "Flexi-grid node attributes"; leaf node-type { type identityref { base layer0-node-type; @@ -649,7 +635,7 @@ module ietf-layer0-types { description "Label-start and Label-end information for Flexi-grid."; leaf flexi-n { - type int16; + type l0-types:flexi-n; description "The central frequency in Flexi-grid."; } @@ -661,18 +647,13 @@ module ietf-layer0-types { grouping flexi-grid-channel { description "Flexi-grid channel grouping."; - uses flexi-grid-label-start-end; - leaf flexi-m { - type uint16 { - range "1..max"; - } + type l0-types:flexi-m; description "M is used to determine the slot width. A slot width is constrained to be M x SWG (that is, M x 12.500 GHz), where M is a positive integer."; - } reference "RFC7698: Framework and Requirements for GMPLS-Based Control @@ -706,7 +687,6 @@ module ietf-layer0-types { description "Info of Flexi-grid-specific label range"; uses layer0-label-range-info; - container flexi-grid { description "flexi-grid definition"; leaf nominal-central-frequency-granularity { @@ -736,7 +716,6 @@ module ietf-layer0-types { of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) Networks"; } - leaf min-slot-width-factor { type uint16 { range "1..max"; @@ -763,7 +742,6 @@ module ietf-layer0-types { "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) Networks"; } - } } From 8e0d1878b6a0a8e2cc675343175ba269799bf9e6 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Tue, 31 Dec 2019 19:54:00 +0800 Subject: [PATCH 02/18] Add files via upload Add more reference, per request in https://github.com/ietf-ccamp-wg/draft-ietf-ccamp-layer0-types/issues/4. --- ietf-layer0-types.yang | 116 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 103 insertions(+), 13 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index dd78b52..405179e 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -44,7 +44,7 @@ module ietf-layer0-types { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2019-12-25" { + revision "2019-12-31" { description "Initial Version"; reference @@ -66,14 +66,15 @@ module ietf-layer0-types { description "The given value 'N' is used to determine the nominal central frequency. - The nominal central frequency, 'f' is defined by, f = 193100.000 GHz + N x 12.500 GHz, where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor frequency' for transmission over the C band. "; reference "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; + Lambda-Switch-Capable (LSC) Label Switching Routers, + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } typedef cwdm-n { @@ -84,7 +85,9 @@ module ietf-layer0-types { Wavelength (nm) = 1471 + N x 20 "; reference "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; + Lambda-Switch-Capable (LSC) Label Switching Routers, + ITU-T G.694.2 (12/2003): Spectral grids for WDM applications: + CWDM wavelength grid"; } typedef flexi-n { @@ -99,7 +102,9 @@ module ietf-layer0-types { reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; + Networks. + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } typedef flexi-m { @@ -111,7 +116,9 @@ module ietf-layer0-types { reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; + Networks. + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity layer0-node-type { @@ -119,19 +126,32 @@ module ietf-layer0-types { "layer 0 node type."; reference "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity flexi-grid-node { base layer0-node-type; description "Flexi-grid node"; + reference + "RFC7698: Framework and Requirements for GMPLS-Based Control + of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) + Networks. + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity wson-node-foadm { base layer0-node-type; description "Fixed OADM (Optical Add-Drop Multiplexer) node"; + reference + "RFC6163:Framework for GMPLS and Path Computation Element + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity wson-node-roadm { @@ -139,12 +159,23 @@ module ietf-layer0-types { description "ROADM (Reconfigurable Optical Add-Drop Multiplexer) or OXC (Optical Cross Connect) node"; + reference + "RFC6163:Framework for GMPLS and Path Computation Element + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity wson-node-ila { base layer0-node-type; description "ILA (In-Line Amplifier) node"; + reference + "RFC6163:Framework for GMPLS and Path Computation Element + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.698.2 (11/2018): Amplified multichannel dense + wavelength division multiplexing applications with single + channel optical interfaces"; } identity wavelength-assignment { @@ -189,7 +220,9 @@ module ietf-layer0-types { "Layer 0 grid type"; reference "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity flexi-grid-dwdm { @@ -199,19 +232,31 @@ module ietf-layer0-types { reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; + Networks, + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity wson-grid-dwdm { base layer0-grid-type; description "DWDM grid"; + reference + "RFC6163:Framework for GMPLS and Path Computation Element + (PCE) Control of Wavelength Switched Optical Networks (WSONs), + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity wson-grid-cwdm { base layer0-grid-type; description "CWDM grid"; + reference + "RFC6205: Generalized Labels for + Lambda-Switch-Capable (LSC) Label Switching Routers, + ITU-T G.694.2 (12/2003): Spectral grids for WDM applications: + CWDM wavelength grid"; } identity term-type { @@ -225,30 +270,40 @@ module ietf-layer0-types { base term-type; description "Physical layer termination"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity term-OTU { base term-type; description "OTU (Optical Transport Unit) termination"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity term-ODU { base term-type; description "ODU (Optical Data Unit) termination"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity term-OPU { base term-type; description "OPU (Optical Payload Unit) termination"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity term-section { base term-type; description "Section layer termination"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity layer0-bandwidth-type { @@ -262,66 +317,93 @@ module ietf-layer0-types { base layer0-bandwidth-type; description "OTU1 (2.66G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity bw-OTU1e { base layer0-bandwidth-type; description "OTU1e (11.04G)"; + reference + "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical + transport networks (OTN)"; } identity bw-OTU1f { base layer0-bandwidth-type; description "OTU1f (11.27G)"; + reference + "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical + transport networks (OTN)"; } identity bw-OTU2 { base layer0-bandwidth-type; description "OTU2 (10.70G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity bw-OTU2e { base layer0-bandwidth-type; description "OTU2e (11.09G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity bw-OTU2f { base layer0-bandwidth-type; description "OTU2f (11.31G)"; + reference + "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical + transport networks (OTN)"; } identity bw-OTU3 { base layer0-bandwidth-type; description "OTU3 (43.01G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity bw-OTU3e1 { base layer0-bandwidth-type; description "OTU3e1 (44.57G)"; + reference + "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical + transport networks (OTN)"; } identity bw-OTU3e2 { base layer0-bandwidth-type; description "OTU3e2 (44.58G)"; + reference + "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical + transport networks (OTN)"; } identity bw-OTU4 { base layer0-bandwidth-type; description "OTU4 (111.80G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity bw-OTUCn { base layer0-bandwidth-type; description "OTUCn (beyond 100G)"; + reference + "ITU-T G.709: Interfaces for the Optical Transport Network"; } identity dwdm-ch-spc-type { @@ -329,7 +411,9 @@ module ietf-layer0-types { "DWDM channel spacing type"; reference "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; + Lambda-Switch-Capable (LSC) Label Switching Routers, + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity dwdm-100ghz { @@ -362,7 +446,9 @@ module ietf-layer0-types { reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; + Networks + ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: + DWDM frequency grid"; } identity flexi-ch-spc-6p25ghz { @@ -387,7 +473,9 @@ module ietf-layer0-types { "CWDM channel spacing type"; reference "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; + Lambda-Switch-Capable (LSC) Label Switching Routers, + ITU-T G.694.2 (12/2003): Spectral grids for WDM applications: + CWDM wavelength grid"; } identity cwdm-20nm { @@ -583,7 +671,9 @@ module ietf-layer0-types { } reference "RFC6205: Generalized Labels for - Lambda-Switch-Capable (LSC) Label Switching Routers"; + Lambda-Switch-Capable (LSC) Label Switching Routers + ITU-T G.694.2 (12/2003): Spectral grids for WDM applications: + CWDM wavelength grid"; } grouping flexi-grid-node-attributes { From bc79c140de2ddc525c3af9b95251d78e6ad85836 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Wed, 8 Apr 2020 09:59:25 +0800 Subject: [PATCH 03/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 405179e..6eb4c26 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -44,7 +44,7 @@ module ietf-layer0-types { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2019-12-31" { + revision "2020-01-27" { description "Initial Version"; reference @@ -851,4 +851,4 @@ module ietf-layer0-types { of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) Networks"; } -} \ No newline at end of file +} From ac27437ef05c3d3adddb84f1c7b17087f3a296db Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Wed, 8 Apr 2020 09:59:39 +0800 Subject: [PATCH 04/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 6eb4c26..2789268 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -222,7 +222,9 @@ module ietf-layer0-types { "RFC6163:Framework for GMPLS and Path Computation Element (PCE) Control of Wavelength Switched Optical Networks (WSONs), ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: - DWDM frequency grid"; + DWDM frequency grid, + ITU-T G.694.2 (12/2003): Spectral grids for WDM applications: + CWDM wavelength grid"; } identity flexi-grid-dwdm { From 10acf682d70a734de21a81868f4f13a2b9c1a8f3 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Wed, 15 Apr 2020 17:07:23 +0800 Subject: [PATCH 05/18] Solving issue #6, #9 and some on the list This update solves the open issue https://github.com/ietf-ccamp-wg/draft-ietf-ccamp-layer0-types/issues/6 and https://github.com/ietf-ccamp-wg/draft-ietf-ccamp-layer0-types/issues/9 This update also solves the comments raised on the ccamp mailing list: https://mailarchive.ietf.org/arch/msg/ccamp/qp4YJCYKx-pNaajY31XEis4nFS0/ --- ietf-layer0-types.yang | 391 ++++------------------------------------- 1 file changed, 30 insertions(+), 361 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 2789268..274443b 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -31,7 +31,7 @@ module ietf-layer0-types { Division Multiplexing) and DWDM (Dense Wavelength Division Multiplexing)) and Flexi-grid Optical Networks. - Copyright (c) 2019 IETF Trust and the persons identified + Copyright (c) 2020 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with @@ -44,30 +44,20 @@ module ietf-layer0-types { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2020-01-27" { + revision "2020-04-15" { description "Initial Version"; reference "RFC XXXX: A YANG Data Model for Layer 0 Types"; } - typedef operational-mode { - type string; - description - "Vendor-specific mode that guarantees interoperability. - It must be an string with the following format: - B-DScW-ytz(v) where all these attributes are conforming - to the ITU-T recommendation"; - reference "ITU-T G.698.2 (11/2018) Section 5.3"; - } - typedef dwdm-n { type int16; description "The given value 'N' is used to determine the nominal central frequency. The nominal central frequency, 'f' is defined by, - f = 193100.000 GHz + N x 12.500 GHz, + f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor frequency' for transmission over the C band. "; reference @@ -96,7 +86,7 @@ module ietf-layer0-types { "The given value 'N' is used to determine the nominal central frequency. The nominal central frequency, 'f' is defined by, - f = 193100.000 GHz + N x 6.250 GHz, + f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor frequency' for transmission over the C band. "; reference @@ -112,7 +102,8 @@ module ietf-layer0-types { description "M is used to determine the slot width. A slot width is constrained to be M x SWG (that is, M x 12.500 GHz), - where M is a positive integer. "; + where M is a positive integer. + Noted that the 12.500GHz is the 2 x channel-spacing (6.25G)"; reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) @@ -121,92 +112,6 @@ module ietf-layer0-types { DWDM frequency grid"; } - identity layer0-node-type { - description - "layer 0 node type."; - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs), - ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: - DWDM frequency grid"; - } - - identity flexi-grid-node { - base layer0-node-type; - description - "Flexi-grid node"; - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks. - ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: - DWDM frequency grid"; - } - - identity wson-node-foadm { - base layer0-node-type; - description - "Fixed OADM (Optical Add-Drop Multiplexer) node"; - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs), - ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: - DWDM frequency grid"; - } - - identity wson-node-roadm { - base layer0-node-type; - description - "ROADM (Reconfigurable Optical Add-Drop Multiplexer) - or OXC (Optical Cross Connect) node"; - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs), - ITU-T G.694.1 (02/2012): Spectral grids for WDM applications: - DWDM frequency grid"; - } - - identity wson-node-ila { - base layer0-node-type; - description - "ILA (In-Line Amplifier) node"; - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs), - ITU-T G.698.2 (11/2018): Amplified multichannel dense - wavelength division multiplexing applications with single - channel optical interfaces"; - } - - identity wavelength-assignment { - description - "Wavelength selection base"; - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; - } - - identity unspecified-wavelength-assignment { - base wavelength-assignment; - description - "No method specified"; - } - - identity first-fit-wavelength-assignment { - base wavelength-assignment; - description - "All the available wavelengths are numbered, - and this WA (Wavelength Assignment) method chooses - the available wavelength with the lowest index"; - } - - identity random-wavelength-assignment { - base wavelength-assignment; - description - "This WA method chooses an available - wavelength randomly"; - } - identity least-loaded-wavelength-assignment { base wavelength-assignment; description @@ -215,7 +120,7 @@ module ietf-layer0-types { link along the route (in multi-fiber networks)"; } - identity layer0-grid-type { + identity l0-grid-type { description "Layer 0 grid type"; reference @@ -228,7 +133,7 @@ module ietf-layer0-types { } identity flexi-grid-dwdm { - base layer0-grid-type; + base l0-grid-type; description "Flexi-grid"; reference @@ -240,7 +145,7 @@ module ietf-layer0-types { } identity wson-grid-dwdm { - base layer0-grid-type; + base l0-grid-type; description "DWDM grid"; reference @@ -251,7 +156,7 @@ module ietf-layer0-types { } identity wson-grid-cwdm { - base layer0-grid-type; + base l0-grid-type; description "CWDM grid"; reference @@ -261,153 +166,6 @@ module ietf-layer0-types { CWDM wavelength grid"; } - identity term-type { - description - "Termination type"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity term-phys { - base term-type; - description - "Physical layer termination"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity term-OTU { - base term-type; - description - "OTU (Optical Transport Unit) termination"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity term-ODU { - base term-type; - description - "ODU (Optical Data Unit) termination"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity term-OPU { - base term-type; - description - "OPU (Optical Payload Unit) termination"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity term-section { - base term-type; - description - "Section layer termination"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity layer0-bandwidth-type { - description - "Bandwidth type carried by a single wavelength channel"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTU1 { - base layer0-bandwidth-type; - description - "OTU1 (2.66G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTU1e { - base layer0-bandwidth-type; - description - "OTU1e (11.04G)"; - reference - "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical - transport networks (OTN)"; - } - - identity bw-OTU1f { - base layer0-bandwidth-type; - description - "OTU1f (11.27G)"; - reference - "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical - transport networks (OTN)"; - } - - identity bw-OTU2 { - base layer0-bandwidth-type; - description - "OTU2 (10.70G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTU2e { - base layer0-bandwidth-type; - description - "OTU2e (11.09G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTU2f { - base layer0-bandwidth-type; - description - "OTU2f (11.31G)"; - reference - "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical - transport networks (OTN)"; - } - - identity bw-OTU3 { - base layer0-bandwidth-type; - description - "OTU3 (43.01G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTU3e1 { - base layer0-bandwidth-type; - description - "OTU3e1 (44.57G)"; - reference - "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical - transport networks (OTN)"; - } - - identity bw-OTU3e2 { - base layer0-bandwidth-type; - description - "OTU3e2 (44.58G)"; - reference - "ITU-T G.sup43: Transport of IEEE 10GBASE-R in optical - transport networks (OTN)"; - } - - identity bw-OTU4 { - base layer0-bandwidth-type; - description - "OTU4 (111.80G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity bw-OTUCn { - base layer0-bandwidth-type; - description - "OTUCn (beyond 100G)"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - identity dwdm-ch-spc-type { description "DWDM channel spacing type"; @@ -486,59 +244,7 @@ module ietf-layer0-types { "20nm channel spacing"; } - identity fec-type { - description - "FEC (Forward Error Correction) type"; - reference - "ITU-T G.709: Interfaces for the Optical Transport Network"; - } - - identity g-fec { - base fec-type; - description - "G-FEC (Generic-FEC)"; - } - identity e-fec { - base fec-type; - description - "E-FEC (Enhanced-FEC)"; - } - identity no-fec { - base fec-type; - description - "No FEC"; - } - /* Groupings. */ - grouping wson-path-bandwidth { - description - "WSON (Wavelength Switched Optical Network) - path bandwidth attributes"; - leaf bandwidth-type { - type identityref { - base layer0-bandwidth-type; - } - description "WSON bandwidth type"; - } - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; - } - - grouping wson-link-bandwidth { - description - "WSON link bandwidth attributes"; - leaf-list supported-bandwidth-list { - type identityref { - base layer0-bandwidth-type; - } - description "WSON bandwidth type"; - } - reference - "RFC6163:Framework for GMPLS and Path Computation Element - (PCE) Control of Wavelength Switched Optical Networks (WSONs)"; - } - grouping wson-label-start-end { description "The WSON label-start or label-end used to @@ -617,13 +323,13 @@ module ietf-layer0-types { Lambda-Switch-Capable (LSC) Label Switching Routers"; } - grouping layer0-label-range-info { + grouping l0-label-range-info { description "Information for layer 0 label range."; leaf grid-type { type identityref { - base layer0-grid-type; + base l0-grid-type; } description "Grid type"; } @@ -641,7 +347,7 @@ module ietf-layer0-types { grouping wson-label-step { description "Label step information for WSON"; - choice layer0-grid-type { + choice l0-grid-type { description "Grid type: DWDM, CWDM, etc."; case dwdm { @@ -678,51 +384,6 @@ module ietf-layer0-types { CWDM wavelength grid"; } - grouping flexi-grid-node-attributes { - description "Flexi-grid node attributes"; - container flexi-grid-node { - description "Flexi-grid node attributes"; - leaf node-type { - type identityref { - base layer0-node-type; - } - description "Flexi-grid node type"; - } - } - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; - } - - grouping flexi-grid-path-bandwidth { - description "Flexi-grid path bandwidth attributes"; - leaf bandwidth-type { - type identityref { - base layer0-bandwidth-type; - } - description "Flexi-grid bandwidth type"; - } - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; - } - - grouping flexi-grid-link-bandwidth { - description "flexi-grid link bandwidth attributes"; - leaf-list supported-bandwidth-list { - type identityref { - base layer0-bandwidth-type; - } - description "Flexi-grid bandwidth type"; - } - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; - } - grouping flexi-grid-label-start-end { description "Label-start and Label-end information for Flexi-grid."; @@ -737,8 +398,8 @@ module ietf-layer0-types { Networks"; } - grouping flexi-grid-channel { - description "Flexi-grid channel grouping."; + grouping flexi-grid-frequency-slot { + description "Flexi-grid frequency slot grouping."; uses flexi-grid-label-start-end; leaf flexi-m { type l0-types:flexi-m; @@ -757,12 +418,12 @@ module ietf-layer0-types { choice single-or-super-channel { description "single of super channel"; case single { - uses flexi-grid-channel; + uses flexi-grid-frequency-slot; } case super { list subcarrier-flexi-n { key flexi-n; - uses flexi-grid-channel; + uses flexi-grid-frequency-slot; description "List of subcarrier channels for flexi-grid super channel."; @@ -778,7 +439,7 @@ module ietf-layer0-types { grouping flexi-grid-label-range-info { description "Info of Flexi-grid-specific label range"; - uses layer0-label-range-info; + uses l0-label-range-info; container flexi-grid { description "flexi-grid definition"; leaf nominal-central-frequency-granularity { @@ -814,8 +475,12 @@ module ietf-layer0-types { } default 1; description - "Minimum slot width is calculated by: - Minimum slot width (GHz) = + "Slot width range: two multipliers of the slot width , + granularity, each indicating the minimal and maximal slot + width supported by a port, respectively. + + Minimum slot width is calculated by: + Minimum slot width (GHz) = min-slot-width-factor * slot-width-granularity"; reference "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid @@ -827,8 +492,12 @@ module ietf-layer0-types { range "1..max"; } description - "Maximum slot width is calculated by: - Maximum slot width (GHz) = + "Slot width range: two multipliers of the slot width , + granularity, each indicating the minimal and maximal slot + width supported by a port, respectively. + + Maximum slot width is calculated by: + Maximum slot width (GHz) = max-slot-width-factor * slot-width-granularity"; reference "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid From af6938771e98ca7b909e9ff182e2ed555fe49110 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 15:49:07 +0800 Subject: [PATCH 06/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 274443b..0179658 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -59,7 +59,8 @@ module ietf-layer0-types { The nominal central frequency, 'f' is defined by, f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor - frequency' for transmission over the C band. "; + frequency' for transmission over the C band; and + where 'channel-spacing' is defined by the dwdm-ch-spc-type."; reference "RFC6205: Generalized Labels for Lambda-Switch-Capable (LSC) Label Switching Routers, From 681de271fca57a3b229d2901a114429f12a4f12a Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:07:49 +0800 Subject: [PATCH 07/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 0179658..be93dfc 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -57,7 +57,7 @@ module ietf-layer0-types { "The given value 'N' is used to determine the nominal central frequency. The nominal central frequency, 'f' is defined by, - f = 193100.000 GHz + N x channel-spacing (measured in GHz), + f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor frequency' for transmission over the C band; and where 'channel-spacing' is defined by the dwdm-ch-spc-type."; From 40cb6aad7e9d5be547ba48ba3da6d584c54e3d7e Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:10:21 +0800 Subject: [PATCH 08/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index be93dfc..497c61f 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -87,7 +87,7 @@ module ietf-layer0-types { "The given value 'N' is used to determine the nominal central frequency. The nominal central frequency, 'f' is defined by, - f = 193100.000 GHz + N x channel-spacing (measured in GHz), + f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor frequency' for transmission over the C band. "; reference From cc4e4da546251418f3934fff2e7a1a483e19265f Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:18:53 +0800 Subject: [PATCH 09/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 497c61f..c4e67ca 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -89,7 +89,12 @@ module ietf-layer0-types { The nominal central frequency, 'f' is defined by, f = 193100.000 GHz + N x channel-spacing (measured in GHz), where 193100.000 GHz (193.100000 THz) is the ITU-T 'anchor - frequency' for transmission over the C band. "; + frequency' for transmission over the C band; and + where 'channel-spacing' is defined by the flexi-ch-spc-type. + + Note that the term 'chanel-spacing' can be alternated by the + term 'nominal central frequency granularity' defined in + clause 7 of ITU-T G.694.1."; reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) From 68a7aee769f88a26fc149e2a796b126c25f79957 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:23:21 +0800 Subject: [PATCH 10/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index c4e67ca..ca27651 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -251,6 +251,7 @@ module ietf-layer0-types { } /* Groupings. */ + grouping wson-label-start-end { description "The WSON label-start or label-end used to From e793df62cddaa885b1304bbe1f8c62df003f5c63 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:23:31 +0800 Subject: [PATCH 11/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index ca27651..ebb5a2e 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -485,9 +485,9 @@ module ietf-layer0-types { "Slot width range: two multipliers of the slot width , granularity, each indicating the minimal and maximal slot width supported by a port, respectively. - - Minimum slot width is calculated by: - Minimum slot width (GHz) = + + Minimum slot width is calculated by: + Minimum slot width (GHz) = min-slot-width-factor * slot-width-granularity"; reference "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid From 17d5ab857ba9b1e1bd991a58ac10a1eac5d0c036 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:23:40 +0800 Subject: [PATCH 12/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index ebb5a2e..581ef8a 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -502,9 +502,9 @@ module ietf-layer0-types { "Slot width range: two multipliers of the slot width , granularity, each indicating the minimal and maximal slot width supported by a port, respectively. - - Maximum slot width is calculated by: - Maximum slot width (GHz) = + + Maximum slot width is calculated by: + Maximum slot width (GHz) = max-slot-width-factor * slot-width-granularity"; reference "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid From 6470afa0d353fa6044f3bb05b79cdf23c841117f Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:26:19 +0800 Subject: [PATCH 13/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 581ef8a..4d32b6c 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -108,8 +108,7 @@ module ietf-layer0-types { description "M is used to determine the slot width. A slot width is constrained to be M x SWG (that is, M x 12.500 GHz), - where M is a positive integer. - Noted that the 12.500GHz is the 2 x channel-spacing (6.25G)"; + where M is a positive integer."; reference "RFC7698: Framework and Requirements for GMPLS-Based Control of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) From 187411967cdb6eb771fb68a14fd9e53328c92e56 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:29:32 +0800 Subject: [PATCH 14/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 4d32b6c..a49a1a5 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -73,7 +73,10 @@ module ietf-layer0-types { description "The given value 'N' is used to compute the channel wavelength as per the formula: - Wavelength (nm) = 1471 + N x 20 "; + Wavelength (nm) = 1471 + N x channel-spacing (measured in nm), + where 1471 nm is the ITU-T 'anchor wavelength' + for transmission over the C band; and + where 'channel-spacing' is defined by the cwdm-ch-spc-type. "; reference "RFC6205: Generalized Labels for Lambda-Switch-Capable (LSC) Label Switching Routers, From 519087caaf7c6c554787a14c10b9b605a898c2e3 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 16:32:15 +0800 Subject: [PATCH 15/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index a49a1a5..73f97f6 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -120,14 +120,6 @@ module ietf-layer0-types { DWDM frequency grid"; } - identity least-loaded-wavelength-assignment { - base wavelength-assignment; - description - "This WA method selects the wavelength that - has the largest residual capacity on the most loaded - link along the route (in multi-fiber networks)"; - } - identity l0-grid-type { description "Layer 0 grid type"; From cb79c40ea8ecf7a37a767bc0514dcba38418ad81 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Mon, 20 Apr 2020 17:06:22 +0800 Subject: [PATCH 16/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 73f97f6..904c65d 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -352,7 +352,7 @@ module ietf-layer0-types { description "Grid type: DWDM, CWDM, etc."; case dwdm { - leaf wson-dwdm { + leaf wson-dwdm-channel-spacing { type identityref { base dwdm-ch-spc-type; } @@ -365,7 +365,7 @@ module ietf-layer0-types { } } case cwdm { - leaf wson-cwdm { + leaf wson-cwdm-channel-spacing { type identityref { base cwdm-ch-spc-type; } @@ -443,20 +443,6 @@ module ietf-layer0-types { uses l0-label-range-info; container flexi-grid { description "flexi-grid definition"; - leaf nominal-central-frequency-granularity { - type identityref { - base flexi-ch-spc-type; - } - default flexi-ch-spc-6p25ghz; - description - "It is the spacing between allowed nominal central - frequencies. Default is 6.250 GHz"; - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; - } - leaf slot-width-granularity { type identityref { base flexi-slot-width-granularity; @@ -509,7 +495,7 @@ module ietf-layer0-types { grouping flexi-grid-label-step { description "Label step information for flexi-grid"; - leaf flex { + leaf flexi-grid-channel-spacing { type identityref { base flexi-ch-spc-type; } @@ -517,10 +503,19 @@ module ietf-layer0-types { description "Label-step is the nominal central frequency granularity (GHz), e.g., 6.25 GHz"; + reference + "RFC7699: Generalized Labels for the Flexi-Grid in + Lambda Switch Capable (LSC) Label Switching Routers"; + } + leaf flexi-n-step { + type uint8; + description + "The restriction of flexi-n must be certain multipliers + of channel-spacing. This is called the central frequency + granularity in RFC8363. "; + reference + "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid + Dense Wavelength Division Multiplexing (DWDM) Networks"; } - reference - "RFC7698: Framework and Requirements for GMPLS-Based Control - of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) - Networks"; } } From fc6cddd404110a6e1a88b3bb22857111a669fb25 Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Tue, 21 Apr 2020 08:59:10 +0800 Subject: [PATCH 17/18] Update ietf-layer0-types.yang Co-Authored-By: italobusi --- ietf-layer0-types.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 904c65d..97188cc 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -44,7 +44,7 @@ module ietf-layer0-types { This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision "2020-04-15" { + revision "2020-04-20" { description "Initial Version"; reference From 969e073f3a2d82daf87cfe9dacfa25be12921b0d Mon Sep 17 00:00:00 2001 From: haomianzheng Date: Fri, 8 May 2020 10:19:57 +0800 Subject: [PATCH 18/18] Update ietf-layer0-types.yang --- ietf-layer0-types.yang | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ietf-layer0-types.yang b/ietf-layer0-types.yang index 97188cc..00a8d32 100644 --- a/ietf-layer0-types.yang +++ b/ietf-layer0-types.yang @@ -510,9 +510,18 @@ module ietf-layer0-types { leaf flexi-n-step { type uint8; description - "The restriction of flexi-n must be certain multipliers - of channel-spacing. This is called the central frequency - granularity in RFC8363. "; + "This attribute defines the granularity of supported values + for the nominal central frequency as a multiplier of the + channel-spacing. + + For example, given a grid with a nominal central frequency + granularity of 6.25 GHz, the granularity of the supported + values of the nominal central frequency could be 12.5 GHz. + In this case, the values of flexi-n should be even and this + constraints is reported by setting the flexi-n-step to 2. + + This attribute is also known as central frequency granularity + in RFC8363. "; reference "RFC8363: GMPLS OSPF-TE Extensions in Support of Flexi-Grid Dense Wavelength Division Multiplexing (DWDM) Networks";