Skip to content

Commit

Permalink
Synced with YANG code in I-D
Browse files Browse the repository at this point in the history 
These changes are fixing/partially fixing the followig issues:
* #12 - partially fixed
* #14
* #15

2 references added to layer0-types
  • Loading branch information
@dieterbeller
dieterbeller committed Jun 6, 2019
1 parent f3c4b37 commit f76113b
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 38 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

.project
6 changes: 6 additions & 0 deletions ietf-layer0-types.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@ module ietf-layer0-types {
base layer0-grid-type;
description
"flexi grid";
reference
"ITU-T Recommendation G.694.1: Spectral grids for WDM applications:
DWDM frequency grid";
}

identity wson-grid-dwdm {
Expand Down Expand Up @@ -363,6 +366,9 @@ module ietf-layer0-types {
base flexi-ch-spc-type;
description
"6.25GHz channel spacing";
reference
"ITU-T Recommendation G.694.1: Spectral grids for WDM applications:
DWDM frequency grid";
}

identity flexi-slot-width-granularity {
Expand Down
99 changes: 61 additions & 38 deletions ietf-optical-impairment-topology.yang
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module ietf-optical-impairment-topology {
yang-version 1.1;

namespace "urn:ietf:params:xml:ns:yang:ietf-optical-impairment-topology";
namespace
"urn:ietf:params:xml:ns:yang:ietf-optical-impairment-topology";

prefix "optical-imp-topo";

Expand All @@ -25,16 +26,20 @@ module ietf-optical-impairment-topology {
"IETF CCAMP Working Group";

contact
"Editor: Young Lee <leeyoung@huawei.com>
"Editor: Young Lee <younglee.tx@gmail.com>
Editor: Haomian Zheng <zhenghaomian@huawei.com>
Editor: Nicola Sambo <nicosambo@gmail.com>
Editor: Victor Lopez <victor.lopezalvarez@telefonica.com>
Editor: Gabriele Galimberti <ggalimbe@cisco.com>
Editor: Auge Jean-Luc <jeanluc.auge@orange.com>
Editor: Giovanni Martinelli <giomarti@cisco.com>
Editor: Jean-Luc Auge <jeanluc.auge@orange.com>
Editor: Le Rouzic Esther <esther.lerouzic@orange.com>
Editor: Julien Meuric <julien.meuric@orange.com>
Editor: Italo Busi <Italo.Busi@huawei.com>";

Editor: Italo Busi <Italo.Busi@huawei.com>
Editor: Dieter Beller <dieter.beller@nokia.com>
Editor: Sergio Belotti <Sergio.belotti@nokia.com>
Editor: Griseri Enrico <enrico.griseri@nokia.com>
Editor: Gert Grammel <ggrammel@juniper.net>";

description
"This module contains a collection of YANG definitions for
Expand All @@ -44,13 +49,13 @@ module ietf-optical-impairment-topology {
authors of the code. All rights reserved.
Redistribution and use in source and binary forms, with or
without modification, is permitted pursuant to, and subject
without modification, is permitted pursuant to, and subject
to the license terms contained in, the Simplified BSD
License set forth in Section 4.c of the IETF Trust's Legal
Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info).";

revision 2019-05-14 {
revision 2019-05-30 {
description
"Initial Version";
reference
Expand Down Expand Up @@ -102,7 +107,8 @@ module ietf-optical-impairment-topology {
identity DC_DP_QAM16 {
base modulation;
description
"DC DP-QAM16 (Dual Polarization Quadrature Amplitude Modulation)";
"DC DP-QAM16 (Dual Polarization Quadrature Amplitude
Modulation)";
}


Expand Down Expand Up @@ -155,22 +161,22 @@ module ietf-optical-impairment-topology {
grouping transponder-attributes {
description "Configuration of an optical transponder";

leaf-list available-modulation {
leaf-list available-modulation-types {
type identityref {
base modulation;
}
config false;
description
"List determining all the available modulations";
"List of modulation types the OTSi supports";
}

leaf modulation-type {
leaf configured-modulation-type {
type identityref {
base modulation;
}
config false;
description
"Modulation configured for the transponder";
"Currently configured OTSi modulation type";
}

leaf-list available-baud-rates {
Expand All @@ -192,15 +198,15 @@ module ietf-optical-impairment-topology {
description "configured baud-rate";
}

leaf-list available-FEC {
leaf-list available-FEC-types {
type identityref {
base FEC;
}
config false;
description "List determining all the available FEC";
}

leaf FEC-type {
leaf configured-FEC-type {
type identityref {
base FEC;
}
Expand All @@ -225,7 +231,7 @@ module ietf-optical-impairment-topology {
}
config false;
description
"Threshold on the BER, for which FEC is able to correct errors";
"Threshold on the BER, for which FEC is able to correct errors";
}

}
Expand Down Expand Up @@ -497,7 +503,7 @@ module ietf-optical-impairment-topology {
grouping amplifier-params {
description "describes parameters for an amplifier";
container amplifier{
description "amplifier type, operatonal parameters are described";
description "amplifier type, operatonal parameters are described";
leaf type_variety {
type string ;
mandatory true ;
Expand Down Expand Up @@ -544,7 +550,9 @@ module ietf-optical-impairment-topology {
}

grouping fiber-params {
description "String identifier of fiber type referencing a specification in a separate equipment catalog";
description
"String identifier of fiber type referencing a specification in
a separate equipment catalog";
container fiber {
description "fiber characteristics";
leaf type_variety {
Expand Down Expand Up @@ -575,7 +583,8 @@ module ietf-optical-impairment-topology {
units dB;
mandatory true ;
description
"includes all losses: fiber loss and conn_in and conn_out losses";
"includes all losses: fiber loss and conn_in and conn_out
losses";
}
leaf pmd{
type decimal64 {
Expand Down Expand Up @@ -608,7 +617,9 @@ module ietf-optical-impairment-topology {
leaf type_variety {
type string ;
mandatory true ;
description "String identifier of roadm type referencing a specification in a separate equipment catalog";
description
"String identifier of roadm type referencing a specification
in a separate equipment catalog";
}
leaf loss {
type decimal64 {
Expand Down Expand Up @@ -648,7 +659,8 @@ module ietf-optical-impairment-topology {
}
units dBm ;
description
" Reference channel power after the ROADM or after the out-voa. ";
"Reference channel power after the ROADM or after the
out-voa.";
}
}
case power-spectral-density{
Expand All @@ -659,8 +671,9 @@ module ietf-optical-impairment-topology {
}
units W/Hz ;
description
" Reference power spectral density after the ROADM or after the out-voa.
Typical value : 3.9 E-14, resolution 0.1nW/MHz";
"Reference power spectral density after the ROADM or after
the out-voa.
Typical value: 3.9E-14, resolution 0.1 nW/MHz";
}
}
}
Expand All @@ -686,7 +699,9 @@ module ietf-optical-impairment-topology {
}

grouping OTSiG {
description "OTSiG definition , representing client digital information stream supported by 1 or more OTSi";
description
"OTSiG definition, representing a digital client information
stream supported by 1 or more OTSi's";

container OTSiG-container {
config false;
Expand Down Expand Up @@ -726,8 +741,8 @@ module ietf-optical-impairment-topology {
units dB;
config false;
description
"optional ; delta power to ref channel input-power applied
to this media channel";
"optional ; delta power to ref channel input-power applied
to this media channel";
}

}
Expand All @@ -753,21 +768,24 @@ module ietf-optical-impairment-topology {
leaf OTSiG-ref {
type leafref {
path "/nw:networks/nw:network/nw:node/tet:te" +
"/tet:tunnel-termination-point/OTSiG-element/OTSiG-identifier" ;
"/tet:tunnel-termination-point/OTSiG-element/" +
"OTSiG-identifier";

}
description
"Reference to the OTSiG list to get OTSiG identifier of the
OSiG carried by this media channel that reports the transient stat";
"Reference to the OTSiG list to get OTSiG identifier of
the OSiG carried by this media channel that reports the
transient stat";
}
leaf OTSi-ref {
type leafref {
path "/nw:networks/nw:network/nw:node/tet:te" +
"/tet:tunnel-termination-point/OTSiG-element[OTSiG-identifier=current()/../OTSiG-ref]/"+
"OTSiG-container/OTSi/OTSi-carrier-id" ;
"/tet:tunnel-termination-point/OTSiG-element" +
"[OTSiG-identifier=current()/../OTSiG-ref]" +
"/OTSiG-container/OTSi/OTSi-carrier-id" ;
}
description
"Reference to the OTSi list supporting the related OTSiG" ;
"Reference to the OTSi list supporting the related OTSiG";
}


Expand All @@ -780,11 +798,13 @@ module ietf-optical-impairment-topology {
list OMS-elements {
key "elt-index";
description
"defines the spans and the amplifier blocks of the amplified lines";
"defines the spans and the amplifier blocks of the amplified
lines";
leaf elt-index {
type uint16;
description
"ordered list of Index of OMS element (whether it's a Fiber, an EDFA or a Concentratedloss)";
"ordered list of Index of OMS element (whether it's a Fiber,
an EDFA or a Concentratedloss)";
}
leaf uid {
type string;
Expand Down Expand Up @@ -826,9 +846,10 @@ module ietf-optical-impairment-topology {
+ "/tet:te-topology" {
description "optical-impairment topology augmented";
container optical-impairment-topology {
presence "indicates an impairment-aware topology of optical networks";
presence
"indicates an impairment-aware topology of optical networks";
description
"Container to identify impairment-aware topology type";
"Container to identify impairment-aware topology type";
}
}

Expand Down Expand Up @@ -884,7 +905,8 @@ module ietf-optical-impairment-topology {
}

choice mode {
description "standard mode, organizational mode or explicit mode";
description
"standard mode, organizational mode or explicit mode";

case G.692.2 {
uses standard_mode;
Expand Down Expand Up @@ -927,11 +949,12 @@ module ietf-optical-impairment-topology {
when "/nw:networks/nw:network/nw:network-types"
+"/tet:te-topology/optical-imp-topo:optical-impairment-topology" {
description
"This augment is only valid for optical impairment with sliceable
"This augment is only valid for optical impairment with sliceable
transponder model";
}
description
"Tunnel termination point augmentation for sliceable transponder model.";
"Tunnel termination point augmentation for sliceable transponder
model.";
uses sliceable-transponder-attributes;
}
}

0 comments on commit f76113b

Please sign in to comment.