draft-ietf-ccamp-wson-yang-24.txt   draft-ietf-ccamp-wson-yang-25.txt 
CCAMP Working Group H. Zheng CCAMP Working Group H. Zheng
Internet-Draft Huawei Technologies Internet-Draft Huawei Technologies
Intended status: Standards Track Y. Lee Intended status: Standards Track Y. Lee
Expires: November 9, 2020 Samsung Expires: November 20, 2020 Samsung
A. Guo A. Guo
Futurewei Futurewei
V. Lopez V. Lopez
Telefonica Telefonica
D. King D. King
University of Lancaster University of Lancaster
May 8, 2020 May 19, 2020
A YANG Data Model for WSON (Wavelength Switched Optical Networks) A YANG Data Model for WSON (Wavelength Switched Optical Networks)
draft-ietf-ccamp-wson-yang-24 draft-ietf-ccamp-wson-yang-25
Abstract Abstract
This document provides a YANG data model for the routing and This document provides a YANG data model for the routing and
wavelength assignment (RWA) TE topology in wavelength switched wavelength assignment (RWA) TE topology in wavelength switched
optical networks (WSONs). The YANG data model defined in this optical networks (WSONs). The YANG data model defined in this
document conforms to the Network Management Datastore Architecture document conforms to the Network Management Datastore Architecture
(NMDA). (NMDA).
Status of This Memo Status of This Memo
skipping to change at page 1, line 41 skipping to change at page 1, line 41
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at https://datatracker.ietf.org/drafts/current/. Drafts is at https://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on November 9, 2020. This Internet-Draft will expire on November 20, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2020 IETF Trust and the persons identified as the Copyright (c) 2020 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(https://trustee.ietf.org/license-info) in effect on the date of (https://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
skipping to change at page 2, line 21 skipping to change at page 2, line 21
Table of Contents Table of Contents
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2
1.1. Requirements Language . . . . . . . . . . . . . . . . . . 3 1.1. Requirements Language . . . . . . . . . . . . . . . . . . 3
1.2. Terminology and Notations . . . . . . . . . . . . . . . . 3 1.2. Terminology and Notations . . . . . . . . . . . . . . . . 3
1.3. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4 1.3. Tree Diagram . . . . . . . . . . . . . . . . . . . . . . 4
1.4. Prefix in Data Node Names . . . . . . . . . . . . . . . . 4 1.4. Prefix in Data Node Names . . . . . . . . . . . . . . . . 4
2. YANG Model (Tree Structure) for WSON topology . . . . . . . . 4 2. YANG Model (Tree Structure) for WSON topology . . . . . . . . 4
3. The YANG Code for WSON topology . . . . . . . . . . . . . . . 24 3. The YANG Code for WSON topology . . . . . . . . . . . . . . . 24
4. Security Considerations . . . . . . . . . . . . . . . . . . . 56 4. Security Considerations . . . . . . . . . . . . . . . . . . . 55
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 56 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 56
6. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 57 6. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 56
7. References . . . . . . . . . . . . . . . . . . . . . . . . . 57 7. References . . . . . . . . . . . . . . . . . . . . . . . . . 56
7.1. Normative References . . . . . . . . . . . . . . . . . . 57 7.1. Normative References . . . . . . . . . . . . . . . . . . 57
7.2. Informative References . . . . . . . . . . . . . . . . . 59 7.2. Informative References . . . . . . . . . . . . . . . . . 59
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 59 Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 59
1. Introduction 1. Introduction
This document provides a YANG data model for the routing and This document provides a YANG data model for the routing and
wavelength assignment (RWA) Traffic Engineering (TE) topology in wavelength assignment (RWA) Traffic Engineering (TE) topology in
transparent wavelength switched optical networks (WSONs). The YANG transparent wavelength switched optical networks (WSONs). The YANG
model described in this document is a WSON technology-specific YANG model described in this document is a WSON technology-specific YANG
skipping to change at page 4, line 19 skipping to change at page 4, line 19
A simplified graphical representation of the data model is used in A simplified graphical representation of the data model is used in
chapter 2 of this this document. The meaning of the symbols in these chapter 2 of this this document. The meaning of the symbols in these
diagrams is defined in [RFC8340]. diagrams is defined in [RFC8340].
1.4. Prefix in Data Node Names 1.4. Prefix in Data Node Names
In this document, names of data nodes and other data model objects In this document, names of data nodes and other data model objects
are prefixed using the standard prefix associated with the are prefixed using the standard prefix associated with the
corresponding YANG imported modules, as shown in the following table. corresponding YANG imported modules, as shown in the following table.
+-------------+-------------------------+------------------------+ +-------------+-------------------------+------------------------+
| Prefix | YANG module | Reference | | Prefix | YANG module | Reference |
+-------------+-------------------------+------------------------+ +-------------+-------------------------+------------------------+
| layer0-types| ietf-layer0-types |[ietf-ccamp-layer-types]| | l0-types | ietf-layer0-types |[ietf-ccamp-layer0-types]|
| wson | ietf-wson-topology | [RFCXXXX] | | wson | ietf-wson-topology | [RFCXXXX] |
| nw | ietf-network | [RFC8345] | | nw | ietf-network | [RFC8345] |
| nt | ietf-network-topology | [RFC8345] | | nt | ietf-network-topology | [RFC8345] |
| tet | ietf-te-topology |[ietf-teas-yang-te-topo]| | tet | ietf-te-topology |[ietf-teas-yang-te-topo]|
+-------------+-------------------------+------------------------+ +-------------+-------------------------+------------------------+
Note: The RFC Editor will replace XXXX with the number assigned to Note: The RFC Editor will replace XXXX with the number assigned to
the RFC once this draft becomes an RFC. the RFC once this draft becomes an RFC.
2. YANG Model (Tree Structure) for WSON topology 2. YANG Model (Tree Structure) for WSON topology
module: ietf-wson-topology module: ietf-wson-topology
augment /nw:networks/nw:network/nw:network-types augment /nw:networks/nw:network/nw:network-types/tet:te-topology:
/tet:te-topology:
+--rw wson-topology! +--rw wson-topology!
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes: /tet:te-node-attributes:
+--rw wson-node! +--rw wson-node!
+--rw is-reconfigurable-node? boolean +--rw is-reconfigurable-node? boolean
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw grid-type? identityref +--rw grid-type? identityref
+--rw priority? uint8 +--rw priority? uint8
skipping to change at page 5, line 34 skipping to change at page 5, line 33
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--rw (l0-grid-type)? +--rw (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw wson-dwdm-channel-spacing? identityref | +--rw wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--rw wson-cwdm-channel-spacing? identityref +--rw wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:underlay/tet:primary-path/tet:path-element /tet:underlay/tet:primary-path/tet:path-element/tet:type
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:underlay/tet:backup-path/tet:path-element /tet:underlay/tet:backup-path/tet:path-element/tet:type
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
skipping to change at page 6, line 52 skipping to change at page 6, line 48
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:path-properties/tet:path-route-objects /tet:path-properties/tet:path-route-objects
/tet:path-route-object/tet:type/tet:label /tet:path-route-object/tet:type/tet:label/tet:label-hop
/tet:label-hop/tet:te-label/tet:technology: /tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction: /tet:label-restriction:
+--rw grid-type? identityref +--rw grid-type? identityref
+--rw priority? uint8 +--rw priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-start/tet:te-label
/tet:label-start/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw dwdm-n? l0-types:dwdm-n | +--rw dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-end/tet:te-label
/tet:label-end/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw dwdm-n? l0-types:dwdm-n | +--rw dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-step/tet:technology:
/tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--rw (l0-grid-type)? +--rw (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw wson-dwdm-channel-spacing? identityref | +--rw wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--rw wson-cwdm-channel-spacing? identityref +--rw wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction: /tet:label-restriction:
+--rw grid-type? identityref +--rw grid-type? identityref
+--rw priority? uint8 +--rw priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-start/tet:te-label
/tet:label-start/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw dwdm-n? l0-types:dwdm-n | +--rw dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-end/tet:te-label
/tet:label-end/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw dwdm-n? l0-types:dwdm-n | +--rw dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-step/tet:technology:
/tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--rw (l0-grid-type)? +--rw (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw wson-dwdm-channel-spacing? identityref | +--rw wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--rw wson-cwdm-channel-spacing? identityref +--rw wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:underlay /tet:connectivity-matrix/tet:underlay/tet:primary-path
/tet:primary-path/tet:path-element/tet:type/tet:label /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:label-hop/tet:te-label/tet:technology: /tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
skipping to change at page 9, line 29 skipping to change at page 9, line 24
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:optimizations /tet:connectivity-matrix/tet:optimizations/tet:algorithm
/tet:algorithm/tet:metric/tet:optimization-metric /tet:metric/tet:optimization-metric
/tet:explicit-route-exclude-objects /tet:explicit-route-exclude-objects
/tet:route-object-exclude-object/tet:type/tet:label /tet:route-object-exclude-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:optimizations /tet:connectivity-matrix/tet:optimizations/tet:algorithm
/tet:algorithm/tet:metric/tet:optimization-metric /tet:metric/tet:optimization-metric
/tet:explicit-route-include-objects /tet:explicit-route-include-objects
/tet:route-object-include-object/tet:type/tet:label /tet:route-object-include-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:te-node-attributes/tet:connectivity-matrices /tet:te-node-attributes/tet:connectivity-matrices
/tet:connectivity-matrix/tet:path-properties /tet:connectivity-matrix/tet:path-properties
/tet:path-route-objects/tet:path-route-object /tet:path-route-objects/tet:path-route-object/tet:type
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:label-restrictions /tet:label-restrictions/tet:label-restriction:
/tet:label-restriction:
+--ro grid-type? identityref +--ro grid-type? identityref
+--ro priority? uint8 +--ro priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:label-restrictions /tet:label-restrictions/tet:label-restriction
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-start/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:label-restrictions /tet:label-restrictions/tet:label-restriction
/tet:label-restriction/tet:label-end/tet:te-label /tet:label-end/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:label-restrictions /tet:label-restrictions/tet:label-restriction
/tet:label-restriction/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--ro (l0-grid-type)? +--ro (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro wson-dwdm-channel-spacing? identityref | +--ro wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--ro wson-cwdm-channel-spacing? identityref +--ro wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:underlay /tet:underlay/tet:primary-path/tet:path-element/tet:type
/tet:primary-path/tet:path-element/tet:type/tet:label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:underlay /tet:underlay/tet:backup-path/tet:path-element/tet:type
/tet:backup-path/tet:path-element/tet:type/tet:label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:optimizations /tet:optimizations/tet:algorithm/tet:metric
/tet:algorithm/tet:metric/tet:optimization-metric /tet:optimization-metric
/tet:explicit-route-exclude-objects /tet:explicit-route-exclude-objects
/tet:route-object-exclude-object/tet:type/tet:label /tet:route-object-exclude-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:optimizations /tet:optimizations/tet:algorithm/tet:metric
/tet:algorithm/tet:metric/tet:optimization-metric /tet:optimization-metric
/tet:explicit-route-include-objects /tet:explicit-route-include-objects
/tet:route-object-include-object/tet:type/tet:label /tet:route-object-include-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:path-properties /tet:path-properties/tet:path-route-objects
/tet:path-route-objects/tet:path-route-object /tet:path-route-object/tet:type/tet:label/tet:label-hop
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:from/tet:label-restrictions
/tet:label-restriction: /tet:label-restriction:
+--ro grid-type? identityref +--ro grid-type? identityref
+--ro priority? uint8 +--ro priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:from/tet:label-restrictions
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-restriction/tet:label-start/tet:te-label
/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:from/tet:label-restrictions
/tet:label-restriction/tet:label-end/tet:te-label /tet:label-restriction/tet:label-end/tet:te-label
/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:from/tet:label-restrictions
/tet:label-restriction/tet:label-step/tet:technology: /tet:label-restriction/tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--ro (l0-grid-type)? +--ro (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro wson-dwdm-channel-spacing? identityref | +--ro wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--ro wson-cwdm-channel-spacing? identityref +--ro wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:to/tet:label-restrictions/tet:label-restriction: /tet:label-restriction:
+--ro grid-type? identityref +--ro grid-type? identityref
+--ro priority? uint8 +--ro priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:to/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-start/tet:te-label
/tet:label-start/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:to/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-end/tet:te-label
/tet:label-end/tet:te-label/tet:technology: /tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro dwdm-n? l0-types:dwdm-n | +--ro dwdm-n? l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:to/tet:label-restrictions/tet:label-restriction /tet:label-restriction/tet:label-step/tet:technology:
/tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--ro (l0-grid-type)? +--ro (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro wson-dwdm-channel-spacing? identityref | +--ro wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--ro wson-cwdm-channel-spacing? identityref +--ro wson-cwdm-channel-spacing? identityref
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:underlay/tet:primary-path
/tet:underlay/tet:primary-path/tet:path-element /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
skipping to change at page 15, line 4 skipping to change at page 14, line 34
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:underlay/tet:backup-path
/tet:underlay/tet:backup-path/tet:path-element /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:optimizations/tet:algorithm
/tet:optimizations/tet:algorithm/tet:metric /tet:metric/tet:optimization-metric
/tet:optimization-metric
/tet:explicit-route-exclude-objects /tet:explicit-route-exclude-objects
/tet:route-object-exclude-object/tet:type/tet:label /tet:route-object-exclude-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:optimizations/tet:algorithm
/tet:optimizations/tet:algorithm/tet:metric /tet:metric/tet:optimization-metric
/tet:optimization-metric
/tet:explicit-route-include-objects /tet:explicit-route-include-objects
/tet:route-object-include-object/tet:type/tet:label /tet:route-object-include-object/tet:type/tet:label
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrix/tet:path-properties
/tet:path-properties/tet:path-route-objects /tet:path-route-objects/tet:path-route-object/tet:type
/tet:path-route-object/tet:type/tet:label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:label-hop/tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
skipping to change at page 18, line 33 skipping to change at page 18, line 11
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point /tet:tunnel-termination-point
/tet:local-link-connectivities/tet:path-properties /tet:local-link-connectivities/tet:path-properties
/tet:path-route-objects/tet:path-route-object /tet:path-route-objects/tet:path-route-object/tet:type
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
skipping to change at page 20, line 11 skipping to change at page 19, line 36
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point /tet:tunnel-termination-point
/tet:local-link-connectivities /tet:local-link-connectivities
/tet:local-link-connectivity/tet:underlay /tet:local-link-connectivity/tet:underlay/tet:backup-path
/tet:backup-path/tet:path-element/tet:type/tet:label /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:label-hop/tet:te-label/tet:technology: /tet:te-label/tet:technology:
+--:(wson) +--:(wson)
+--rw (grid-type)? +--rw (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw (single-or-super-channel)? | +--rw (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
skipping to change at page 21, line 16 skipping to change at page 20, line 41
| +--:(single) | +--:(single)
| | +--rw dwdm-n? l0-types:dwdm-n | | +--rw dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--rw subcarrier-dwdm-n* l0-types:dwdm-n | +--rw subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--rw cwdm-n? l0-types:cwdm-n +--rw cwdm-n? l0-types:cwdm-n
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point /tet:tunnel-termination-point
/tet:local-link-connectivities /tet:local-link-connectivities
/tet:local-link-connectivity/tet:path-properties /tet:local-link-connectivity/tet:path-properties
/tet:path-route-objects/tet:path-route-object /tet:path-route-objects/tet:path-route-object/tet:type
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label/tet:technology:
/tet:technology:
+--:(wson) +--:(wson)
+--ro (grid-type)? +--ro (grid-type)?
+--:(dwdm) +--:(dwdm)
| +--ro (single-or-super-channel)? | +--ro (single-or-super-channel)?
| +--:(single) | +--:(single)
| | +--ro dwdm-n? l0-types:dwdm-n | | +--ro dwdm-n? l0-types:dwdm-n
| +--:(super) | +--:(super)
| +--ro subcarrier-dwdm-n* l0-types:dwdm-n | +--ro subcarrier-dwdm-n* l0-types:dwdm-n
+--:(cwdm) +--:(cwdm)
+--ro cwdm-n? l0-types:cwdm-n +--ro cwdm-n? l0-types:cwdm-n
skipping to change at page 24, line 46 skipping to change at page 24, line 23
/tet:label-restriction/tet:label-step/tet:technology: /tet:label-restriction/tet:label-step/tet:technology:
+--:(wson) +--:(wson)
+--rw (l0-grid-type)? +--rw (l0-grid-type)?
+--:(dwdm) +--:(dwdm)
| +--rw wson-dwdm-channel-spacing? identityref | +--rw wson-dwdm-channel-spacing? identityref
+--:(cwdm) +--:(cwdm)
+--rw wson-cwdm-channel-spacing? identityref +--rw wson-cwdm-channel-spacing? identityref
3. The YANG Code for WSON topology 3. The YANG Code for WSON topology
<CODE BEGINS> file "ietf-wson-topology@2020-05-08.yang" <CODE BEGINS> file "ietf-wson-topology@2020-05-19.yang"
module ietf-wson-topology { module ietf-wson-topology {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-wson-topology"; namespace "urn:ietf:params:xml:ns:yang:ietf-wson-topology";
prefix "wson"; prefix "wson";
import ietf-network { import ietf-network {
prefix "nw"; prefix "nw";
reference reference
"RFC 8345: A YANG Data Model for Network Topologies"; "RFC 8345: A YANG Data Model for Network Topologies";
skipping to change at page 26, line 28 skipping to change at page 25, line 50
Redistribution and use in source and binary forms, with Redistribution and use in source and binary forms, with
or without modification, is permitted pursuant to, and or without modification, is permitted pursuant to, and
subject to the license terms contained in, the Simplified subject to the license terms contained in, the Simplified
BSD License set forth in Section 4.c of the IETF Trust's BSD License set forth in Section 4.c of the IETF Trust's
Legal Provisions Relating to IETF Documents Legal Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info). (http://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX; see This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices."; the RFC itself for full legal notices.";
revision 2020-05-08 { revision 2020-05-19 {
description description
"Initial Version"; "Initial Version";
reference reference
"RFC XXXX: A YANG Data Model for WSON (Wavelength Switched "RFC XXXX: A YANG Data Model for WSON (Wavelength Switched
Optical Networks)"; Optical Networks)";
} }
/* /*
* Groupings * Groupings
skipping to change at page 57, line 41 skipping to change at page 57, line 15
[I-D.ietf-ccamp-flexigrid-yang] [I-D.ietf-ccamp-flexigrid-yang]
Madrid, U., Perdices, D., Lopezalvarez, V., King, D., Lee, Madrid, U., Perdices, D., Lopezalvarez, V., King, D., Lee,
Y., and H. Zheng, "YANG data model for Flexi-Grid Optical Y., and H. Zheng, "YANG data model for Flexi-Grid Optical
Networks", draft-ietf-ccamp-flexigrid-yang-05 (work in Networks", draft-ietf-ccamp-flexigrid-yang-05 (work in
progress), January 2020. progress), January 2020.
[I-D.ietf-ccamp-layer0-types] [I-D.ietf-ccamp-layer0-types]
Zheng, H., Lee, Y., Guo, A., Lopezalvarez, V., and D. Zheng, H., Lee, Y., Guo, A., Lopezalvarez, V., and D.
King, "A YANG Data Model for Layer 0 Types", draft-ietf- King, "A YANG Data Model for Layer 0 Types", draft-ietf-
ccamp-layer0-types-04 (work in progress), May 2020. ccamp-layer0-types-05 (work in progress), May 2020.
[I-D.ietf-ccamp-optical-impairment-topology-yang] [I-D.ietf-ccamp-optical-impairment-topology-yang]
Lee, Y., Lopezalvarez, V., Galimberti, G., and D. Beller, Lee, Y., Lopezalvarez, V., Galimberti, G., and D. Beller,
"A Yang Data Model for Optical Impairment-aware Topology", "A Yang Data Model for Optical Impairment-aware Topology",
draft-ietf-ccamp-optical-impairment-topology-yang-03 (work draft-ietf-ccamp-optical-impairment-topology-yang-03 (work
in progress), March 2020. in progress), March 2020.
[I-D.ietf-teas-yang-te-topo] [I-D.ietf-teas-yang-te-topo]
Liu, X., Bryskin, I., Beeram, V., Saad, T., Shah, H., and Liu, X., Bryskin, I., Beeram, V., Saad, T., Shah, H., and
O. Dios, "YANG Data Model for Traffic Engineering (TE) O. Dios, "YANG Data Model for Traffic Engineering (TE)
 End of changes. 53 change blocks. 
155 lines changed or deleted 131 lines changed or added

This html diff was produced by rfcdiff 1.47. The latest version is available from http://tools.ietf.org/tools/rfcdiff/