draft-ietf-ccamp-otn-topo-yang-08.txt   draft-ietf-ccamp-otn-topo-yang-09.txt 
CCAMP Working Group H. Zheng CCAMP Working Group H. Zheng
Internet-Draft Huawei Technologies Internet-Draft I. Busi
Intended status: Standards Track A. Guo Intended status: Standards Track Huawei Technologies
Expires: April 1, 2020 Individual Expires: May 5, 2020 X. Liu
I. Busi
Huawei Technologies
A. Sharma
Google
X. Liu
Volta Networks Volta Networks
S. Belotti S. Belotti
Nokia Nokia
Y. Xu
CAICT
L. Wang
China Mobile
O. Gonzalez de Dios O. Gonzalez de Dios
Telefonica Telefonica
September 29, 2019 November 2, 2019
A YANG Data Model for Optical Transport Network Topology A YANG Data Model for Optical Transport Network Topology
draft-ietf-ccamp-otn-topo-yang-08 draft-ietf-ccamp-otn-topo-yang-09
Abstract Abstract
This document describes a YANG data model to describe the topologies This document describes a YANG data model to describe the topologies
of an Optical Transport Network (OTN). It is independent of control of an Optical Transport Network (OTN). It is independent of control
plane protocols and captures topological and resource related plane protocols and captures topological and resource related
information pertaining to OTN. This model enables clients, which information pertaining to OTN. This model enables clients, which
interact with a transport domain controller, for OTN topology related interact with a transport domain controller, for OTN topology related
operations such as obtaining the relevant topology resource operations such as obtaining the relevant topology resource
information. information.
skipping to change at page 2, line 12 skipping to change at page 1, line 48
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 April 1, 2020. This Internet-Draft will expire on May 5, 2020.
Copyright Notice Copyright Notice
Copyright (c) 2019 IETF Trust and the persons identified as the Copyright (c) 2019 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 37 skipping to change at page 2, line 28
described in the Simplified BSD License. described in the Simplified BSD License.
Table of Contents Table of Contents
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2
2. Terminology and Notations . . . . . . . . . . . . . . . . . . 3 2. Terminology and Notations . . . . . . . . . . . . . . . . . . 3
3. YANG Data Model for OTN Topology . . . . . . . . . . . . . . 4 3. YANG Data Model for OTN Topology . . . . . . . . . . . . . . 4
3.1. OTN Topology Data Model Overview . . . . . . . . . . . . 4 3.1. OTN Topology Data Model Overview . . . . . . . . . . . . 4
3.2. YANG Tree for OTN topology . . . . . . . . . . . . . . . 5 3.2. YANG Tree for OTN topology . . . . . . . . . . . . . . . 5
4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 26 4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 26
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 63 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 64
6. Security Considerations . . . . . . . . . . . . . . . . . . . 64 6. Security Considerations . . . . . . . . . . . . . . . . . . . 64
7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 64 7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 65
8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 65 8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 65
9. References . . . . . . . . . . . . . . . . . . . . . . . . . 65 9. References . . . . . . . . . . . . . . . . . . . . . . . . . 66
9.1. Normative References . . . . . . . . . . . . . . . . . . 65 9.1. Normative References . . . . . . . . . . . . . . . . . . 66
9.2. Informative References . . . . . . . . . . . . . . . . . 67 9.2. Informative References . . . . . . . . . . . . . . . . . 68
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 68 Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 69
1. Introduction 1. Introduction
A transport network is a server-layer network designed to provide A transport network is a server-layer network designed to provide
connectivity services for a client-layer network to carry the client connectivity services for a client-layer network to carry the client
traffic transparently across the server-layer network resources. A traffic transparently across the server-layer network resources. A
transport network can be constructed of equipments utilizing any of a transport network can be constructed of equipments utilizing any of a
number of different transport technologies such as the Optical number of different transport technologies such as the Optical
Transport Networks (OTN) or packet transport such as provided by the Transport Networks (OTN) or packet transport such as provided by the
MPLS-Transport Profile (MPLS-TP). MPLS-Transport Profile (MPLS-TP).
skipping to change at page 9, line 17 skipping to change at page 9, line 9
/tet:unreserved-bandwidth/tet:te-bandwidth /tet:unreserved-bandwidth/tet:te-bandwidth
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw odulist* [odu-type] +--rw odulist* [odu-type]
+--rw odu-type identityref +--rw odu-type identityref
+--rw number? uint16 +--rw number? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--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:te-node-attributes
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
skipping to change at page 9, line 50 skipping to change at page 9, line 43
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices/tet:underlay /tet:connectivity-matrices/tet:underlay
/tet:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
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
/tet:connectivity-matrices/tet:underlay /tet:connectivity-matrices/tet:underlay
/tet:backup-path/tet:path-element/tet:type /tet:backup-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
skipping to change at page 11, line 18 skipping to change at page 11, line 11
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--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:te-node-attributes
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
skipping to change at page 12, line 6 skipping to change at page 11, line 48
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--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:te-node-attributes
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
skipping to change at page 12, line 50 skipping to change at page 12, line 45
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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
/tet:connectivity-matrices /tet:connectivity-matrices
/tet:connectivity-matrix/tet:underlay /tet:connectivity-matrix/tet:underlay
/tet:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
skipping to change at page 14, line 22 skipping to change at page 14, line 17
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:type/tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
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-restriction: /tet:label-restrictions/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro odu-type-list* identityref
+--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-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
skipping to change at page 15, line 4 skipping to change at page 14, line 48
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
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-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn-step? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
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:underlay /tet:connectivity-matrices/tet:underlay
/tet:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
skipping to change at page 16, line 24 skipping to change at page 16, line 20
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
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:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro odu-type-list* identityref
+--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:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
skipping to change at page 17, line 11 skipping to change at page 17, line 8
+--ro ts? uint16 +--ro ts? uint16
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:from /tet:connectivity-matrix/tet:from
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn-step? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
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:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro odu-type-list* identityref
+--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:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
skipping to change at page 18, line 4 skipping to change at page 17, line 50
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
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:to /tet:connectivity-matrix/tet:to
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn-step? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
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:underlay /tet:connectivity-matrix/tet:underlay
/tet:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
skipping to change at page 19, line 27 skipping to change at page 19, line 25
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:type/tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
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:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--rw priority? uint8
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:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
skipping to change at page 20, line 4 skipping to change at page 19, line 51
/tet:tunnel-termination-point /tet:tunnel-termination-point
/tet:local-link-connectivities /tet:local-link-connectivities
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-end/tet:te-label/tet:technology: /tet:label-end/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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:underlay /tet:local-link-connectivities/tet:underlay
/tet:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
skipping to change at page 21, line 28 skipping to change at page 21, line 27
/tet:label-hop/tet:te-label/tet:technology: /tet:label-hop/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
+--ro tsg? identityref +--ro tsg? identityref
+--ro ts-list? string +--ro ts-list? string
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:local-link-connectivity
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--rw priority? uint8
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:local-link-connectivity
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
skipping to change at page 22, line 16 skipping to change at page 22, line 16
+--rw ts? uint16 +--rw ts? uint16
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:local-link-connectivity
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
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:primary-path/tet:path-element/tet:type /tet:primary-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
skipping to change at page 24, line 5 skipping to change at page 24, line 5
/tet:backup-path/tet:path-element/tet:type /tet:backup-path/tet:path-element/tet:type
/tet:label/tet:label-hop/tet:te-label /tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:te-link-attributes/tet:label-restrictions /tet:te-link-attributes/tet:label-restrictions
/tet:label-restriction: /tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--rw priority? uint8
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:te-link-attributes/tet:label-restrictions /tet:te-link-attributes/tet:label-restrictions
/tet:label-restriction/tet:label-start /tet:label-restriction/tet:label-start
/tet:te-label/tet:technology: /tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
skipping to change at page 24, line 35 skipping to change at page 24, line 36
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:te-link-attributes/tet:label-restrictions /tet:te-link-attributes/tet:label-restrictions
/tet:label-restriction/tet:label-step /tet:label-restriction/tet:label-step
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry /tet:information-source-entry
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro odu-type-list* identityref
+--ro priority? uint8
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry /tet:information-source-entry
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
skipping to change at page 25, line 23 skipping to change at page 25, line 25
| +--ro tpn? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry /tet:information-source-entry
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--ro (otn-label-type)? +--ro (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--ro tpn-step? uint16 | +--ro tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--ro ts? uint16 +--ro ts? uint16
augment /nw:networks/tet:te/tet:templates augment /nw:networks/tet:te/tet:templates
/tet:link-template/tet:te-link-attributes /tet:link-template/tet:te-link-attributes
/tet:underlay/tet:primary-path/tet:path-element /tet:underlay/tet:primary-path/tet:path-element
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:type/tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/tet:te/tet:templates augment /nw:networks/tet:te/tet:templates
skipping to change at page 25, line 47 skipping to change at page 25, line 49
/tet:underlay/tet:backup-path/tet:path-element /tet:underlay/tet:backup-path/tet:path-element
/tet:type/tet:label/tet:label-hop/tet:te-label /tet:type/tet:label/tet:label-hop/tet:te-label
/tet:technology: /tet:technology:
+--:(otn) +--:(otn)
+--rw tpn? uint16 +--rw tpn? uint16
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/tet:te/tet:templates augment /nw:networks/tet:te/tet:templates
/tet:link-template/tet:te-link-attributes /tet:link-template/tet:te-link-attributes
/tet:label-restrictions/tet:label-restriction: /tet:label-restrictions/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw odu-type-list* identityref
+--rw priority? uint8
augment /nw:networks/tet:te/tet:templates augment /nw:networks/tet:te/tet:templates
/tet:link-template/tet:te-link-attributes /tet:link-template/tet:te-link-attributes
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-start/tet:te-label/tet:technology: /tet:label-start/tet:te-label/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
skipping to change at page 26, line 29 skipping to change at page 26, line 32
| +--rw tpn? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
augment /nw:networks/tet:te/tet:templates augment /nw:networks/tet:te/tet:templates
/tet:link-template/tet:te-link-attributes /tet:link-template/tet:te-link-attributes
/tet:label-restrictions/tet:label-restriction /tet:label-restrictions/tet:label-restriction
/tet:label-step/tet:technology: /tet:label-step/tet:technology:
+--:(otn) +--:(otn)
+--rw (otn-label-type)? +--rw (otn-label-type)?
+--:(tributary-port) +--:(tributary-port)
| +--rw tpn-step? uint16 | +--rw tpn? uint16
+--:(tributary-slot) +--:(tributary-slot)
+--rw ts? uint16 +--rw ts? uint16
4. The YANG Code 4. The YANG Code
<CODE BEGINS> file "ietf-otn-topology@2019-07-07.yang" <CODE BEGINS> file "ietf-otn-topology@2019-11-02.yang"
module ietf-otn-topology { module ietf-otn-topology {
yang-version 1.1; yang-version 1.1;
namespace "urn:ietf:params:xml:ns:yang:ietf-otn-topology"; namespace "urn:ietf:params:xml:ns:yang:ietf-otn-topology";
prefix "otntopo"; prefix "otntopo";
import ietf-network { import ietf-network {
prefix "nw"; prefix "nw";
reference "RFC 8345: A YANG Data Model for Network Topologies"; reference "RFC 8345: A YANG Data Model for Network Topologies";
} }
import ietf-network-topology { import ietf-network-topology {
prefix "nt"; prefix "nt";
reference "RFC 8345: A YANG Data Model for Network Topologies"; reference "RFC 8345: A YANG Data Model for Network Topologies";
} }
import ietf-te-topology { import ietf-te-topology {
prefix "tet"; prefix "tet";
reference reference
skipping to change at page 27, line 17 skipping to change at page 27, line 22
import ietf-te-topology { import ietf-te-topology {
prefix "tet"; prefix "tet";
reference reference
"I-D.ietf-teas-yang-te-topo: YANG Data Model for "I-D.ietf-teas-yang-te-topo: YANG Data Model for
Traffic Engineering (TE) Topologies"; Traffic Engineering (TE) Topologies";
} }
import ietf-layer1-types { import ietf-layer1-types {
prefix "layer1-types"; prefix "layer1-types";
reference reference
"I-D.ietf-ccamp-layer1-types: A YANG Data Model for Layer 1 Types"; "I-D.ietf-ccamp-layer1-types: A YANG Data Model
for Layer 1 Types";
} }
organization organization
"IETF CCAMP Working Group"; "IETF CCAMP Working Group";
contact contact
"WG Web: <http://tools.ietf.org/wg/ccamp/> "WG Web: <http://tools.ietf.org/wg/ccamp/>
WG List: <mailto:ccamp@ietf.org> WG List: <mailto:ccamp@ietf.org>
Editor: Haomian Zheng Editor: Haomian Zheng
<mailto:zhenghaomian@huawei.com> <mailto:zhenghaomian@huawei.com>
Editor: Aihua Guo
<mailto:aihuaguo@huawei.com>
Editor: Italo Busi Editor: Italo Busi
<mailto:italo.busi@huawei.com> <mailto:italo.busi@huawei.com>
Editor: Anurag Sharma
<mailto:ansha@google.com>
Editor: Xufeng Liu Editor: Xufeng Liu
<mailto:xufeng.liu.ietf@gmail.com> <mailto:xufeng.liu.ietf@gmail.com>
Editor: Sergio Belotti Editor: Sergio Belotti
<mailto:sergio.belotti@nokia.com> <mailto:sergio.belotti@nokia.com>
Editor: Yunbin Xu
<mailto:xuyunbin@ritt.cn>
Editor: Lei Wang
<mailto:wangleiyj@chinamobile.com>
Editor: Oscar Gonzalez de Dios Editor: Oscar Gonzalez de Dios
<mailto:oscar.gonzalezdedios@telefonica.com>"; <mailto:oscar.gonzalezdedios@telefonica.com>";
description description
"This module defines a protocol independent Layer 1/ODU topology "This module defines a protocol independent Layer 1/ODU topology
data model. data model. The model fully conforms
to the Network Management Datastore Architecture (NMDA).
Copyright (c) 2019 IETF Trust and the persons Copyright (c) 2019 IETF Trust and the persons
identified as authors of the code. All rights reserved. identified as authors of the code. All rights reserved.
Redistribution and use in source and binary forms, with or 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 to the license terms contained in, the Simplified BSD License
set forth in Section 4.c of the IETF Trust's Legal Provisions set forth in Section 4.c of the IETF Trust's Legal Provisions
Relating to IETF Documents Relating to IETF Documents
(https://trustee.ietf.org/license-info)."; (https://trustee.ietf.org/license-info).
This version of this YANG module is part of RFC XXXX; see
the RFC itself for full legal notices.";
revision 2019-07-07 { revision 2019-11-02 {
description description
"Initial Revision"; "Initial Revision";
reference reference
"RFC XXXX: A YANG Data Model for Optical Transport Network Topology"; "RFC XXXX: A YANG Data Model for Optical Transport Network
Topology";
// RFC Ed.: replace XXXX with actual RFC number, update date // RFC Ed.: replace XXXX with actual RFC number, update date
// information and remove this note // information and remove this note
} }
/* /*
* Groupings * Groupings
*/ */
grouping otn-link-attributes { grouping otn-link-attributes {
description "link attributes for OTN"; description "link attributes for OTN";
skipping to change at page 28, line 50 skipping to change at page 28, line 47
reference reference
"G.709/Y.1331, February 2016: Interfaces for the "G.709/Y.1331, February 2016: Interfaces for the
Optical Transport Network (OTN)"; Optical Transport Network (OTN)";
} }
leaf distance { leaf distance {
type uint32; type uint32;
description "distance in the unit of kilometers"; description "distance in the unit of kilometers";
} }
} }
/*
* Open issue: move to otn-types to allow reuse in WSON and Flexi-grid topology models?
*/
grouping otn-tp-attributes { grouping otn-tp-attributes {
description "tp attributes for OTN"; description "tp attributes for OTN";
container client-svc { container client-svc {
presence "client-facing LTP."; presence "client-facing LTP.";
description description
"OTN LTP Service attributes."; "OTN LTP Service attributes.";
leaf client-facing { leaf client-facing {
type boolean; type boolean;
skipping to change at page 31, line 4 skipping to change at page 30, line 47
} }
} }
/* Augment bandwidth path constraints of connectivity-matrix */ /* Augment bandwidth path constraints of connectivity-matrix */
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:connectivity-matrix/"
+ "tet:path-constraints/tet:te-bandwidth/tet:technology" { + "tet:path-constraints/tet:te-bandwidth/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
uses layer1-types:otn-link-bandwidth; uses layer1-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of connectivity-matrices information-source */ /* Augment bandwidth path constraints of
* connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:path-constraints/tet:te-bandwidth/tet:technology" { + "tet:path-constraints/tet:te-bandwidth/tet:technology" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
uses layer1-types:otn-link-bandwidth; uses layer1-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of connectivity-matrix information-source */ /* Augment bandwidth path constraints of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:path-constraints/tet:te-bandwidth/tet:technology" { + "tet:path-constraints/tet:te-bandwidth/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
skipping to change at page 32, line 7 skipping to change at page 32, line 4
+ "tet:te-bandwidth/tet:technology" { + "tet:te-bandwidth/tet:technology" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
uses layer1-types:otn-link-bandwidth; uses layer1-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of
/* Augment bandwidth path constraints of local-link-connectivities */ * local-link-connectivities */
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-constraints/" + "tet:local-link-connectivities/tet:path-constraints/"
+ "tet:te-bandwidth/tet:technology" { + "tet:te-bandwidth/tet:technology" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
uses layer1-types:otn-link-bandwidth; uses layer1-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of local-link-connectivity (LLC) */ /* Augment bandwidth path constraints of
* local-link-connectivity (LLC) */
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-constraints/" + "tet:local-link-connectivity/tet:path-constraints/"
+ "tet:te-bandwidth/tet:technology" { + "tet:te-bandwidth/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE bandwidth"; description "Augment OTN TE bandwidth";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
skipping to change at page 34, line 33 skipping to change at page 34, line 31
when "../../../../../nw:network-types/tet:te-topology/" when "../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "OTN TE bandwidth."; description "OTN TE bandwidth.";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
uses layer1-types:otn-link-bandwidth; uses layer1-types:otn-link-bandwidth;
} }
} }
/* Augment maximum reservable bandwidth of TE link information-source */ /*Augment maximum reservable BW of TE link information-source*/
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:max-resv-link-bandwidth/" + "tet:max-resv-link-bandwidth/"
+ "tet:te-bandwidth/tet:technology" { + "tet:te-bandwidth/tet:technology" {
when "../../../../../nw:network-types/tet:te-topology/" when "../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "OTN TE bandwidth."; description "OTN TE bandwidth.";
} }
description "OTN bandwidth."; description "OTN bandwidth.";
case otn { case otn {
skipping to change at page 36, line 48 skipping to change at page 36, line 46
*/ */
/* Augment label restrictions of connectivity-matrices */ /* Augment label restrictions of connectivity-matrices */
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" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label restriction."; description
uses layer1-types:otn-label-restriction; "OTN label restriction, represented by otn-label-range-info.";
uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of connectivity-matrices */ /* Augment label restrictions start of connectivity-matrices */
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-start/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of connectivity-matrices */ /* Augment label restrictions end of connectivity-matrices */
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-end/" + "tet:label-restrictions/tet:label-restriction/tet:label-end/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of connectivity-matrices */ /* Augment label restrictions step of connectivity-matrices */
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-step/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of connectivity-matrices */ /* Augment label hop of underlay primary path
* of connectivity-matrices */
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:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of connectivity-matrices */ /* Augment label hop of underlay backup path
* of connectivity-matrices */
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:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of connectivity-matrices */ /* Augment label hop of route-exclude of connectivity-matrices */
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:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-exclude-object/"
+ "tet:type/tet:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
}
}
} }
/* Augment label hop of route-include of connectivity-matrices (added) */ /* Augment label hop of route-include of connectivity-matrices */
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:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-include-object/"
+ "tet:type/tet:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of connectivity-matrices */ /* Augment label hop of path-route of connectivity-matrices */
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:label-hop/" + "tet:path-route-object/tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology"{ + "tet:te-label/tet:technology"{
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment ingress label restrictions of connectivity-matrix */ /* Augment ingress label restrictions of connectivity-matrix */
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-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
skipping to change at page 39, line 52 skipping to change at page 40, line 4
} }
/* Augment ingress label restrictions of connectivity-matrix */ /* Augment ingress label restrictions of connectivity-matrix */
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-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment ingress label restrictions start of connectivity-matrix */ /* Augment ingress label restrictions start of
* connectivity-matrix */
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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment ingress label restrictions end of connectivity-matrix */ /* Augment ingress label restrictions end of connectivity-matrix */
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-restriction/tet:label-end/" + "tet:label-restrictions/tet:label-restriction/tet:label-end/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment ingress label restrictions step of connectivity-matrix */ /* Augment ingress label restrictions step of connectivity-matrix */
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-restriction/tet:label-step/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment egress label restrictions of connectivity-matrix */ /* Augment egress label restrictions of connectivity-matrix */
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/"
skipping to change at page 41, line 22 skipping to change at page 41, line 23
/* Augment egress label restrictions of connectivity-matrix */ /* Augment egress label restrictions of connectivity-matrix */
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-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment egress label restrictions start of connectivity-matrix */ /* Augment egress label restrictions start of connectivity-matrix */
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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment egress label restrictions end of connectivity-matrix */ /* Augment egress label restrictions end of connectivity-matrix */
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-restriction/tet:label-end/" + "tet:label-restrictions/tet:label-restriction/tet:label-end/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
skipping to change at page 41, line 51 skipping to change at page 42, line 4
/* Augment egress label restrictions end of connectivity-matrix */ /* Augment egress label restrictions end of connectivity-matrix */
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-restriction/tet:label-end/" + "tet:label-restrictions/tet:label-restriction/tet:label-end/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment egress label restrictions step of connectivity-matrix */ /* Augment egress label restrictions step of connectivity-matrix */
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-restriction/tet:label-step/" + "tet:label-restrictions/tet:label-restriction/tet:label-step/"
+ "tet:technology" { + "tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of connectivity-matrix */ /* Augment label hop of underlay primary path of
* connectivity-matrix */
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:connectivity-matrix/"
+ "tet:underlay/tet:primary-path/tet:path-element/" + "tet:underlay/tet:primary-path/tet:path-element/"
+ "tet:type/tet:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of connectivity-matrix */ /* Augment label hop of underlay backup path of
* connectivity-matrix */
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:connectivity-matrix/"
+ "tet:underlay/tet:backup-path/tet:path-element/" + "tet:underlay/tet:backup-path/tet:path-element/"
+ "tet:type/tet:label/tet:label-hop/" + "tet:type/tet:label/tet:label-hop/"
+ "tet:te-label/tet:technology" { + "tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of connectivity-matrix */ /* Augment label hop of route-exclude of connectivity-matrix */
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:metric/tet:optimization-metric/" + "tet:algorithm/tet:metric/tet:optimization-metric/"
+ "tet:explicit-route-exclude-objects/" + "tet:explicit-route-exclude-objects/"
+ "tet:route-object-exclude-object/tet:type/" + "tet:route-object-exclude-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-include of connectivity-matrix */ /* Augment label hop of route-include of connectivity-matrix */
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:metric/tet:optimization-metric/" + "tet:algorithm/tet:metric/tet:optimization-metric/"
+ "tet:explicit-route-include-objects/" + "tet:explicit-route-include-objects/"
+ "tet:route-object-include-object/tet:type/" + "tet:route-object-include-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of connectivity-matrix */ /* Augment label hop of path-route of connectivity-matrix */
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:connectivity-matrix/"
+ "tet:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
skipping to change at page 44, line 18 skipping to change at page 44, line 23
+ "tet:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label restrictions of connectivity-matrices information-source */ /* Augment label range information of
* connectivity-matrices information-source */
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:label-restrictions/tet:label-restriction" { + "tet:connectivity-matrices/tet:label-restrictions/"
+ "tet:label-restriction" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of connectivity-matrices information-source */ /* Augment label restrictions start of
* connectivity-matrices information-source */
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:label-restrictions/tet:label-restriction/" + "tet:connectivity-matrices/tet:label-restrictions/"
+ "tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../" when "../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of connectivity-matrices information-source */ /* Augment label restrictions end of
* connectivity-matrices information-source */
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:label-restrictions/tet:label-restriction/" + "tet:connectivity-matrices/tet:label-restrictions/"
+ "tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../../" when "../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of connectivity-matrices information-source */ /* Augment label restrictions step of
* connectivity-matrices information-source */
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:label-restrictions/tet:label-restriction/" + "tet:connectivity-matrices/tet:label-restrictions/"
+ "tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../" when "../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of connectivity-matrices information-source */ /* Augment label hop of underlay primary path of
* connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of connectivity-matrices information-source */ /* Augment label hop of underlay backup path of
* connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of connectivity-matrices information-source */ /* Augment label hop of route-exclude of
* connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-exclude-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-include of
/* Augment label hop of route-include of connectivity-matrices information-source */ * connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-include-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of connectivity-matrices information-source */ /* Augment label hop of path-route of
* connectivity-matrices information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment ingress label restrictions of connectivity-matrix information-source */ /* Augment ingress label restrictions of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:from/tet:label-restrictions/tet:label-restriction" { + "tet:from/tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment ingress label restrictions start of connectivity-matrix information-source */ /* Augment ingress label restrictions start of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:from/tet:label-restrictions/tet:label-restriction/" + "tet:from/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment ingress label restrictions end of connectivity-matrix information-source */ /* Augment ingress label restrictions end of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:from/tet:label-restrictions/tet:label-restriction/" + "tet:from/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment ingress label restrictions step of connectivity-matrix information-source */ /* Augment ingress label restrictions step of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:from/tet:label-restrictions/tet:label-restriction/" + "tet:from/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment egress label restrictions of connectivity-matrix information-source */ /* Augment egress label restrictions of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:to/tet:label-restrictions/tet:label-restriction" { + "tet:to/tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment egress label restrictions start of connectivity-matrix information-source */ /* Augment egress label restrictions start of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:to/tet:label-restrictions/tet:label-restriction/" + "tet:to/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment egress label restrictions end of connectivity-matrix information-source */ /* Augment egress label restrictions end of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:to/tet:label-restrictions/tet:label-restriction/" + "tet:to/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment egress label restrictions step of connectivity-matrix information-source */ /* Augment egress label restrictions step of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:to/tet:label-restrictions/tet:label-restriction/" + "tet:to/tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of connectivity-matrix information-source */ /* Augment label hop of underlay primary path of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of
/* Augment label hop of underlay backup path of connectivity-matrix information-source */ * connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of connectivity-matrix information-source */ /* Augment label hop of route-exclude of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-exclude-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-include of connectivity-matrix information-source */ /* Augment label hop of route-include of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-include-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of connectivity-matrix information-source */ /* Augment label hop of path-route of
* connectivity-matrix information-source */
augment "/nw:networks/nw:network/nw:node/tet:te/" augment "/nw:networks/nw:network/nw:node/tet:te/"
+ "tet:information-source-entry/tet:connectivity-matrices/" + "tet:information-source-entry/tet:connectivity-matrices/"
+ "tet:connectivity-matrix/" + "tet:connectivity-matrix/"
+ "tet:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label restrictions of local-link-connectivities */ /* Augment label restrictions of local-link-connectivities */
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:label-restrictions/tet:label-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of local-link-connectivities */ /* Augment label restrictions start of local-link-connectivities */
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:label-restrictions/tet:label-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of local-link-connectivities */ /* Augment label restrictions end of local-link-connectivities */
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:label-restrictions/tet:label-restriction/tet:label-end/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:te-label/tet:technology"{ + "tet:label-end/tet:te-label/tet:technology"{
when "../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of local-link-connectivities */ /* Augment label restrictions step of local-link-connectivities */
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:label-restrictions/tet:label-restriction/tet:label-step/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:technology"{ + "tet:label-step/tet:technology"{
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of local-link-connectivities */ /* Augment label hop of underlay primary path
* of local-link-connectivities */
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:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of local-link-connectivities */ /* Augment label hop of underlay backup path
* of local-link-connectivities */
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:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of local-link-connectivities */ /* Augment label hop of route-exclude of
* local-link-connectivities */
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:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-exclude-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-include of local-link-connectivities */ /* Augment label hop of route-include of
* local-link-connectivities */
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:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-include-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of local-link-connectivities */ /* Augment label hop of path-route of local-link-connectivities */
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:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label restrictions of local-link-connectivity (LLC) */ /* Augment label restrictions of local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:label-restrictions/tet:label-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of local-link-connectivity (LLC) */ /* Augment label start of local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of local-link-connectivity (LLC) */ /* Augment label end of local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../../../" when "../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of local-link-connectivity (LLC) */ /* Augment label step of local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../../../" when "../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-label-step; uses layer1-types:otn-label-step;
} }
} }
/* Augment label hop of underlay primary path of local-link-connectivity (LLC) */ /* Augment label hop of underlay primary path
* of local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of local-link-connectivity (LLC) */ /* Augment label hop of underlay backup path of
* local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-exclude of local-link-connectivity (LLC) */ /* Augment label hop of route-exclude of
* local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-exclude-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of route-include of local-link-connectivity (LLC) */ /* Augment label hop of route-include of
* local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimizations/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:route-object-include-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../../" when "../../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of path-route of
/* Augment label hop of path-route of local-link-connectivity (LLC) */ * local-link-connectivity (LLC) */
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:local-link-connectivity/"
+ "tet:path-properties/tet:path-route-objects/" + "tet:path-properties/tet:path-route-objects/"
+ "tet:path-route-object/tet:type/" + "tet:path-route-object/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay primary path of TE link */ /* Augment label hop of underlay primary path of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../" when "../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of TE link */ /* Augment label hop of underlay backup path of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
when "../../../../../../../../" when "../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label restrictions of TE link */ /* Augment label restrictions of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../nw:network-types/tet:te-topology/" when "../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of TE link */ /* Augment label restrictions start of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of TE link */ /* Augment label restrictions end of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
skipping to change at page 60, line 4 skipping to change at page 60, line 42
} }
} }
/* Augment label restrictions end of TE link */ /* Augment label restrictions end of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of TE link */ /* Augment label restrictions step of TE link */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:te-link-attributes/" + "tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
skipping to change at page 60, line 37 skipping to change at page 61, line 26
/* Augment label restrictions of TE link information-source */ /* Augment label restrictions of TE link information-source */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:label-restrictions/tet:label-restriction" { + "tet:label-restrictions/tet:label-restriction" {
when "../../../../../nw:network-types/tet:te-topology/" when "../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of TE link information-source */ /* Augment label restrictions start of TE link information-source */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of TE link information-source */ /* Augment label restrictions end of TE link information-source */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
skipping to change at page 61, line 17 skipping to change at page 62, line 6
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of TE link information-source */ /* Augment label restrictions step of TE link information-source */
augment "/nw:networks/nw:network/nt:link/tet:te/" augment "/nw:networks/nw:network/nt:link/tet:te/"
+ "tet:information-source-entry/" + "tet:information-source-entry/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
skipping to change at page 61, line 50 skipping to change at page 62, line 39
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
/* /*
when "../../../../../../../../../../" when "../../../../../../../../../../"
+ "nw:network-types/tet:te-topology/" + "nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
*/ */
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label hop of underlay backup path of TE link template */ /* Augment label hop of underlay backup path of TE link template */
augment "/nw:networks/tet:te/tet:templates/" augment "/nw:networks/tet:te/tet:templates/"
+ "tet:link-template/tet:te-link-attributes/" + "tet:link-template/tet:te-link-attributes/"
+ "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/"
+ "tet:label/tet:label-hop/tet:te-label/tet:technology" { + "tet:label/tet:label-hop/tet:te-label/tet:technology" {
/* /*
when "../../../../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../../../../nw:network-types/"
+ "otntopo:otn-topology" { + "tet:te-topology/otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
*/ */
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-path-label; uses layer1-types:otn-label-hop;
} }
} }
/* Augment label restrictions of TE link template */ /* Augment label restrictions of TE link template */
augment "/nw:networks/tet:te/tet:templates/" augment "/nw:networks/tet:te/tet:templates/"
+ "tet:link-template/tet:te-link-attributes/" + "tet:link-template/tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction" { + "tet:label-restrictions/tet:label-restriction" {
/* /*
when "../../../../../nw:network-types/tet:te-topology/" when "../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
*/ */
description "OTN label."; description "OTN label.";
uses layer1-types:otn-label-restriction; uses layer1-types:otn-label-range-info;
} }
/* Augment label restrictions start of TE link template */ /* Augment label restrictions start of TE link template */
augment "/nw:networks/tet:te/tet:templates/" augment "/nw:networks/tet:te/tet:templates/"
+ "tet:link-template/tet:te-link-attributes/" + "tet:link-template/tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-start/tet:te-label/tet:technology" { + "tet:label-start/tet:te-label/tet:technology" {
/* /*
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
*/ */
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions end of TE link template */ /* Augment label restrictions end of TE link template */
augment "/nw:networks/tet:te/tet:templates/" augment "/nw:networks/tet:te/tet:templates/"
+ "tet:link-template/tet:te-link-attributes/" + "tet:link-template/tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-end/tet:te-label/tet:technology" { + "tet:label-end/tet:te-label/tet:technology" {
/* /*
when "../../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../../nw:network-types/tet:te-topology/"
+ "otntopo:otn-topology" { + "otntopo:otn-topology" {
description "Augment OTN TE label"; description "Augment OTN TE label";
} }
*/ */
description "OTN label."; description "OTN label.";
case otn { case otn {
uses layer1-types:otn-link-label; uses layer1-types:otn-label-start-end;
} }
} }
/* Augment label restrictions step of TE link template */ /* Augment label restrictions step of TE link template */
augment "/nw:networks/tet:te/tet:templates/" augment "/nw:networks/tet:te/tet:templates/"
+ "tet:link-template/tet:te-link-attributes/" + "tet:link-template/tet:te-link-attributes/"
+ "tet:label-restrictions/tet:label-restriction/" + "tet:label-restrictions/tet:label-restriction/"
+ "tet:label-step/tet:technology" { + "tet:label-step/tet:technology" {
/* /*
when "../../../../../../nw:network-types/tet:te-topology/" when "../../../../../../nw:network-types/tet:te-topology/"
skipping to change at page 65, line 7 skipping to change at page 65, line 43
Editors note: Currently there is no such data nodes, temporarily kept Editors note: Currently there is no such data nodes, temporarily kept
for review. for review.
7. Acknowledgements 7. Acknowledgements
We would like to thank Igor Bryskin, Zhe Liu, Zheyu Fan and Daniele We would like to thank Igor Bryskin, Zhe Liu, Zheyu Fan and Daniele
Ceccarelli for their comments and discussions. Ceccarelli for their comments and discussions.
8. Contributors 8. Contributors
Aihua Guo
Individual
Email: aihuaguo.ietf@gmail.com
Anurag Sharma
Google
Email: ansha@google.com
Yunbin Xu
CAICT
Email: xuyunbin@caict.ac.cn
Lei Wang
China Mobile
Email: wangleiyj@chinamobile.com
Baoquan Rao Baoquan Rao
Huawei Technologies Huawei Technologies
Email: raobaoquan@huawei.com Email: raobaoquan@huawei.com
Xian Zhang Xian Zhang
Huawei Technologies Huawei Technologies
Email: zhang.xian@huawei.com Email: zhang.xian@huawei.com
Huub van Helvoort Huub van Helvoort
Hai Gaoming BV Hai Gaoming BV
skipping to change at page 65, line 34 skipping to change at page 66, line 37
Yunbo Li Yunbo Li
China Mobile China Mobile
Email: liyunbo@chinamobile.com Email: liyunbo@chinamobile.com
Dieter Beller Dieter Beller
Nokia Nokia
Email: dieter.beller@nokia.com Email: dieter.beller@nokia.com
Yanlei Zheng Yanlei Zheng
China Unicom China Unicom
Email: zhengyl@dimpt.com Email: zhengyanlei@chinaunicom.cn
9. References 9. References
9.1. Normative References 9.1. Normative References
[I-D.ietf-ccamp-otn-tunnel-model] [I-D.ietf-ccamp-otn-tunnel-model]
Zheng, H., Guo, A., Busi, I., Sharma, A., Rao, R., Zheng, H., Busi, I., Belotti, S., Lopezalvarez, V., and Y.
Belotti, S., Lopezalvarez, V., Li, Y., and Y. Xu, "OTN Xu, "OTN Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-
Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-model-07 model-08 (work in progress), October 2019.
(work in progress), July 2019.
[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)
Topologies", draft-ietf-teas-yang-te-topo-22 (work in Topologies", draft-ietf-teas-yang-te-topo-22 (work in
progress), June 2019. progress), June 2019.
[ITU-T] ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA, [ITU-T] ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA,
DIGITAL SYSTEMS AND NETWORKS; Digital networks; Interfaces DIGITAL SYSTEMS AND NETWORKS; Digital networks; Interfaces
for the optical transport network", ITU-T Rec. G.709v5 , for the optical transport network", ITU-T Rec. G.709v5 ,
skipping to change at page 67, line 25 skipping to change at page 68, line 30
[I-D.ietf-ccamp-flexigrid-yang] [I-D.ietf-ccamp-flexigrid-yang]
Madrid, U., Perdices, D., Lopezalvarez, V., King, D., and Madrid, U., Perdices, D., Lopezalvarez, V., King, D., and
Y. Lee, "YANG data model for Flexi-Grid Optical Networks", Y. Lee, "YANG data model for Flexi-Grid Optical Networks",
draft-ietf-ccamp-flexigrid-yang-04 (work in progress), draft-ietf-ccamp-flexigrid-yang-04 (work in progress),
July 2019. July 2019.
[I-D.ietf-ccamp-transport-nbi-app-statement] [I-D.ietf-ccamp-transport-nbi-app-statement]
Busi, I., King, D., Zheng, H., and Y. Xu, "Transport Busi, I., King, D., Zheng, H., and Y. Xu, "Transport
Northbound Interface Applicability Statement", draft-ietf- Northbound Interface Applicability Statement", draft-ietf-
ccamp-transport-nbi-app-statement-06 (work in progress), ccamp-transport-nbi-app-statement-08 (work in progress),
September 2019. November 2019.
[I-D.ietf-ccamp-wson-yang] [I-D.ietf-ccamp-wson-yang]
Lee, Y., Dhody, D., Guo, A., Lopezalvarez, V., and D. Lee, Y., Dhody, D., Guo, A., Lopezalvarez, V., and D.
King, "A YANG Data Model for WSON (Wavelength Switched King, "A YANG Data Model for WSON (Wavelength Switched
Optical Networks)", draft-ietf-ccamp-wson-yang-22 (work in Optical Networks)", draft-ietf-ccamp-wson-yang-22 (work in
progress), July 2019. progress), July 2019.
[I-D.ietf-teas-actn-yang] [I-D.ietf-teas-actn-yang]
Lee, Y., Zheng, H., Ceccarelli, D., Yoon, B., Dios, O., Lee, Y., Zheng, H., Ceccarelli, D., Yoon, B., Dios, O.,
Shin, J., and S. Belotti, "Applicability of YANG models Shin, J., and S. Belotti, "Applicability of YANG models
skipping to change at page 68, line 20 skipping to change at page 69, line 24
Authors' Addresses Authors' Addresses
Haomian Zheng Haomian Zheng
Huawei Technologies Huawei Technologies
H1-1-A043S Huawei Industrial Base, Songshanhu H1-1-A043S Huawei Industrial Base, Songshanhu
Dongguan, Guangdong 523808 Dongguan, Guangdong 523808
China China
Email: zhenghaomian@huawei.com Email: zhenghaomian@huawei.com
Aihua Guo
Individual
Email: aihuaguo.ietf@gmail.com
Italo Busi Italo Busi
Huawei Technologies Huawei Technologies
HUAWEI TECHNOLOGIES ITALIA Srl Centro Direzionale Milano 2 HUAWEI TECHNOLOGIES ITALIA Srl Centro Direzionale Milano 2
Milan, Milan 20090 Milan, Milan 20090
Italy Italy
Email: Italo.Busi@huawei.com Email: Italo.Busi@huawei.com
Anurag Sharma
Google
1600 Amphitheatre Parkway
Mountain View, CA 94043
Email: ansha@google.com
Xufeng Liu Xufeng Liu
Volta Networks Volta Networks
Email: xufeng.liu.ietf@gmail.com Email: xufeng.liu.ietf@gmail.com
Sergio Belotti Sergio Belotti
Nokia Nokia
Email: sergio.belotti@nokia.com Email: sergio.belotti@nokia.com
Yunbin Xu
CAICT
Email: xuyunbin@ritt.cn
Lei Wang
China Mobile
Email: wangleiyj@chinamobile.com
Oscar Gonzalez de Dios Oscar Gonzalez de Dios
Telefonica Telefonica
Email: oscar.gonzalezdedios@telefonica.com Email: oscar.gonzalezdedios@telefonica.com
 End of changes. 209 change blocks. 
286 lines changed or deleted 311 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/