draft-ietf-ccamp-otn-topo-yang-03.txt   draft-ietf-ccamp-otn-topo-yang-04.txt 
CCAMP Working Group H. Zheng CCAMP Working Group H. Zheng
Internet-Draft A. Guo Internet-Draft A. Guo
Intended status: Standards Track I. Busi Intended status: Standards Track I. Busi
Expires: December 17, 2018 Huawei Technologies Expires: February 1, 2019 Huawei Technologies
A. Sharma A. Sharma
Google Google
X. Liu X. Liu
Jabil Volta Networks
S. Belotti S. Belotti
Nokia Nokia
Y. Xu Y. Xu
CAICT CAICT
L. Wang L. Wang
China Mobile China Mobile
O. Gonzalez de Dios O. Gonzalez de Dios
Telefonica Telefonica
June 15, 2018 July 31, 2018
A YANG Data Model for Optical Transport Network Topology A YANG Data Model for Optical Transport Network Topology
draft-ietf-ccamp-otn-topo-yang-03 draft-ietf-ccamp-otn-topo-yang-04
Abstract Abstract
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 from equipments utilizing any of transport network can be constructed from equipments utilizing any of
a number of different transport technologies such as the evolving a number of different transport technologies such as the evolving
Optical Transport Networks (OTN) or packet transport as provided by Optical Transport Networks (OTN) or packet transport as provided by
the MPLS-Transport Profile (MPLS-TP). the MPLS-Transport Profile (MPLS-TP).
skipping to change at page 2, line 12 skipping to change at page 2, line 12
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 December 17, 2018. This Internet-Draft will expire on February 1, 2019.
Copyright Notice Copyright Notice
Copyright (c) 2018 IETF Trust and the persons identified as the Copyright (c) 2018 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 36 skipping to change at page 2, line 36
the Trust Legal Provisions and are provided without warranty as the Trust Legal Provisions and are provided without warranty as
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 . . . . . . . . . . . . . . . . . . . . . . . . 20 4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 21
5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 54 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 54
6. Manageability Considerations . . . . . . . . . . . . . . . . 54 6. Security Considerations . . . . . . . . . . . . . . . . . . . 54
7. Security Considerations . . . . . . . . . . . . . . . . . . . 54 7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 55
8. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 55 8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 55
9. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 55 9. References . . . . . . . . . . . . . . . . . . . . . . . . . 56
10. References . . . . . . . . . . . . . . . . . . . . . . . . . 55 9.1. Normative References . . . . . . . . . . . . . . . . . . 56
10.1. Normative References . . . . . . . . . . . . . . . . . . 55 9.2. Informative References . . . . . . . . . . . . . . . . . 57
10.2. Informative References . . . . . . . . . . . . . . . . . 56 Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 58
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 57
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 as provided by the MPLS- Transport Networks (OTN) or packet transport as provided by the MPLS-
Transport Profile (MPLS-TP). Transport Profile (MPLS-TP).
skipping to change at page 4, line 17 skipping to change at page 4, line 14
o Symbols after data node names: "?" means an optional node, "!" o Symbols after data node names: "?" means an optional node, "!"
means a presence container, and "*" denotes a list and leaf-list. means a presence container, and "*" denotes a list and leaf-list.
o Parentheses enclose choice and case nodes, and case nodes are also o Parentheses enclose choice and case nodes, and case nodes are also
marked with a colon (":"). marked with a colon (":").
o Ellipsis ("...") stands for contents of subtrees that are not o Ellipsis ("...") stands for contents of subtrees that are not
shown. shown.
o Some of the key terms used in this document are listed as follow.
o TS: Tributary Slot.
o TSG: Tributary Slot Granularity.
o TPN: Tributary Port Number.
3. YANG Data Model for OTN Topology 3. YANG Data Model for OTN Topology
3.1. OTN Topology Data Model Overview 3.1. OTN Topology Data Model Overview
As can be seen, from the data tree shown in Section 3.1, the YANG This document aims to describe the data model for OTN topology. As a
module presented in this document augments from a more generic classic Traffic-engineering (TE) technology, OTN provide TDM
Traffic Engineered (TE) network topology data model, i.e., the ietf- switching in transport network. Therefore the YANG module presented
te-topology.yang as specified in [I-D.ietf-teas-yang-te-topo]. In in this document augments from a more generic Traffic Engineered (TE)
section 6 of [I-D.ietf-teas-yang-te-topo], the guideline for network topology data model, i.e., the ietf-te-topology.yang, as
augmenting TE topology model was provided, and in this draft we specified in [I-D.ietf-teas-yang-te-topo]. In section 6 of
respetively augment the OTN attributes, TE bandwidth and TE label. [I-D.ietf-teas-yang-te-topo], the guideline for augmenting TE
topology model was provided, and in this draft we respetively augment
the OTN attributes, TE bandwidth and TE label.
The entities and TE attributes, such as node, termination points and The entities and TE attributes, such as node, termination points and
links, are still applicable for describing an OTN topology and the links, are still applicable for describing an OTN topology and the
model presented in this document only specifies with technology- model presented in this document only specifies with technology-
specific attributes/information. In OTN attributes augmentation, specific attributes/information. In OTN attributes augmentation,
mainly OTN-specific parameters are included such as Tributary Slot mainly OTN-specific parameters are included such as Tributary Slot
Granularity (TSG), payload type and so on. Granularity (TSG), payload type and so on.
For different order of ODU in OTN technology, the te-bandwidth is For different order of ODU in OTN technology, the te-bandwidth is
augmented to allow specifying the type of ODU container and the augmented to allow specifying the type of ODU container and the
skipping to change at page 5, line 9 skipping to change at page 5, line 14
The types of OTN label can be divided into the tributary ports and The types of OTN label can be divided into the tributary ports and
the tributary slots, represented by TPN or TS list respectively. In the tributary slots, represented by TPN or TS list respectively. In
the TE-label augmentation, two optional label formats are available the TE-label augmentation, two optional label formats are available
for label representation. for label representation.
Note the model in this document re-uses some attributes defined in Note the model in this document re-uses some attributes defined in
ietf-otn-types.yang, which is specified in ietf-otn-types.yang, which is specified in
[I-D.ietf-ccamp-otn-tunnel-model]. [I-D.ietf-ccamp-otn-tunnel-model].
The YANG module ietf-otn-topology defined in this document conforms
to the Network Management Datastore Architecture (NMDA) defined in
[RFC8342].
3.2. YANG Tree for OTN topology 3.2. YANG Tree for OTN topology
The following OTN specific attributes have been augmented to TE The following OTN specific attributes have been augmented to TE
topology models. topology models.
module: ietf-otn-topology module: ietf-otn-topology
augment /nw:networks/nw:network/nw:network-types/tet:te-topology: augment /nw:networks/nw:network/nw:network-types/tet:te-topology:
+--rw otn-topology! +--rw otn-topology!
augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes: augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes:
+--rw tsg? identityref +--rw tsg? identityref
+--rw distance? uint32 +--rw distance? uint32
augment /nw:networks/nw:network/nw:node/nt:termination-point/tet:te: augment /nw:networks/nw:network/nw:node/nt:termination-point/tet:te:
+--rw supported-payload-types* [index] +--rw supported-payload-types* [index]
| +--rw index uint16 | +--rw index uint16
| +--rw payload-type? string | +--rw payload-type? string
+--rw client-facing? boolean +--rw client-facing? boolean
The technology specific TE bandwidth for OTN topology can be specified The technology specific TE bandwidth for OTN topology can be specified
using the following augment statements: using the following augment statements:
augment /nw:networks/nw:network/nw:node/nt:termination-point/tet:te augment /nw:networks/nw:network/nw:node/nt:termination-point/tet:te
/tet:interface-switching-capability/tet:max-lsp-bandwidth /tet:interface-switching-capability/tet:max-lsp-bandwidth
/tet:te-bandwidth/tet:technology: /tet:te-bandwidth/tet:technology:
+--:(otn) +--:(otn)
+--rw odu-type? identityref +--rw odu-type? identityref
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:path-constraints /tet:connectivity-matrices/tet:path-constraints
/tet:te-bandwidth/tet:technology: /tet:te-bandwidth/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/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
skipping to change at page 7, line 27 skipping to change at page 7, line 37
+--:(otn) +--:(otn)
+--ro odu-type? identityref +--ro odu-type? identityref
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry/tet:max-link-bandwidth /tet:information-source-entry/tet:max-link-bandwidth
/tet:te-bandwidth/tet:technology: /tet:te-bandwidth/tet:technology:
+--:(otn) +--:(otn)
+--ro odulist* [odu-type] +--ro odulist* [odu-type]
+--ro odu-type identityref +--ro odu-type identityref
+--ro number? uint16 +--ro number? uint16
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry/tet:max-resv-link-bandwidth /tet:information-source-entry
/tet:te-bandwidth/tet:technology: /tet:max-resv-link-bandwidth/tet:te-bandwidth/tet:technology:
+--:(otn) +--:(otn)
+--ro odulist* [odu-type] +--ro odulist* [odu-type]
+--ro odu-type identityref +--ro odu-type identityref
+--ro number? uint16 +--ro number? uint16
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry/tet:unreserved-bandwidth /tet:information-source-entry/tet:unreserved-bandwidth
/tet:te-bandwidth/tet:technology: /tet:te-bandwidth/tet:technology:
+--:(otn) +--:(otn)
+--ro odulist* [odu-type] +--ro odulist* [odu-type]
+--ro odu-type identityref +--ro odu-type identityref
skipping to change at page 8, line 19 skipping to change at page 8, line 28
+--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/tet:te/tet:templates/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:unreserved-bandwidth /tet:te-link-attributes/tet:unreserved-bandwidth
/tet:te-bandwidth/tet:technology: /tet:te-bandwidth/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
The technology specific TE label for this OTN topology can be specified
using the following augment statements:
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-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 priority? uint8
The technology specific TE label for this OTN topology can be specified
using the following augment statements:
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:label-restriction /tet:connectivity-matrices/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:label-restriction /tet:connectivity-matrices/tet:label-restrictions
/tet:label-end/tet:te-label/tet:technology: /tet:label-restriction/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/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:underlay/tet:primary-path /tet:connectivity-matrices/tet:underlay/tet:primary-path
/tet:path-element/tet:type/tet:label/tet:label-hop /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:te-label/tet:technology: /tet:te-label/tet:technology:
skipping to change at page 9, line 43 skipping to change at page 10, line 4
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:path-properties /tet:connectivity-matrices/tet:path-properties
/tet:path-route-objects/tet:path-route-object/tet:type /tet:path-route-objects/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:
+--:(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/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrices/tet:connectivity-matrix/tet:from
/tet:from/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 priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix/tet:from /tet:connectivity-matrices/tet:connectivity-matrix/tet:from
/tet:label-restriction/tet:label-start/tet:te-label/tet:technology: /tet:label-restrictions/tet:label-restriction/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
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix/tet:from /tet:connectivity-matrices/tet:connectivity-matrix/tet:from
/tet:label-restriction/tet:label-end/tet:te-label/tet:technology: /tet:label-restrictions/tet:label-restriction/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/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix/tet:to /tet:connectivity-matrices/tet:connectivity-matrix/tet:to
/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 priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix/tet:to /tet:connectivity-matrices/tet:connectivity-matrix/tet:to
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-restrictions/tet:label-restriction/tet:label-start
/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
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix/tet:to /tet:connectivity-matrices/tet:connectivity-matrix/tet:to
/tet:label-restriction/tet:label-end/tet:te-label /tet:label-restrictions/tet:label-restriction/tet:label-end
/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
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrices/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:
skipping to change at page 11, line 42 skipping to change at page 12, line 4
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
/tet:connectivity-matrices/tet:connectivity-matrix /tet:connectivity-matrices/tet:connectivity-matrix
/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:
+--:(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:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/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 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:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-restrictions/tet:label-restriction
/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
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:label-restriction/tet:label-end/tet:te-label /tet:label-restrictions/tet:label-restriction
/tet:technology: /tet:label-end/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
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:label/tet:label-hop/tet:te-label/tet:technology: /tet:type/tet:label/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: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:
+--:(otn) +--:(otn)
+--ro tpn? uint16 +--ro tpn? uint16
skipping to change at page 13, line 18 skipping to change at page 13, line 30
/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: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:
+--:(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:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from/tet:label-restriction: /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry/tet:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrix/tet:from/tet:label-restriction /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
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:from/tet:label-restriction /tet:connectivity-matrix/tet:from/tet:label-restrictions
/tet:label-end/tet:te-label/tet:technology: /tet:label-restriction/tet:label-end/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
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:to/tet:label-restriction: /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--ro priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:information-source-entry/tet:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrix/tet:to/tet:label-restriction /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
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:to/tet:label-restriction /tet:connectivity-matrix/tet:to/tet:label-restrictions
/tet:label-end/tet:te-label/tet:technology: /tet:label-restriction/tet:label-end/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
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:underlay/tet:primary-path /tet:connectivity-matrix/tet:underlay/tet:primary-path
/tet:path-element/tet:type/tet:label/tet:label-hop /tet:path-element/tet:type/tet:label/tet:label-hop
skipping to change at page 15, line 23 skipping to change at page 15, line 40
/tet:information-source-entry/tet:connectivity-matrices /tet:information-source-entry/tet:connectivity-matrices
/tet:connectivity-matrix/tet:path-properties /tet:connectivity-matrix/tet:path-properties
/tet:path-route-objects/tet:path-route-object/tet:type /tet:path-route-objects/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:
+--:(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:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/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 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:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-restrictions/tet:label-restriction
/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
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point/tet:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:label-restriction/tet:label-end/tet:te-label /tet:label-restrictions/tet:label-restriction/tet:label-end
/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
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point/tet:local-link-connectivities /tet:tunnel-termination-point/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:
skipping to change at page 16, line 46 skipping to change at page 17, line 16
/tet:tunnel-termination-point/tet:local-link-connectivities /tet:tunnel-termination-point/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: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:
+--:(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:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:local-link-connectivity/tet:label-restriction: /tet:local-link-connectivity/tet:label-restrictions
/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw priority? uint8
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point/tet:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:local-link-connectivity/tet:label-restriction /tet:local-link-connectivity/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
augment /nw:networks/nw:network/nw:node/tet:te augment /nw:networks/nw:network/nw:node/tet:te
/tet:tunnel-termination-point/tet:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:local-link-connectivity/tet:label-restriction /tet:local-link-connectivity/tet:label-restrictions
/tet:label-end/tet:te-label/tet:technology: /tet:label-restriction/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:local-link-connectivities /tet:tunnel-termination-point/tet:local-link-connectivities
/tet:local-link-connectivity/tet:underlay/tet:primary-path /tet:local-link-connectivity/tet:underlay/tet:primary-path
/tet:path-element/tet:type/tet:label/tet:label-hop /tet:path-element/tet:type/tet:label/tet:label-hop
skipping to change at page 18, line 38 skipping to change at page 19, line 10
+--rw tsg? identityref +--rw tsg? identityref
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes augment /nw:networks/nw:network/nt:link/tet:te/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:
+--:(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/tet:te-link-attributes augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
/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 priority? uint8
augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
/tet:label-restriction/tet:label-start/tet:te-label /tet:label-restrictions/tet:label-restriction
/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
augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
/tet:label-restriction/tet:label-end/tet:te-label/tet:technology: /tet:label-restrictions/tet:label-restriction/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/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry/tet:label-restriction: /tet:information-source-entry/tet:label-restrictions
/tet:label-restriction:
+--ro range-type? identityref +--ro range-type? identityref
+--ro tsg? identityref +--ro tsg? identityref
+--ro priority? uint8 +--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:label-restriction /tet:information-source-entry/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
augment /nw:networks/nw:network/nt:link/tet:te augment /nw:networks/nw:network/nt:link/tet:te
/tet:information-source-entry/tet:label-restriction /tet:information-source-entry/tet:label-restrictions
/tet:label-end/tet:te-label/tet:technology: /tet:label-restriction/tet:label-end/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
augment /nw:networks/tet:te/tet:templates/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:underlay/tet:primary-path /tet:te-link-attributes/tet:underlay/tet:primary-path
/tet:path-element/tet:type/tet:label/tet:label-hop /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:te-label/tet:technology: /tet:te-label/tet:technology:
skipping to change at page 19, line 51 skipping to change at page 20, line 28
+--rw ts-list? string +--rw ts-list? string
augment /nw:networks/tet:te/tet:templates/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:underlay/tet:backup-path /tet:te-link-attributes/tet:underlay/tet:backup-path
/tet:path-element/tet:type/tet:label/tet:label-hop /tet:path-element/tet:type/tet:label/tet:label-hop
/tet:te-label/tet:technology: /tet:te-label/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/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:label-restriction: /tet:te-link-attributes/tet:label-restrictions
/tet:label-restriction:
+--rw range-type? identityref +--rw range-type? identityref
+--rw tsg? identityref +--rw tsg? identityref
+--rw priority? uint8 +--rw priority? uint8
augment /nw:networks/tet:te/tet:templates/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:label-restriction /tet:te-link-attributes/tet:label-restrictions
/tet:label-start/tet:te-label/tet:technology: /tet:label-restriction/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
augment /nw:networks/tet:te/tet:templates/tet:link-template augment /nw:networks/tet:te/tet:templates/tet:link-template
/tet:te-link-attributes/tet:label-restriction/tet:label-end /tet:te-link-attributes/tet:label-restrictions
/tet:te-label/tet:technology: /tet:label-restriction/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
4. The YANG Code 4. The YANG Code
<CODE BEGINS> file "ietf-otn-topology.yang" <CODE BEGINS> file "ietf-otn-topology.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";
} }
import ietf-network-topology { import ietf-network-topology {
skipping to change at page 21, line 27 skipping to change at page 21, line 50
Editor: Aihua Guo Editor: Aihua Guo
<mailto:aihuaguo@huawei.com> <mailto:aihuaguo@huawei.com>
Editor: Italo Busi Editor: Italo Busi
<mailto:italo.busi@huawei.com> <mailto:italo.busi@huawei.com>
Editor: Anurag Sharma Editor: Anurag Sharma
<mailto:ansha@google.com> <mailto:ansha@google.com>
Editor: Xufeng Liu Editor: Xufeng Liu
<mailto:Xufeng_Liu@jabil.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 Editor: Yunbin Xu
<mailto:xuyunbin@ritt.cn> <mailto:xuyunbin@ritt.cn>
Editor: Lei Wang Editor: Lei Wang
<mailto:wangleiyj@chinamobile.com> <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.";
revision 2018-06-07 { revision 2018-07-31 {
description description
"Revision 0.6"; "Revision 0.7";
reference reference
"draft-ietf-ccamp-otn-topo-yang-03"; "draft-ietf-ccamp-otn-topo-yang-04";
} }
/* /*
* Groupings * Groupings
*/ */
grouping otn-link-attributes { grouping otn-link-attributes {
description "link attributes for OTN"; description "link attributes for OTN";
leaf tsg { leaf tsg {
skipping to change at page 24, line 38 skipping to change at page 25, line 15
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 otn-types:otn-link-bandwidth; uses otn-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of /* Augment bandwidth path constraints 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: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 otn-types:otn-link-bandwidth; uses otn-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 25, line 50 skipping to change at page 26, line 25
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 otn-types:otn-link-bandwidth; uses otn-types:otn-link-bandwidth;
} }
} }
/* Augment bandwidth path constraints of /* Augment bandwidth path constraints 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: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 28, line 15 skipping to change at page 28, line 35
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 otn-types:otn-link-bandwidth; uses otn-types:otn-link-bandwidth;
} }
} }
/* Augment maximum reservable bandwidth /* Augment maximum reservable bandwidth of TE link information-source */
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 30, line 25 skipping to change at page 30, line 45
} }
} }
/* /*
* Augment TE label. * Augment TE label.
*/ */
/* 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-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.";
uses otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/tet:label-start/"
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment label hop of underlay primary path /* Augment label hop of underlay primary path of connectivity-matrices */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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";
} }
skipping to change at page 32, line 23 skipping to change at page 32, line 41
+ "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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-include of /* Augment label hop of route-include of connectivity-matrices (added) */
connectivity-matrices (added) */
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/"
skipping to change at page 33, line 17 skipping to change at page 33, line 34
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/tet:label-start/"
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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/"
skipping to change at page 33, line 47 skipping to change at page 34, line 17
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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/"
skipping to change at page 34, line 17 skipping to change at page 34, line 34
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/tet:label-start/"
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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/"
skipping to change at page 34, line 47 skipping to change at page 35, line 16
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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/"
skipping to change at page 37, line 4 skipping to change at page 37, line 22
+ "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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label restrictions of /* Augment label restrictions 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:information-source-entry/"
+ "tet:connectivity-matrices/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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* Augment label restrictions start of /* Augment label restrictions start 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:information-source-entry/"
+ "tet:connectivity-matrices/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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
skipping to change at page 38, line 4 skipping to change at page 38, line 18
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment label hop of underlay primary path of /* Augment label hop of underlay primary path 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: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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of underlay backup path of /* Augment label hop of underlay backup path 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: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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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" {
skipping to change at page 39, line 4 skipping to change at page 39, line 15
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-include /* Augment label hop of route-include of connectivity-matrices information-source */
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-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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of path-route of /* Augment label hop of path-route 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: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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment ingress label restrictions /* Augment ingress label restrictions of connectivity-matrix information-source */
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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* Augment ingress label restrictions start /* Augment ingress label restrictions start of connectivity-matrix information-source */
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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment ingress label restrictions end /* Augment ingress label restrictions end of connectivity-matrix information-source */
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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* Augment egress label restrictions start /* Augment egress label restrictions start of connectivity-matrix information-source */
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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment egress label restrictions end /* Augment egress label restrictions end of connectivity-matrix information-source */
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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
skipping to change at page 42, line 4 skipping to change at page 42, line 7
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment label hop of underlay primary path /* Augment label hop of underlay primary path of connectivity-matrix information-source */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of underlay backup path /* Augment label hop of underlay backup path of connectivity-matrix information-source */
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: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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-exclude /* Augment label hop of route-exclude of connectivity-matrix information-source */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-include /* Augment label hop of route-include of connectivity-matrix information-source */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of path-route of /* Augment label hop of path-route 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: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";
skipping to change at page 44, line 4 skipping to change at page 43, line 51
+ "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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-restriction/tet:label-start/" + "tet:label-restrictions/tet:label-restriction/tet:label-start/"
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of underlay backup path /* Augment label hop of underlay backup path of local-link-connectivities */
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";
} }
skipping to change at page 47, line 7 skipping to change at page 46, line 51
case otn { case otn {
uses otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* Augment label restrictions start of local-link-connectivity (LLC) */ /* Augment label restrictions 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* Augment label restrictions end of local-link-connectivity (LLC) */ /* Augment label restrictions 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of underlay backup path /* Augment label hop of underlay backup path of local-link-connectivity (LLC) */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-exclude /* Augment label hop of route-exclude of local-link-connectivity (LLC) */
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* Augment label hop of route-include /* Augment label hop of route-include of local-link-connectivity (LLC) */
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 "../../../../../../../../../../../../../../../../"
skipping to change at page 50, line 44 skipping to change at page 50, line 35
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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/"
skipping to change at page 51, line 22 skipping to change at page 51, line 15
} }
description "OTN label."; description "OTN label.";
case otn { case otn {
uses otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
skipping to change at page 52, line 12 skipping to change at page 52, line 4
+ "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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
skipping to change at page 53, line 13 skipping to change at page 53, line 4
/* /*
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 otn-types:otn-path-label; uses otn-types:otn-path-label;
} }
} }
/* 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-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 otn-types:otn-label-restriction; uses otn-types:otn-label-restriction;
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
/* 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-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 otn-types:otn-link-label; uses otn-types:otn-link-label;
skipping to change at page 54, line 13 skipping to change at page 54, line 4
/* /*
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 otn-types:otn-link-label; uses otn-types:otn-link-label;
} }
} }
} }
<CODE ENDS> <CODE ENDS>
5. IANA Considerations 5. IANA Considerations
TBD. It is proposed that IANA should assign new URIs from the "IETF XML
Registry" [RFC3688] as follows: URI:
6. Manageability Considerations urn:ietf:params:xml:ns:yang:ietf-otn-topology Registrant Contact: The
IESG XML: N/A; the requested URI is an XML namespace. This document
TBD. registers a YANG module in the YANG Module Names registry [RFC7950].
name: ietf-otn-topology namespace: urn:ietf:params:xml:ns:yang:ietf-
otn-topology prefix: otntopo reference: RFC XXXX
7. Security Considerations 6. Security Considerations
The data following the model defined in this document is exchanged The YANG module specified in this document defines a schema for data
via, for example, the interface between an orchestrator and a that is designed to be accessed via network management protocols such
transport network controller. The security concerns mentioned in as NETCONF [RFC6241] or RESTCONF [RFC8040]. The lowest NETCONF layer
[I-D.ietf-teas-yang-te-topo] for using ietf-te-topology.yang model is the secure transport layer, and the mandatory-to-implement secure
also applies to this document. transport is Secure Shell (SSH) [RFC6242]. The lowest RESTCONF layer
is HTTPS, and the mandatory-to-implement secure transport is TLS
[RFC5246].
The YANG module defined in this document can be accessed via the The NETCONF access control model [RFC6536] provides the means to
RESTCONF protocol defined in [RFC8040], or maybe via the NETCONF restrict access for particular NETCONF or RESTCONF users to a
protocol [RFC6241]. preconfigured subset of all available NETCONF or RESTCONF protocol
operations and content.
There are a number of data nodes defined in the YANG module which are There are a number of data nodes defined in this YANG module that are
writable/creatable/deletable (i.e., config true, which is the writable/creatable/deletable (i.e., config true, which is the
default). These data nodes may be considered sensitive or vulnerable default). These data nodes may be considered sensitive or vulnerable
in some network environments. Write operations (e.g., POST) to these in some network environments. Write operations (e.g., edit-config)
data nodes without proper protection can have a negative effect on to these data nodes without proper protection can have a negative
network operations. effect on network operations. These are the subtrees and data nodes
and their sensitivity/vulnerability:
Editors note: to list specific subtrees and data nodes and their /nw:networks/nw:network/nw:network-types/tet:te-topology
sensitivity/vulnerability. /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
/nw:networks/nw:network/nw:node/nt:termination-point/tet:te
/nw:networks/nw:network/.../tet:te-bandwidth/tet:technology
/nw:networks/nw:network/nw:node/tet:te/.../tet:label-restriction
/nw:networks/nw:network/nw:node/.../tet:te-label/tet:technology
Editors note: we are using simplified description by folding similar
branches to avoid repetation.
8. Acknowledgements Some of the readable data nodes in this YANG module may be considered
sensitive or vulnerable in some network environments. It is thus
important to control read access (e.g., via get, get-config, or
notification) to these data nodes. These are the subtrees and data
nodes and their sensitivity/vulnerability:
We would like to thank Igor Bryskin, Zhe Liu, and Daniele Ceccarelli Editors note: Currently there is no such data nodes, temporarily kept
for their comments and discussions. for review.
9. Contributors 7. Acknowledgements
We would like to thank Igor Bryskin, Zhe Liu, Zheyu Fan and Daniele
Ceccarelli for their comments and discussions.
8. Contributors
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
skipping to change at page 55, line 41 skipping to change at page 56, line 5
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: zhengyl@dimpt.com
10. References 9. References
10.1. Normative References 9.1. Normative References
[I-D.ietf-ccamp-otn-tunnel-model] [I-D.ietf-ccamp-otn-tunnel-model]
Zheng, H., Fan, Z., Sharma, A., Rao, R., zhenghaomian@huawei.com, z., Guo, A., Busi, I., Sharma,
Belotti, S., Lopezalvarez, V., Li, Y., and Y. Xu, "OTN A., Rao, R., Belotti, S., Lopezalvarez, V., Li, Y., and Y.
Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-model-01 Xu, "OTN Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-
(work in progress), October 2017. model-03 (work in progress), July 2018.
[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-16 (work in Topologies", draft-ietf-teas-yang-te-topo-18 (work in
progress), June 2018. progress), June 2018.
[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
DOI 10.17487/RFC3688, January 2004,
<https://www.rfc-editor.org/info/rfc3688>.
[RFC5246] Dierks, T. and E. Rescorla, "The Transport Layer Security
(TLS) Protocol Version 1.2", RFC 5246,
DOI 10.17487/RFC5246, August 2008,
<https://www.rfc-editor.org/info/rfc5246>.
[RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed., [RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
and A. Bierman, Ed., "Network Configuration Protocol and A. Bierman, Ed., "Network Configuration Protocol
(NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011, (NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
<https://www.rfc-editor.org/info/rfc6241>. <https://www.rfc-editor.org/info/rfc6241>.
[RFC6242] Wasserman, M., "Using the NETCONF Protocol over Secure
Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011,
<https://www.rfc-editor.org/info/rfc6242>.
[RFC6536] Bierman, A. and M. Bjorklund, "Network Configuration
Protocol (NETCONF) Access Control Model", RFC 6536,
DOI 10.17487/RFC6536, March 2012,
<https://www.rfc-editor.org/info/rfc6536>.
[RFC7138] Ceccarelli, D., Ed., Zhang, F., Belotti, S., Rao, R., and [RFC7138] Ceccarelli, D., Ed., Zhang, F., Belotti, S., Rao, R., and
J. Drake, "Traffic Engineering Extensions to OSPF for J. Drake, "Traffic Engineering Extensions to OSPF for
GMPLS Control of Evolving G.709 Optical Transport GMPLS Control of Evolving G.709 Optical Transport
Networks", RFC 7138, DOI 10.17487/RFC7138, March 2014, Networks", RFC 7138, DOI 10.17487/RFC7138, March 2014,
<https://www.rfc-editor.org/info/rfc7138>. <https://www.rfc-editor.org/info/rfc7138>.
[RFC7950] Bjorklund, M., Ed., "The YANG 1.1 Data Modeling Language", [RFC7950] Bjorklund, M., Ed., "The YANG 1.1 Data Modeling Language",
RFC 7950, DOI 10.17487/RFC7950, August 2016, RFC 7950, DOI 10.17487/RFC7950, August 2016,
<https://www.rfc-editor.org/info/rfc7950>. <https://www.rfc-editor.org/info/rfc7950>.
[RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF [RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF
Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017, Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017,
<https://www.rfc-editor.org/info/rfc8040>. <https://www.rfc-editor.org/info/rfc8040>.
10.2. Informative References [RFC8342] Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K.,
and R. Wilton, "Network Management Datastore Architecture
(NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,
<https://www.rfc-editor.org/info/rfc8342>.
[RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N.,
Ananthakrishnan, H., and X. Liu, "A YANG Data Model for
Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March
2018, <https://www.rfc-editor.org/info/rfc8345>.
9.2. Informative References
[I-D.ietf-ccamp-flexigrid-yang] [I-D.ietf-ccamp-flexigrid-yang]
Madrid, U., Perdices, D., Lopezalvarez, V., Dios, O., Madrid, U., Perdices, D., Lopezalvarez, V., Dios, O.,
King, D., Lee, Y., and G. Galimberti, "YANG data model for King, D., Lee, Y., and G. Galimberti, "YANG data model for
Flexi-Grid Optical Networks", draft-ietf-ccamp-flexigrid- Flexi-Grid Optical Networks", draft-ietf-ccamp-flexigrid-
yang-00 (work in progress), February 2018. yang-00 (work in progress), February 2018.
[I-D.ietf-ccamp-wson-yang] [I-D.ietf-ccamp-wson-yang]
Lee, Y., Dhody, D., Zhang, X., Guo, A., Lopezalvarez, V., Lee, Y., Dhody, D., Zhang, X., Guo, A., Lopezalvarez, V.,
King, D., Yoon, B., and R. Vilata, "A Yang Data Model for King, D., Yoon, B., and R. Vilata, "A Yang Data Model for
WSON Optical Networks", draft-ietf-ccamp-wson-yang-10 WSON Optical Networks", draft-ietf-ccamp-wson-yang-10
(work in progress), February 2018. (work in progress), February 2018.
[I-D.ietf-netmod-yang-tree-diagrams] [I-D.ietf-netmod-yang-tree-diagrams]
Bjorklund, M. and L. Berger, "YANG Tree Diagrams", draft- Bjorklund, M. and L. Berger, "YANG Tree Diagrams", draft-
ietf-netmod-yang-tree-diagrams-06 (work in progress), ietf-netmod-yang-tree-diagrams-06 (work in progress),
February 2018. February 2018.
[I-D.ietf-teas-actn-yang] [I-D.ietf-teas-actn-yang]
Lee, Y., Zheng, H., Ceccarelli, D., Lee, Y., zhenghaomian@huawei.com, z., Ceccarelli, D.,
Yoon, B., and S. Belotti, "Applicability of YANG models Yoon, B., and S. Belotti, "Applicability of YANG models
for Abstraction and Control of Traffic Engineered for Abstraction and Control of Traffic Engineered
Networks", draft-ietf-teas-actn-yang-01 (work in Networks", draft-ietf-teas-actn-yang-01 (work in
progress), February 2018. progress), February 2018.
[RFC7062] Zhang, F., Ed., Li, D., Li, H., Belotti, S., and D. [RFC7062] Zhang, F., Ed., Li, D., Li, H., Belotti, S., and D.
Ceccarelli, "Framework for GMPLS and PCE Control of G.709 Ceccarelli, "Framework for GMPLS and PCE Control of G.709
Optical Transport Networks", RFC 7062, Optical Transport Networks", RFC 7062,
DOI 10.17487/RFC7062, November 2013, DOI 10.17487/RFC7062, November 2013,
<https://www.rfc-editor.org/info/rfc7062>. <https://www.rfc-editor.org/info/rfc7062>.
skipping to change at page 58, line 4 skipping to change at page 58, line 37
Italy Italy
Email: Italo.Busi@huawei.com Email: Italo.Busi@huawei.com
Anurag Sharma Anurag Sharma
Google Google
1600 Amphitheatre Parkway 1600 Amphitheatre Parkway
Mountain View, CA 94043 Mountain View, CA 94043
Email: ansha@google.com Email: ansha@google.com
Xufeng Liu Xufeng Liu
Jabil Volta Networks
Email: Xufeng_Liu@jabil.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 Yunbin Xu
CAICT CAICT
Email: xuyunbin@ritt.cn Email: xuyunbin@ritt.cn
Lei Wang Lei Wang
China Mobile China Mobile
Email: wangleiyj@chinamobile.com Email: wangleiyj@chinamobile.com
 End of changes. 159 change blocks. 
239 lines changed or deleted 287 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/