draft-ietf-ccamp-otn-topo-yang-05.txt		draft-ietf-ccamp-otn-topo-yang-06.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: February 24, 2019 Huawei Technologies		Expires: August 29, 2019 Huawei Technologies
	A. Sharma		A. Sharma
	Google		Google
	X. Liu		X. Liu
	Volta Networks		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
	August 23, 2018		February 25, 2019
	A YANG Data Model for Optical Transport Network Topology		A YANG Data Model for Optical Transport Network Topology
	draft-ietf-ccamp-otn-topo-yang-05		draft-ietf-ccamp-otn-topo-yang-06
	Abstract		Abstract
	A transport network is a server-layer network designed to provide
	connectivity services for a client-layer network to carry the client
	traffic transparently across the server-layer network resources. A
	transport network can be constructed from equipments utilizing any of
	a number of different transport technologies such as the evolving
	Optical Transport Networks (OTN) or packet transport as provided by
	the MPLS-Transport Profile (MPLS-TP).
	This document describes a YANG data model to describe the topologies		This document describes a YANG data model to describe the topologies
	of an Optical Transport Network (OTN). It is independent of control		of an Optical Transport Network (OTN). It is independent of control
	plane protocols and captures topological and resource related		plane protocols and captures topological and resource related
	information pertaining to OTN. This model enables clients, which		information pertaining to OTN. This model enables clients, which
	interact with a transport domain controller via a REST interface, for		interact with a transport domain controller, for OTN topology related
	OTN topology related operations such as obtaining the relevant		operations such as obtaining the relevant topology resource
	topology resource information.		information.
			Requirements Language
			The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
			"SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
			document are to be interpreted as described in [RFC2119].
	Status of This Memo		Status of This Memo
	This Internet-Draft is submitted in full conformance with the		This Internet-Draft is submitted in full conformance with the
	provisions of BCP 78 and BCP 79.		provisions of BCP 78 and BCP 79.
	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 February 24, 2019.		This Internet-Draft will expire on August 29, 2019.
	Copyright Notice		Copyright Notice
	Copyright (c) 2018 IETF Trust and the persons identified as the		Copyright (c) 2019 IETF Trust and the persons identified as the
	document authors. All rights reserved.		document authors. All rights reserved.
	This document is subject to BCP 78 and the IETF Trust's Legal		This document is subject to BCP 78 and the IETF Trust's Legal
	Provisions Relating to IETF Documents		Provisions Relating to IETF Documents
	(https://trustee.ietf.org/license-info) in effect on the date of		(https://trustee.ietf.org/license-info) in effect on the date of
	publication of this document. Please review these documents		publication of this document. Please review these documents
	carefully, as they describe your rights and restrictions with respect		carefully, as they describe your rights and restrictions with respect
	to this document. Code Components extracted from this document must		to this document. Code Components extracted from this document must
	include Simplified BSD License text as described in Section 4.e of		include Simplified BSD License text as described in Section 4.e of
	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 . . . . . . . . . . . . . . . . . . . . . . . . 21		4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 23
	5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 54		5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 60
	6. Security Considerations . . . . . . . . . . . . . . . . . . . 54		6. Security Considerations . . . . . . . . . . . . . . . . . . . 60
	7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 55		7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 61
	8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 55		8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 61
	9. References . . . . . . . . . . . . . . . . . . . . . . . . . 56		9. References . . . . . . . . . . . . . . . . . . . . . . . . . 62
	9.1. Normative References . . . . . . . . . . . . . . . . . . 56		9.1. Normative References . . . . . . . . . . . . . . . . . . 62
	9.2. Informative References . . . . . . . . . . . . . . . . . 57		9.2. Informative References . . . . . . . . . . . . . . . . . 63
	Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 58		Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 64
	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 such as provided by the
	Transport Profile (MPLS-TP).		MPLS-Transport Profile (MPLS-TP).
	This document defines a data model of an OTN network topology, using		This document defines a data model of an OTN network topology, using
	YANG [RFC7950]. The model can be used by an application exposing to		YANG [RFC7950]. The model can be used by an application exposing to
	a transport controller via a REST interface. Furthermore, it can be		a transport controller. Furthermore, it can be used by an
	used by an application for the following purposes (but not limited		application for the following purposes (but not limited to):
	to):
	o To obtain a whole view of the network topology information of its		o To obtain a whole view of the network topology information of its
	interest;		interest;
	o To receive notifications with regard to the information change of		o To receive notifications with regard to the information change of
	the OTN topology;		the OTN topology;
	o To enforce the establishment and update of a network topology with		o To enforce the establishment and update of a network topology with
	the characteristic specified in the data model, e.g., by a client		the characteristic specified in the data model, e.g., by a client
	controller;		controller;
	The YANG model defined in this document is independent of control		The YANG model defined in this document is independent of control
	plane protocols and captures topology related information pertaining		plane protocols and captures topology related information pertaining
	to an Optical Transport Networks (OTN)-electrical layer, as the scope		to an Optical Transport Networks (OTN) electrical layer, as the scope
	specified by [RFC7062] and [RFC7138]. Furthermore, it is not a		specified by [RFC7062] and [RFC7138]. Furthermore, it is not a
	stand-alone model, but augmenting from the TE topology YANG model		stand-alone model, but augmenting from the TE topology YANG model
	defined in [I-D.ietf-teas-yang-te-topo]. Following TE topology YANG		defined in [I-D.ietf-teas-yang-te-topo]. Following TE topology YANG
	model, the YANG model defined in this document is interface		model, the YANG model defined in this document is interface
	independent. The applicability of models to interfaces is described		independent. The model is included in [I-D.ietf-teas-actn-yang],
	in [I-D.ietf-teas-actn-yang].		which indicates the typical usage of IETF YANG models in ACTN
			architecture specified by [RFC8453]. More specifically, the usage of
			this model between transport controllers is described in
			[I-D.ietf-ccamp-transport-nbi-app-statement].
	Optical network technologies, including fixed Dense Wavelength		Optical network technologies, including fixed Dense Wavelength
	Switched Optical Network (WSON) and flexible optical networks		Switched Optical Network (WSON) and flexible optical networks
	(a.k.a., flexi-grid networks), are covered in		(a.k.a., flexi-grid networks), are covered in
	[I-D.ietf-ccamp-wson-yang] and [I-D.ietf-ccamp-flexigrid-yang],		[I-D.ietf-ccamp-wson-yang] and [I-D.ietf-ccamp-flexigrid-yang],
	respectively.		respectively.
	2. Terminology and Notations		2. Terminology and Notations
	A simplified graphical representation of the data model is used in		A simplified graphical representation of the data model is used in
	skipping to change at page 4, line 28 ¶		skipping to change at page 4, line 25 ¶
	o TSG: Tributary Slot Granularity.		o TSG: Tributary Slot Granularity.
	o TPN: Tributary Port Number.		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
	This document aims to describe the data model for OTN topology. As a		This document aims to describe the data model for OTN topology. As a
	classic Traffic-engineering (TE) technology, OTN provide TDM		classic Traffic-engineering (TE) technology, OTN provide TDM
	switching in transport network. Therefore the YANG module presented		switching in transport network [ITU-T]. Therefore the YANG module
	in this document augments from a more generic Traffic Engineered (TE)		presented in this document augments from a more generic Traffic
	network topology data model, i.e., the ietf-te-topology.yang, as		Engineered (TE) network topology data model, i.e., the ietf-te-
	specified in [I-D.ietf-teas-yang-te-topo]. In section 6 of		topology.yang, as specified in [I-D.ietf-teas-yang-te-topo]. In
	[I-D.ietf-teas-yang-te-topo], the guideline for augmenting TE		section 6 of [I-D.ietf-teas-yang-te-topo], the guideline for
	topology model was provided, and in this draft we respetively augment		augmenting TE topology model was provided, and in this draft we
	the OTN attributes, TE bandwidth and TE label.		respetively augment the OTN attributes, TE bandwidth and TE label.
			[RFC8345] should also be mentioned, which descirbe a network topology
			model and provide the fundamental model for
			[I-D.ietf-teas-yang-te-topo]. However, this work is not directly
			augmenting [RFC8345].
	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 8 ¶		skipping to change at page 5, line 10 ¶
	assuming only a single priority level is supported. If one of ODU2		assuming only a single priority level is supported. If one of ODU2
	resource is taken to establish a ODU path, then the availability of		resource is taken to establish a ODU path, then the availability of
	this ODU link is updated as 24*ODU0, 12*ODU1, 3*ODU2 available. If		this ODU link is updated as 24*ODU0, 12*ODU1, 3*ODU2 available. If
	there are equipment hardware limitations, then a subset of potential		there are equipment hardware limitations, then a subset of potential
	ODU type SHALL be advertised. For instance, an ODU3 link may only		ODU type SHALL be advertised. For instance, an ODU3 link may only
	support 4*ODU2.		support 4*ODU2.
	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. It is also worth noting that for the
			parameter "label-step" in TE topology models, the value is always set
			to 1 as the granularity of OTN resources is measured by 'tributary
			slot'. In this model we specify the 'otn-label-step', which is used
			to align with TE topology only.
	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		The YANG module ietf-otn-topology defined in this document conforms
	to the Network Management Datastore Architecture (NMDA) defined in		to the Network Management Datastore Architecture (NMDA) defined in
	[RFC8342].		[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
	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
	skipping to change at page 5, line 37 ¶		skipping to change at page 5, line 41 ¶
	+--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:te-bandwidth/tet:technology:		/tet:technology:
	+--:(otn)		+--:(otn)
	+--rw odulist* [odu-type]		+--rw odulist* [odu-type]
	+--rw odu-type identityref		+--rw odu-type identityref
	+--rw number? uint16		+--rw number? uint16
	augment /nw:networks/nw:network/nw:node/tet:te/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-constraints/tet:te-bandwidth/tet:technology:		/tet:path-constraints/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		augment /nw:networks/nw:network/nw:node/tet:te/tet:information-source-entry
	/tet:information-source-entry/tet:connectivity-matrices		/tet:connectivity-matrices/tet:path-constraints
	/tet:path-constraints/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/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te/tet:information-source-entry
	/tet:information-source-entry/tet:connectivity-matrices		/tet:connectivity-matrices/tet:connectivity-matrix
	/tet:connectivity-matrix/tet:path-constraints		/tet:path-constraints/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/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te/tet:tunnel-termination-point
	/tet:tunnel-termination-point/tet:client-layer-adaptation		/tet:client-layer-adaptation/tet:switching-capability
	/tet:switching-capability/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		augment /nw:networks/nw:network/nw:node/tet:te/tet:tunnel-termination-point
	/tet:tunnel-termination-point/tet:local-link-connectivities		/tet:local-link-connectivities/tet:path-constraints
	/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		augment /nw:networks/nw:network/nw:node/tet:te/tet:tunnel-termination-point
	/tet:tunnel-termination-point/tet:local-link-connectivities		/tet:local-link-connectivities/tet:local-link-connectivity
	/tet:local-link-connectivity/tet:path-constraints		/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/nt:link/tet:te/tet:te-link-attributes		augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
	/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/nt:link/tet:te
	augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes		/tet:te-link-attributes/tet:max-link-bandwidth
	/tet:max-link-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
	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:max-resv-link-bandwidth/tet:te-bandwidth/tet:technology:		/tet:max-resv-link-bandwidth/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/nt:link/tet:te/tet:te-link-attributes		augment /nw:networks/nw:network/nt:link/tet:te/tet:te-link-attributes
	/tet:unreserved-bandwidth/tet:te-bandwidth/tet:technology:		/tet:unreserved-bandwidth/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/nt:link/tet:te		augment /nw:networks/nw:network/nt:link/tet:te/tet:information-source-entry
	/tet:information-source-entry
	/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)
	+--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:information-source-entry/tet:max-link-bandwidth		/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:information-source-entry
	/tet:max-resv-link-bandwidth/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:information-source-entry/tet:unreserved-bandwidth		/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
	+--ro number? uint16		+--ro 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:interface-switching-capability		/tet:te-link-attributes/tet:interface-switching-capability
	/tet:max-lsp-bandwidth/tet:te-bandwidth/tet:technology:		/tet:max-lsp-bandwidth/tet:te-bandwidth/tet:technology:
	+--:(otn)		+--:(otn)
	+--rw odu-type? identityref		+--rw odu-type? identityref
	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:max-link-bandwidth		/tet:te-link-attributes/tet:max-link-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
	augment /nw:networks/tet:te/tet:templates/tet:link-template		augment /nw:networks/tet:te/tet:templates/tet:link-template
	skipping to change at page 8, line 30 ¶		skipping to change at page 8, line 28 ¶
	+--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		The technology specific TE label for this OTN topology can be specified
	using the following augment statements:		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:te-node-attributes/tet:connectivity-matrices		/tet:connectivity-matrices/tet:label-restrictions
	/tet:label-restrictions/tet:label-restriction:		/tet:label-restriction:
	+--rw range-type? identityref		+--rw range-type? identityref
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw priority? uint8		+--rw 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:label-restrictions		/tet:connectivity-matrices/tet:label-restrictions
	/tet:label-restriction/tet:label-start/tet:te-label		/tet:label-restriction/tet:label-start/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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-restrictions		/tet:connectivity-matrices/tet:label-restrictions
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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
			/tet:connectivity-matrices/tet:label-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--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:
	+--:(otn)		+--:(otn)
	+--rw tpn? uint16		+--rw tpn? uint16
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw ts-list? string		+--rw ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes		augment /nw:networks/nw:network/nw:node/tet:te/tet:te-node-attributes
	/tet:connectivity-matrices/tet:underlay/tet:backup-path		/tet:connectivity-matrices/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/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:optimizations/tet:algorithm		/tet:connectivity-matrices/tet:optimizations/tet:algorithm
	/tet:metric/tet:optimization-metric		/tet:metric/tet:optimization-metric
	/tet:explicit-route-exclude-objects		/tet:explicit-route-exclude-objects/tet:route-object-exclude-object
	/tet:route-object-exclude-object/tet:type/tet:label		/tet:type/tet:label/tet:label-hop/tet:te-label/tet:technology:
	/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/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:optimizations/tet:algorithm		/tet:connectivity-matrices/tet:optimizations/tet:algorithm
	/tet:metric/tet:optimization-metric		/tet:metric/tet:optimization-metric
	/tet:explicit-route-include-objects		/tet:explicit-route-include-objects/tet:route-object-include-object
	/tet:route-object-include-object/tet:type/tet:label		/tet:type/tet:label/tet:label-hop/tet:te-label/tet:technology:
	/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/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
	skipping to change at page 10, line 30 ¶		skipping to change at page 10, line 34 ¶
	/tet:connectivity-matrices/tet:connectivity-matrix/tet:from		/tet:connectivity-matrices/tet:connectivity-matrix/tet:from
	/tet:label-restrictions/tet:label-restriction/tet:label-end		/tet:label-restrictions/tet:label-restriction/tet:label-end
	/tet:te-label/tet:technology:		/tet:te-label/tet:technology:
	+--:(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:label-restrictions/tet:label-restriction/tet:label-step
			/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--rw ts? uint16
			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-restrictions/tet:label-restriction:		/tet:label-restrictions/tet:label-restriction:
	+--rw range-type? identityref		+--rw range-type? identityref
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw priority? uint8		+--rw 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-restrictions/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:
	+--:(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:label-restrictions/tet:label-restriction/tet:label-end		/tet:to/tet:label-restrictions/tet:label-restriction
	/tet:te-label/tet:technology:		/tet:label-end/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--rw (otn-label-type)?		+--rw (otn-label-type)?
	+--:(tributary-port)		+--:(tributary-port)
	| +--rw tpn? uint16		| +--rw tpn? uint16
	+--:(tributary-slot)		+--:(tributary-slot)
	+--rw ts? uint16		+--rw ts? uint16
	augment /nw:networks/nw:network/nw:node/tet:te/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:label-restrictions/tet:label-restriction
			/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--rw ts? uint16
			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:
	+--:(otn)		+--:(otn)
	+--rw tpn? uint16		+--rw tpn? uint16
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw ts-list? string		+--rw ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te/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:backup-path/tet:path-element/tet:type		/tet:underlay/tet:backup-path/tet:path-element/tet:type
	skipping to change at page 12, line 33 ¶		skipping to change at page 13, line 8 ¶
	/tet:label-restrictions/tet:label-restriction		/tet:label-restrictions/tet:label-restriction
	/tet:label-end/tet:te-label/tet:technology:		/tet:label-end/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--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:label-restrictions/tet:label-restriction
	/tet:type/tet:label/tet:label-hop/tet:te-label/tet:technology:		/tet:label-step/tet:technology:
			+--:(otn)
			+--ro (otn-label-type)?
			+--:(tributary-port)
			| +--ro tpn-step? uint16
			+--:(tributary-slot)
			+--ro ts? uint16
			augment /nw:networks/nw:network/nw:node/tet:te
			/tet:information-source-entry/tet:connectivity-matrices
			/tet:underlay/tet:primary-path/tet:path-element/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 49 ¶		skipping to change at page 14, line 35 ¶
	/tet:technology:		/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-restrictions		/tet:connectivity-matrix/tet:from/tet:label-restrictions
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--ro (otn-label-type)?
			+--:(tributary-port)
			| +--ro tpn-step? uint16
			+--:(tributary-slot)
			+--ro ts? uint16
			augment /nw:networks/nw:network/nw:node/tet:te
			/tet:information-source-entry/tet:connectivity-matrices
	/tet:connectivity-matrix/tet:to/tet:label-restrictions		/tet:connectivity-matrix/tet:to/tet:label-restrictions
	/tet:label-restriction:		/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-restrictions		/tet:connectivity-matrix/tet:to/tet:label-restrictions
	/tet:label-restriction/tet:label-start/tet:te-label		/tet:label-restriction/tet:label-start/tet:te-label
	/tet:technology:		/tet:technology:
	skipping to change at page 14, line 39 ¶		skipping to change at page 15, line 34 ¶
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label
	/tet:technology:		/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-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--ro (otn-label-type)?
			+--:(tributary-port)
			| +--ro tpn-step? uint16
			+--:(tributary-slot)
			+--ro ts? uint16
			augment /nw:networks/nw:network/nw:node/tet:te
			/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
	/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:underlay/tet:backup-path		/tet:connectivity-matrix/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)
	+--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:optimizations/tet:algorithm		/tet:connectivity-matrix/tet:optimizations/tet:algorithm
	/tet:metric/tet:optimization-metric		/tet:metric/tet:optimization-metric
	/tet:explicit-route-exclude-objects		/tet:explicit-route-exclude-objects/tet:route-object-exclude-object
	/tet:route-object-exclude-object/tet:type/tet:label		/tet:type/tet:label/tet:label-hop/tet:te-label/tet:technology:
	/tet:label-hop/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--ro tpn? uint16		+--ro tpn? uint16
	+--ro tsg? identityref		+--ro tsg? identityref
	+--ro ts-list? string		+--ro ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te
	/tet:information-source-entry/tet:connectivity-matrices		/tet:information-source-entry
	/tet:connectivity-matrix/tet:optimizations/tet:algorithm		/tet:connectivity-matrices/tet:connectivity-matrix
	/tet:metric/tet:optimization-metric		/tet:optimizations/tet:algorithm/tet: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:type/tet:label/tet:label-hop/tet:te-label/tet:technology:
	/tet:label-hop/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--ro tpn? uint16		+--ro tpn? uint16
	+--ro tsg? identityref		+--ro tsg? identityref
	+--ro ts-list? string		+--ro ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te
	/tet: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-objects/tet:path-route-object/tet:type		/tet:path-route-object/tet:type/tet:label
	/tet:label/tet:label-hop/tet:te-label/tet:technology:		/tet:label-hop/tet:te-label/tet:technology:
	+--:(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-restrictions/tet:label-restriction:		/tet:label-restrictions/tet:label-restriction:
	+--rw range-type? identityref		+--rw range-type? identityref
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw priority? uint8		+--rw priority? uint8
	skipping to change at page 16, line 18 ¶		skipping to change at page 17, line 21 ¶
	/tet:label-restrictions/tet:label-restriction/tet:label-end		/tet:label-restrictions/tet:label-restriction/tet:label-end
	/tet:te-label/tet:technology:		/tet:te-label/tet:technology:
	+--:(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-restrictions/tet:label-restriction
			/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--rw ts? uint16
			augment /nw:networks/nw:network/nw:node/tet:te
			/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:
	+--:(otn)		+--:(otn)
	+--rw tpn? uint16		+--rw tpn? uint16
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw ts-list? string		+--rw ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te
	/tet:tunnel-termination-point/tet:local-link-connectivities		/tet:tunnel-termination-point/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:
	skipping to change at page 17, line 4 ¶		skipping to change at page 18, line 17 ¶
	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:optimizations/tet:algorithm/tet:metric		/tet:optimizations/tet:algorithm/tet:metric
	/tet:optimization-metric/tet:explicit-route-include-objects		/tet:optimization-metric/tet:explicit-route-include-objects
	/tet:route-object-include-object/tet:type/tet:label		/tet:route-object-include-object/tet:type/tet:label
	/tet:label-hop/tet:te-label/tet:technology:		/tet:label-hop/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--rw tpn? uint16		+--rw tpn? uint16
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw ts-list? string		+--rw ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te
	/tet: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:path-route-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:
	+--:(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-restrictions		/tet:local-link-connectivity/tet:label-restrictions
	/tet:label-restriction:		/tet:label-restriction:
	+--rw range-type? identityref		+--rw range-type? identityref
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw priority? uint8		+--rw 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-restrictions		/tet:local-link-connectivity/tet:label-restrictions
	/tet:label-restriction/tet:label-start/tet:te-label		/tet:label-restriction/tet:label-start/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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-restrictions		/tet:local-link-connectivity/tet:label-restrictions
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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:tunnel-termination-point/tet:local-link-connectivities
			/tet:local-link-connectivity/tet:label-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--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
	/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/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:backup-path		/tet:local-link-connectivity/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/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:optimizations/tet:algorithm		/tet:local-link-connectivity/tet:optimizations
	/tet:metric/tet:optimization-metric		/tet:algorithm/tet:metric/tet:optimization-metric
	/tet:explicit-route-exclude-objects		/tet:explicit-route-exclude-objects/tet:route-object-exclude-object
	/tet:route-object-exclude-object/tet:type/tet:label		/tet:type/tet:label/tet:label-hop/tet:te-label/tet:technology:
	/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/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:optimizations/tet:algorithm		/tet:local-link-connectivity/tet:optimizations/tet:algorithm
	/tet:metric/tet:optimization-metric		/tet:metric/tet:optimization-metric/tet:explicit-route-include-objects
	/tet:explicit-route-include-objects
	/tet:route-object-include-object/tet:type/tet:label		/tet:route-object-include-object/tet:type/tet:label
	/tet:label-hop/tet:te-label/tet:technology:		/tet:label-hop/tet:te-label/tet:technology:
	+--:(otn)		+--:(otn)
	+--rw tpn? uint16		+--rw tpn? uint16
	+--rw tsg? identityref		+--rw tsg? identityref
	+--rw ts-list? string		+--rw ts-list? string
	augment /nw:networks/nw:network/nw:node/tet:te		augment /nw:networks/nw:network/nw:node/tet:te
	/tet:tunnel-termination-point/tet:local-link-connectivities		/tet:tunnel-termination-point/tet:local-link-connectivities
	/tet:local-link-connectivity/tet:path-properties		/tet:local-link-connectivity/tet:path-properties
	/tet:path-route-objects/tet:path-route-object/tet: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/nt:link/tet:te/tet:te-link-attributes		augment /nw:networks/nw:network/nt:link/tet:te
	/tet:underlay/tet:primary-path/tet:path-element/tet:type		/tet:te-link-attributes/tet:underlay/tet:primary-path
	/tet:label/tet:label-hop/tet:te-label/tet:technology:		/tet:path-element/tet:type/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:underlay/tet:backup-path/tet:path-element/tet:type		/tet:te-link-attributes/tet:underlay/tet:backup-path
	/tet:label/tet:label-hop/tet:te-label/tet:technology:		/tet:path-element/tet:type/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:label-restrictions/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/nw:network/nt:link/tet:te/tet:te-link-attributes		augment /nw:networks/nw:network/nt:link/tet:te
	/tet:label-restrictions/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/nw:network/nt:link/tet:te/tet:te-link-attributes		augment /nw:networks/nw:network/nt:link/tet:te
	/tet:label-restrictions/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
	augment /nw:networks/nw:network/nt:link/tet:te		augment /nw:networks/nw:network/nt:link/tet:te
			/tet:te-link-attributes/tet:label-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--rw ts? uint16
			augment /nw:networks/nw:network/nt:link/tet:te
	/tet:information-source-entry/tet:label-restrictions		/tet:information-source-entry/tet:label-restrictions
	/tet:label-restriction:		/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-restrictions		/tet:information-source-entry/tet:label-restrictions
	/tet:label-restriction/tet:label-start/tet:te-label		/tet:label-restriction/tet:label-start/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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-restrictions		/tet:information-source-entry/tet:label-restrictions
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label/tet:technology:
	/tet:technology:
	+--:(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
			/tet:information-source-entry/tet:label-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--ro (otn-label-type)?
			+--:(tributary-port)
			| +--ro tpn-step? uint16
			+--:(tributary-slot)
			+--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:
	+--:(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:underlay/tet:backup-path		/tet:te-link-attributes/tet:underlay/tet:backup-path
	skipping to change at page 21, line 4 ¶		skipping to change at page 22, line 43 ¶
	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-restrictions		/tet:te-link-attributes/tet:label-restrictions
	/tet:label-restriction/tet:label-end/tet:te-label		/tet:label-restriction/tet:label-end/tet:te-label
	/tet:technology:		/tet:technology:
	+--:(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
			/tet:te-link-attributes/tet:label-restrictions
			/tet:label-restriction/tet:label-step/tet:technology:
			+--:(otn)
			+--rw (otn-label-type)?
			+--:(tributary-port)
			| +--rw tpn-step? uint16
			+--:(tributary-slot)
			+--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";
	reference "RFC 8345: A YANG Data Model for Network Topologies";		reference "RFC 8345: A YANG Data Model for Network Topologies";
	}		}
	skipping to change at page 21, line 31 ¶		skipping to change at page 23, line 30 ¶
	prefix "nt";		prefix "nt";
	reference "RFC 8345: A YANG Data Model for Network Topologies";		reference "RFC 8345: A YANG Data Model for Network Topologies";
	}		}
	import ietf-te-topology {		import ietf-te-topology {
	prefix "tet";		prefix "tet";
	reference		reference
	"I-D.ietf-teas-yang-te-topo: YANG Data Model for		"I-D.ietf-teas-yang-te-topo: YANG Data Model for
	Traffic Engineering (TE) Topologies";		Traffic Engineering (TE) Topologies";
	}		}
	import ietf-otn-types {		import ietf-otn-types {
	prefix "otn-types";		prefix "otn-types";
	reference		reference
	"I-D.ietf-teas-yang-te: A YANG Data Model for Traffic		"I-D.ietf-ccamp-otn-tunnel-model: OTN Tunnel YANG Model";
	Engineering Tunnels and Interfaces";		}
	}
	organization		organization
	"IETF CCAMP Working Group";		"IETF CCAMP Working Group";
	contact		contact
	"WG Web: <http://tools.ietf.org/wg/ccamp/>		"WG Web: <http://tools.ietf.org/wg/ccamp/>
	WG List: <mailto:ccamp@ietf.org>		WG List: <mailto:ccamp@ietf.org>
	Editor: Haomian Zheng		Editor: Haomian Zheng
	<mailto:zhenghaomian@huawei.com>		<mailto:zhenghaomian@huawei.com>
	skipping to change at page 22, line 30 ¶		skipping to change at page 24, line 27 ¶
	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.
	Copyright (c) 2018 IETF Trust and the persons		Copyright (c) 2019 IETF Trust and the persons
	identified as authors of the code. All rights reserved.		identified as authors of the code. All rights reserved.
	Redistribution and use in source and binary forms, with or		Redistribution and use in source and binary forms, with or
	without modification, is permitted pursuant to, and subject		without modification, is permitted pursuant to, and subject
	to the license terms contained in, the Simplified BSD License		to the license terms contained in, the Simplified BSD License
	set forth in Section 4.c of the IETF Trust's Legal Provisions		set forth in Section 4.c of the IETF Trust's Legal Provisions
	Relating to IETF Documents		Relating to IETF Documents
	(https://trustee.ietf.org/license-info).";		(https://trustee.ietf.org/license-info).";
	revision 2018-08-23 {		revision 2019-02-25 {
	description		description
	"Initial Revision";		"draft-ietf-ccamp-otn-topo-yang-06";
	reference		reference
	"RFC XXXX: A YANG Data Model for Optical Transport Network Topology";		"RFC XXXX: A YANG Data Model for Optical Transport Network Topology";
	// RFC Ed.: replace XXXX with actual RFC number, update date		// RFC Ed.: replace XXXX with actual RFC number, update date
	// information and remove this note		// information and remove this note
	}		}
	/*		/*
	* Groupings		* Groupings
	*/		*/
	grouping otn-link-attributes {		grouping otn-link-attributes {
	description "link attributes for OTN";		description "link attributes for OTN";
	leaf tsg {		leaf tsg {
	type identityref {		type identityref {
	base otn-types:tributary-slot-granularity;		base otn-types:tributary-slot-granularity;
	}		}
	description "Tributary slot granularity.";		description "Tributary slot granularity.";
	reference		reference
	"G.709/Y.1331, February 2016: Interfaces for the		"G.709/Y.1331, February 2016: Interfaces for the
	Optical Transport Network (OTN)";		Optical Transport Network (OTN)";
	}		}
	leaf distance {		leaf distance {
	skipping to change at page 32, line 4 ¶		skipping to change at page 33, line 50 ¶
	+ "tet:te-node-attributes/tet:connectivity-matrices/"		+ "tet:te-node-attributes/tet:connectivity-matrices/"
	+ "tet:label-restrictions/tet:label-restriction/tet:label-end/"		+ "tet:label-restrictions/tet:label-restriction/tet:label-end/"
	+ "tet:te-label/tet:technology" {		+ "tet:te-label/tet:technology" {
	when "../../../../../../../../nw:network-types/tet:te-topology/"		when "../../../../../../../../nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	case otn {		case otn {
	uses otn-types:otn-link-label;		uses otn-types:otn-link-label;
			}
			}
			/* Augment label restrictions step of connectivity-matrices */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:te-node-attributes/tet:connectivity-matrices/"
			+ "tet:label-restrictions/tet:label-restriction/tet:label-step/"
			+ "tet:technology" {
			when "../../../../../../../nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
	}		}
	}		}
	/* Augment label hop of underlay primary path of connectivity-matrices */		/* Augment label hop of underlay primary path of connectivity-matrices */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:te-node-attributes/tet:connectivity-matrices/"		+ "tet:te-node-attributes/tet:connectivity-matrices/"
	+ "tet:underlay/tet:primary-path/tet:path-element/"		+ "tet:underlay/tet:primary-path/tet:path-element/"
	+ "tet:type/tet:label/tet:label-hop/"		+ "tet:type/tet:label/tet:label-hop/"
	+ "tet:te-label/tet:technology" {		+ "tet:te-label/tet:technology" {
	when "../../../../../../../../../"		when "../../../../../../../../../"
	skipping to change at page 34, line 40 ¶		skipping to change at page 37, line 4 ¶
	/* Augment ingress label restrictions end of connectivity-matrix */		/* Augment ingress label restrictions end of connectivity-matrix */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:te-node-attributes/tet:connectivity-matrices/"		+ "tet:te-node-attributes/tet:connectivity-matrices/"
	+ "tet:connectivity-matrix/tet:from/"		+ "tet:connectivity-matrix/tet:from/"
	+ "tet:label-restrictions/tet:label-restriction/tet:label-end/"		+ "tet:label-restrictions/tet:label-restriction/tet:label-end/"
	+ "tet:te-label/tet:technology" {		+ "tet:te-label/tet:technology" {
	when "../../../../../../../../../../"		when "../../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	case otn {		case otn {
	uses otn-types:otn-link-label;		uses otn-types:otn-link-label;
	}		}
	}		}
			/* Augment ingress label restrictions step of connectivity-matrix */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:te-node-attributes/tet:connectivity-matrices/"
			+ "tet:connectivity-matrix/tet:from/"
			+ "tet:label-restrictions/tet:label-restriction/tet:label-step/"
			+ "tet:technology" {
			when "../../../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment egress label restrictions of connectivity-matrix */		/* Augment egress label restrictions of connectivity-matrix */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:te-node-attributes/tet:connectivity-matrices/"		+ "tet:te-node-attributes/tet:connectivity-matrices/"
	+ "tet:connectivity-matrix/tet:to/"		+ "tet:connectivity-matrix/tet:to/"
	+ "tet:label-restrictions/tet:label-restriction" {		+ "tet:label-restrictions/tet:label-restriction" {
	when "../../../../../../../../nw:network-types/tet:te-topology/"		when "../../../../../../../../nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	skipping to change at page 35, line 47 ¶		skipping to change at page 38, line 29 ¶
	+ "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 step of connectivity-matrix */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:te-node-attributes/tet:connectivity-matrices/"
			+ "tet:connectivity-matrix/tet:to/"
			+ "tet:label-restrictions/tet:label-restriction/tet:label-step/"
			+ "tet:technology" {
			when "../../../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of connectivity-matrix */		/* Augment label hop of underlay primary path of connectivity-matrix */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:te-node-attributes/tet:connectivity-matrices/"		+ "tet:te-node-attributes/tet:connectivity-matrices/"
	+ "tet:connectivity-matrix/"		+ "tet:connectivity-matrix/"
	+ "tet:underlay/tet:primary-path/tet:path-element/"		+ "tet:underlay/tet:primary-path/tet:path-element/"
	+ "tet:type/tet:label/tet:label-hop/"		+ "tet:type/tet:label/tet:label-hop/"
	+ "tet:te-label/tet:technology" {		+ "tet:te-label/tet:technology" {
	when "../../../../../../../../../../"		when "../../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	case otn {		case otn {
	uses otn-types:otn-path-label;		uses otn-types:otn-path-label;
	}		}
	}		}
	skipping to change at page 38, line 39 ¶		skipping to change at page 41, line 36 ¶
	+ "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 step of connectivity-matrices information-source */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:information-source-entry/"
			+ "tet:connectivity-matrices/tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of connectivity-matrices information-source */		/* Augment label hop of underlay primary path of connectivity-matrices information-source */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:information-source-entry/tet:connectivity-matrices/"		+ "tet:information-source-entry/tet:connectivity-matrices/"
	+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"		+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
	+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {		+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {
	when "../../../../../../../../../"		when "../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	skipping to change at page 41, line 30 ¶		skipping to change at page 44, line 42 ¶
	+ "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 step of connectivity-matrix information-source */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:information-source-entry/tet:connectivity-matrices/"
			+ "tet:connectivity-matrix/"
			+ "tet:from/tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment egress label restrictions of connectivity-matrix information-source */		/* Augment egress label restrictions of connectivity-matrix information-source */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:information-source-entry/tet:connectivity-matrices/"		+ "tet:information-source-entry/tet:connectivity-matrices/"
	+ "tet:connectivity-matrix/"		+ "tet:connectivity-matrix/"
	+ "tet:to/tet:label-restrictions/tet:label-restriction" {		+ "tet:to/tet:label-restrictions/tet:label-restriction" {
	when "../../../../../../../../nw:network-types/tet:te-topology/"		when "../../../../../../../../nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	skipping to change at page 42, line 29 ¶		skipping to change at page 46, line 10 ¶
	+ "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 step of connectivity-matrix information-source */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:information-source-entry/tet:connectivity-matrices/"
			+ "tet:connectivity-matrix/"
			+ "tet:to/tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of connectivity-matrix information-source */		/* Augment label hop of underlay primary path of connectivity-matrix information-source */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:information-source-entry/tet:connectivity-matrices/"		+ "tet:information-source-entry/tet:connectivity-matrices/"
	+ "tet:connectivity-matrix/"		+ "tet:connectivity-matrix/"
	+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"		+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
	+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {		+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {
	when "../../../../../../../../../../"		when "../../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	skipping to change at page 45, line 20 ¶		skipping to change at page 49, line 18 ¶
	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 step of local-link-connectivities */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:tunnel-termination-point/"
			+ "tet:local-link-connectivities/"
			+ "tet:label-restrictions/tet:label-restriction/tet:label-step/"
			+ "tet:technology"{
			when "../../../../../../../nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of local-link-connectivities */		/* Augment label hop of underlay primary path of local-link-connectivities */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:tunnel-termination-point/"		+ "tet:tunnel-termination-point/"
	+ "tet:local-link-connectivities/"		+ "tet:local-link-connectivities/"
	+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"		+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
	+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {		+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {
	when "../../../../../../../../../"		when "../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	skipping to change at page 48, line 18 ¶		skipping to change at page 52, line 32 ¶
	+ "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 step of local-link-connectivity (LLC) */
			augment "/nw:networks/nw:network/nw:node/tet:te/"
			+ "tet:tunnel-termination-point/"
			+ "tet:local-link-connectivities/"
			+ "tet:local-link-connectivity/"
			+ "tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../../../"
			+ "nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of local-link-connectivity (LLC) */		/* Augment label hop of underlay primary path of local-link-connectivity (LLC) */
	augment "/nw:networks/nw:network/nw:node/tet:te/"		augment "/nw:networks/nw:network/nw:node/tet:te/"
	+ "tet:tunnel-termination-point/"		+ "tet:tunnel-termination-point/"
	+ "tet:local-link-connectivities/"		+ "tet:local-link-connectivities/"
	+ "tet:local-link-connectivity/"		+ "tet:local-link-connectivity/"
	+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"		+ "tet:underlay/tet:primary-path/tet:path-element/tet:type/"
	+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {		+ "tet:label/tet:label-hop/tet:te-label/tet:technology" {
	when "../../../../../../../../../../"		when "../../../../../../../../../../"
	+ "nw:network-types/tet:te-topology/"		+ "nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	skipping to change at page 51, line 45 ¶		skipping to change at page 56, line 30 ¶
	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 step of TE link */
			augment "/nw:networks/nw:network/nt:link/tet:te/"
			+ "tet:te-link-attributes/"
			+ "tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label restrictions of TE link information-source */		/* Augment label restrictions of TE link information-source */
	augment "/nw:networks/nw:network/nt:link/tet:te/"		augment "/nw:networks/nw:network/nt:link/tet:te/"
	+ "tet:information-source-entry/"		+ "tet:information-source-entry/"
	+ "tet:label-restrictions/tet:label-restriction" {		+ "tet:label-restrictions/tet:label-restriction" {
	when "../../../../../nw:network-types/tet:te-topology/"		when "../../../../../nw:network-types/tet:te-topology/"
	+ "otntopo:otn-topology" {		+ "otntopo:otn-topology" {
	description "Augment OTN TE label";		description "Augment OTN TE label";
	}		}
	description "OTN label.";		description "OTN label.";
	uses 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-restrictions/tet:label-restriction/"		+ "tet:label-restrictions/tet:label-restriction/"
	+ "tet:label-start/tet:te-label/tet:technology" {		+ "tet:label-start/tet:te-label/tet:technology" {
	skipping to change at page 52, line 39 ¶		skipping to change at page 57, line 37 ¶
	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 step of TE link information-source */
			augment "/nw:networks/nw:network/nt:link/tet:te/"
			+ "tet:information-source-entry/"
			+ "tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			when "../../../../../../nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	/* Augment label hop of underlay primary path of TE link template */		/* Augment label hop of underlay primary path of TE link template */
	augment "/nw:networks/tet:te/tet:templates/"		augment "/nw:networks/tet:te/tet:templates/"
	+ "tet:link-template/tet:te-link-attributes/"		+ "tet:link-template/tet:te-link-attributes/"
	+ "tet:underlay/tet: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";
	skipping to change at page 54, line 24 ¶		skipping to change at page 59, line 37 ¶
	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 step of TE link template */
			augment "/nw:networks/tet:te/tet:templates/"
			+ "tet:link-template/tet:te-link-attributes/"
			+ "tet:label-restrictions/tet:label-restriction/"
			+ "tet:label-step/tet:technology" {
			/*
			when "../../../../../../nw:network-types/tet:te-topology/"
			+ "otntopo:otn-topology" {
			description "Augment OTN TE label";
			}
			*/
			description "OTN label.";
			case otn {
			uses otn-types:otn-label-step;
			}
			}
	}		}
	<CODE ENDS>		<CODE ENDS>
	5. IANA Considerations		5. IANA Considerations
	It is proposed that IANA should assign new URIs from the "IETF XML		It is proposed that IANA should assign new URIs from the "IETF XML
	Registry" [RFC3688] as follows: URI:		Registry" [RFC3688] as follows: URI:
	urn:ietf:params:xml:ns:yang:ietf-otn-topology Registrant Contact: The		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		IESG XML: N/A; the requested URI is an XML namespace. This document
	skipping to change at page 54, line 46 ¶		skipping to change at page 60, line 30 ¶
	otn-topology prefix: otntopo reference: RFC XXXX		otn-topology prefix: otntopo reference: RFC XXXX
	6. Security Considerations		6. Security Considerations
	The YANG module specified in this document defines a schema for data		The YANG module specified in this document defines a schema for data
	that is designed to be accessed via network management protocols such		that is designed to be accessed via network management protocols such
	as NETCONF [RFC6241] or RESTCONF [RFC8040]. The lowest NETCONF layer		as NETCONF [RFC6241] or RESTCONF [RFC8040]. The lowest NETCONF layer
	is the secure transport layer, and the mandatory-to-implement secure		is the secure transport layer, and the mandatory-to-implement secure
	transport is Secure Shell (SSH) [RFC6242]. The lowest RESTCONF layer		transport is Secure Shell (SSH) [RFC6242]. The lowest RESTCONF layer
	is HTTPS, and the mandatory-to-implement secure transport is TLS		is HTTPS, and the mandatory-to-implement secure transport is TLS
	[RFC5246].		[RFC8446].
	The NETCONF access control model [RFC6536] provides the means to		The NETCONF access control model [RFC8341] provides the means to
	restrict access for particular NETCONF or RESTCONF users to a		restrict access for particular NETCONF or RESTCONF users to a
	preconfigured subset of all available NETCONF or RESTCONF protocol		preconfigured subset of all available NETCONF or RESTCONF protocol
	operations and content.		operations and content.
	There are a number of data nodes defined in this YANG module that 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., edit-config)		in some network environments. Write operations (e.g., edit-config)
	to these data nodes without proper protection can have a negative		to these data nodes without proper protection can have a negative
	effect on network operations. These are the subtrees and data nodes		effect on network operations. These are the subtrees and data nodes
	skipping to change at page 56, line 28 ¶		skipping to change at page 62, line 10 ¶
	Yanlei Zheng		Yanlei Zheng
	China Unicom		China Unicom
	Email: zhengyl@dimpt.com		Email: zhengyl@dimpt.com
	9. References		9. References
	9.1. Normative References		9.1. Normative References
	[I-D.ietf-ccamp-otn-tunnel-model]		[I-D.ietf-ccamp-otn-tunnel-model]
	zhenghaomian@huawei.com, z., Guo, A., Busi, I., Sharma,		Zheng, H., Guo, A., Busi, I., Sharma, A., Rao, R.,
	A., Rao, R., Belotti, S., Lopezalvarez, V., Li, Y., and Y.		Belotti, S., Lopezalvarez, V., Li, Y., and Y. Xu, "OTN
	Xu, "OTN Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-		Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel-model-05
	model-04 (work in progress), August 2018.		(work in progress), August 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-18 (work in		Topologies", draft-ietf-teas-yang-te-topo-19 (work in
	progress), June 2018.		progress), February 2019.
	[ITU-T] ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA,		[ITU-T] ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA,
	DIGITAL SYSTEMS AND NETWORKS; Digital networks; Interfaces		DIGITAL SYSTEMS AND NETWORKS; Digital networks; Interfaces
	for the optical transport network", ITU-T Rec. G.709v5 ,		for the optical transport network", ITU-T Rec. G.709v5 ,
	June 2016.		June 2016.
			[RFC2119] Bradner, S., "Key words for use in RFCs to Indicate
			Requirement Levels", BCP 14, RFC 2119,
			DOI 10.17487/RFC2119, March 1997,
			<https://www.rfc-editor.org/info/rfc2119>.
	[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,		[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
	DOI 10.17487/RFC3688, January 2004,		DOI 10.17487/RFC3688, January 2004,
	<https://www.rfc-editor.org/info/rfc3688>.		<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		[RFC6242] Wasserman, M., "Using the NETCONF Protocol over Secure
	Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011,		Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011,
	<https://www.rfc-editor.org/info/rfc6242>.		<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>.
			[RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration
			Access Control Model", STD 91, RFC 8341,
			DOI 10.17487/RFC8341, March 2018,
			<https://www.rfc-editor.org/info/rfc8341>.
	[RFC8342] Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K.,		[RFC8342] Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K.,
	and R. Wilton, "Network Management Datastore Architecture		and R. Wilton, "Network Management Datastore Architecture
	(NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,		(NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018,
	<https://www.rfc-editor.org/info/rfc8342>.		<https://www.rfc-editor.org/info/rfc8342>.
	[RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N.,		[RFC8345] Clemm, A., Medved, J., Varga, R., Bahadur, N.,
	Ananthakrishnan, H., and X. Liu, "A YANG Data Model for		Ananthakrishnan, H., and X. Liu, "A YANG Data Model for
	Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March		Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March
	2018, <https://www.rfc-editor.org/info/rfc8345>.		2018, <https://www.rfc-editor.org/info/rfc8345>.
			[RFC8446] Rescorla, E., "The Transport Layer Security (TLS) Protocol
			Version 1.3", RFC 8446, DOI 10.17487/RFC8446, August 2018,
			<https://www.rfc-editor.org/info/rfc8446>.
	9.2. Informative References		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-01 (work in progress), August 2018.		yang-02 (work in progress), October 2018.
			[I-D.ietf-ccamp-transport-nbi-app-statement]
			Busi, I., King, D., Zheng, H., and Y. Xu, "Transport
			Northbound Interface Applicability Statement", draft-ietf-
			ccamp-transport-nbi-app-statement-04 (work in progress),
			November 2018.
	[I-D.ietf-ccamp-wson-yang]		[I-D.ietf-ccamp-wson-yang]
	Lee, Y., Dhody, D., Guo, A., Lopezalvarez, V., King, D.,		Lee, Y., Dhody, D., Guo, A., Lopezalvarez, V., and D.
	Yoon, B., and R. Vilata, "A Yang Data Model for WSON		King, "A YANG Data Model for WSON (Wavelength Switched
	Optical Networks", draft-ietf-ccamp-wson-yang-13 (work in		Optical Networks)", draft-ietf-ccamp-wson-yang-18 (work in
	progress), August 2018.		progress), December 2018.
	[I-D.ietf-teas-actn-yang]		[I-D.ietf-teas-actn-yang]
	Lee, Y., zhenghaomian@huawei.com, z., Ceccarelli, D.,		Lee, Y., Zheng, H., Ceccarelli, D., Yoon, B., Dios, O.,
	Yoon, B., Dios, O., Shin, J., and S. Belotti,		Shin, J., and S. Belotti, "Applicability of YANG models
	"Applicability of YANG models for Abstraction and Control		for Abstraction and Control of Traffic Engineered
	of Traffic Engineered Networks", draft-ietf-teas-actn-		Networks", draft-ietf-teas-actn-yang-03 (work in
	yang-02 (work in progress), August 2018.		progress), February 2019.
	[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>.
	[RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams",		[RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams",
	BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018,		BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018,
	<https://www.rfc-editor.org/info/rfc8340>.		<https://www.rfc-editor.org/info/rfc8340>.
			[RFC8453] Ceccarelli, D., Ed. and Y. Lee, Ed., "Framework for
			Abstraction and Control of TE Networks (ACTN)", RFC 8453,
			DOI 10.17487/RFC8453, August 2018,
			<https://www.rfc-editor.org/info/rfc8453>.
	Authors' Addresses		Authors' Addresses
	Haomian Zheng		Haomian Zheng
	Huawei Technologies		Huawei Technologies
	F3 R&D Center, Huawei Industrial Base, Bantian, Longgang District		H1-1-A043S Huawei Industrial Base, Songshanhu
	Shenzhen, Guangdong 518129		Dongguan, Guangdong 523808
	P.R.China		China
	Email: zhenghaomian@huawei.com		Email: zhenghaomian@huawei.com
	Aihua Guo		Aihua Guo
	Huawei Technologies		Huawei Technologies
	12007 Sunrise Valley Drive, Suite 325		12007 Sunrise Valley Drive, Suite 325
	Reston, VA 20171		Reston, VA 20171
	U.S.A		U.S.A
	Email: aihuaguo@huawei.com		Email: aihuaguo@huawei.com
End of changes. 100 change blocks.
	187 lines changed or deleted		476 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/