--- 1/draft-ietf-ccamp-otn-topo-yang-09.txt 2020-03-08 22:13:18.272083761 -0700 +++ 2/draft-ietf-ccamp-otn-topo-yang-10.txt 2020-03-08 22:13:18.416087420 -0700 @@ -1,89 +1,90 @@ CCAMP Working Group H. Zheng Internet-Draft I. Busi Intended status: Standards Track Huawei Technologies -Expires: May 5, 2020 X. Liu +Expires: September 10, 2020 X. Liu Volta Networks S. Belotti Nokia O. Gonzalez de Dios Telefonica - November 2, 2019 + March 9, 2020 A YANG Data Model for Optical Transport Network Topology - draft-ietf-ccamp-otn-topo-yang-09 + draft-ietf-ccamp-otn-topo-yang-10 Abstract This document describes a YANG data model to describe the topologies of an Optical Transport Network (OTN). It is independent of control plane protocols and captures topological and resource related information pertaining to OTN. This model enables clients, which interact with a transport domain controller, for OTN topology related operations such as obtaining the relevant topology resource 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]. + document are to be interpreted as described in BCP 14 [RFC2119] + [RFC8174] when, and only when, they appear in all capitals, as shown + here. Status of This Memo This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79. Internet-Drafts are working documents of the Internet Engineering Task Force (IETF). Note that other groups may also distribute working documents as Internet-Drafts. The list of current Internet- Drafts is at https://datatracker.ietf.org/drafts/current/. Internet-Drafts are draft documents valid for a maximum of six months and may be updated, replaced, or obsoleted by other documents at any time. It is inappropriate to use Internet-Drafts as reference material or to cite them other than as "work in progress." - - This Internet-Draft will expire on May 5, 2020. + This Internet-Draft will expire on September 10, 2020. Copyright Notice - Copyright (c) 2019 IETF Trust and the persons identified as the + Copyright (c) 2020 IETF Trust and the persons identified as the document authors. All rights reserved. This document is subject to BCP 78 and the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as described in the Simplified BSD License. Table of Contents 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2 2. Terminology and Notations . . . . . . . . . . . . . . . . . . 3 3. YANG Data Model for OTN Topology . . . . . . . . . . . . . . 4 3.1. OTN Topology Data Model Overview . . . . . . . . . . . . 4 3.2. YANG Tree for OTN topology . . . . . . . . . . . . . . . 5 - 4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 26 - 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 64 - 6. Security Considerations . . . . . . . . . . . . . . . . . . . 64 - 7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 65 - 8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 65 - 9. References . . . . . . . . . . . . . . . . . . . . . . . . . 66 - 9.1. Normative References . . . . . . . . . . . . . . . . . . 66 - 9.2. Informative References . . . . . . . . . . . . . . . . . 68 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 69 + 4. The YANG Code . . . . . . . . . . . . . . . . . . . . . . . . 27 + 5. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 65 + 6. Security Considerations . . . . . . . . . . . . . . . . . . . 66 + 7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 67 + 8. Contributors . . . . . . . . . . . . . . . . . . . . . . . . 67 + 9. References . . . . . . . . . . . . . . . . . . . . . . . . . 68 + 9.1. Normative References . . . . . . . . . . . . . . . . . . 68 + 9.2. Informative References . . . . . . . . . . . . . . . . . 69 + Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 70 1. Introduction 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 of equipments utilizing any of a number of different transport technologies such as the Optical Transport Networks (OTN) or packet transport such as provided by the MPLS-Transport Profile (MPLS-TP). @@ -93,39 +94,39 @@ a transport controller. Furthermore, it can be used by an application for the following purposes (but not limited to): o To obtain a whole view of the network topology information of its interest; o To receive notifications with regard to the information change of the OTN topology; o To enforce the establishment and update of a network topology with - the characteristic specified in the data model, e.g., by a client - controller; + the characteristic specified in the data model; The YANG model defined in this document is independent of control plane protocols and captures topology related information pertaining to an Optical Transport Networks (OTN) electrical layer, as the scope - specified by [RFC7062] and [RFC7138]. Furthermore, it is not a - stand-alone model, but augmenting from the TE topology YANG model - defined in [I-D.ietf-teas-yang-te-topo]. Following TE topology YANG - model, the YANG model defined in this document is interface - independent. The model is included 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]. + specified by [RFC7062] . Furthermore, it is not a stand-alone model, + but augmenting from the TE topology YANG model defined in + [I-D.ietf-teas-yang-te-topo], and importing from the generic Layer 1 + types defined in [I-D.ietf-ccamp-layer1-types]. Following TE + topology YANG model, the YANG model defined in this document is + interface independent. The model is included 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 controllers is + described in [I-D.ietf-ccamp-transport-nbi-app-statement]. - Optical network technologies, including fixed Dense Wavelength - Switched Optical Network (WSON) and flexible optical networks - (a.k.a., flexi-grid networks), are covered in + Other topology models for Optical network technologies, including + fixed Dense Wavelength Switched Optical Network (WSON) and flexible + optical networks (a.k.a., flexi-grid networks), are covered in [I-D.ietf-ccamp-wson-yang] and [I-D.ietf-ccamp-flexigrid-yang], respectively. 2. Terminology and Notations A simplified graphical representation of the data model is used in this document. The meaning of the symbols in the YANG data tree presented later in this document is defined in [RFC8340]. They are provided below for reference. @@ -150,62 +151,56 @@ o TSG: Tributary Slot Granularity. o TPN: Tributary Port Number. 3. YANG Data Model for OTN Topology 3.1. OTN Topology Data Model Overview This document aims to describe the data model for OTN topology. As a classic Traffic-engineering (TE) technology, OTN provide TDM - switching in transport network [ITU-T]. Therefore the YANG module - presented in this document augments from a more generic Traffic - Engineered (TE) network topology data model, i.e., the ietf-te- - topology.yang, as specified in [I-D.ietf-teas-yang-te-topo]. In + switching in transport network [ITU-Tg709]. Therefore the YANG + module presented in this document augments from a more generic + Traffic Engineered (TE) network topology data model, i.e., the ietf- + te-topology, as specified in [I-D.ietf-teas-yang-te-topo]. In section 6 of [I-D.ietf-teas-yang-te-topo], the guideline for augmenting TE topology model was provided, and in this draft we - respetively augment the OTN attributes, TE bandwidth and TE label. - [RFC8345] should also be mentioned, which descirbe a network topology + respectively augment the OTN attributes, TE bandwidth and TE label. + Generic groupings defined in [I-D.ietf-ccamp-layer1-types] is reused + as well in this document. [RFC8345] describes 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 links, are still applicable for describing an OTN topology and the model presented in this document only specifies with technology- - specific attributes/information. In OTN attributes augmentation, - mainly OTN-specific parameters are included such as Tributary Slot - Granularity (TSG), payload type and so on. + specific attributes/information. The OTN-specific attributes in + [RFC7139], including the TPN, TS and TSG, can be used to represent + the bandwidth and label information. These attributes have been + specified in [I-D.ietf-ccamp-layer1-types], and used in this document + for augmentation of the generic TE topology model. For different order of ODU in OTN technology, the te-bandwidth is augmented to allow specifying the type of ODU container and the number a link can support per priority level. For example, for a - ODU3 link, it may advertise 32*ODU0, 16*ODU1, 4*ODU2 available, - assuming only a single priority level is supported. If one of ODU2 - 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 - there are equipment hardware limitations, then a subset of potential - ODU type SHALL be advertised. For instance, an ODU3 link may only - support 4*ODU2. - - 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 TE-label augmentation, two optional label formats are available - 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. + ODU3 link, it may advertise 32*ODU0, 16*ODU1, 4*ODU2 available, or + multiple ODUflex, assuming only a single priority level is supported. + If one of ODU2 resource is taken to establish a ODU path, then the + availability of this ODU link is updated as 24*ODU0, 12*ODU1, 3*ODU2, + or multiple ODUflex available. If there are equipment hardware + limitations, then a subset of potential ODU type SHALL be advertised. + For instance, an ODU3 link may only support 4*ODU2. - Note the model in this document re-uses some attributes defined in - ietf-otn-types.yang, which is specified in - [I-D.ietf-ccamp-otn-tunnel-model]. + Note the model in this document re-uses some typedefs, identities and + groupings defined in ietf-layer1-types, which is specified in + [I-D.ietf-ccamp-layer1-types]. The YANG module ietf-otn-topology defined in this document conforms to the Network Management Datastore Architecture (NMDA) defined in [RFC8342]. 3.2. YANG Tree for OTN topology module: ietf-otn-topology augment /nw:networks/nw:network/nw:network-types /tet:te-topology: @@ -219,29 +214,43 @@ +--rw client-svc! +--rw client-facing? boolean +--rw supported-client-signal* identityref augment /nw:networks/nw:network/nw:node /nt:termination-point/tet:te /tet:interface-switching-capability /tet:max-lsp-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--rw odu-type? identityref + +--rw (oduflex-type)? + +--:(generic) + | +--rw nominal-bit-rate uint64 + +--:(cbr) + | +--rw client-type identityref + +--:(gfp-n-k) + | +--rw gfp-n uint8 + | +--rw gfp-k? l1-types:gfp-k + +--:(flexe-client) + | +--rw flexe-client + | l1-types:flexe-client-rate + +--:(flexe-aware) + | +--rw flexe-aware-n uint16 + +--:(packet) + +--rw opuflex-payload-rate uint64 augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:path-constraints /tet:te-bandwidth/tet:technology: +--:(otn) +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 - augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:path-constraints /tet:te-bandwidth/tet:technology: +--:(otn) +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/nw:network/nw:node/tet:te @@ -289,20 +298,35 @@ +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes /tet:interface-switching-capability /tet:max-lsp-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--rw odu-type? identityref + +--rw (oduflex-type)? + +--:(generic) + | +--rw nominal-bit-rate uint64 + +--:(cbr) + | +--rw client-type identityref + +--:(gfp-n-k) + | +--rw gfp-n uint8 + | +--rw gfp-k? l1-types:gfp-k + +--:(flexe-client) + | +--rw flexe-client + | l1-types:flexe-client-rate + +--:(flexe-aware) + | +--rw flexe-aware-n uint16 + +--:(packet) + +--rw opuflex-payload-rate uint64 augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:max-link-bandwidth /tet:te-bandwidth/tet:technology: +--:(otn) +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes /tet:max-resv-link-bandwidth/tet:te-bandwidth @@ -318,20 +343,35 @@ +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry /tet:interface-switching-capability /tet:max-lsp-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--ro odu-type? identityref + +--ro (oduflex-type)? + +--:(generic) + | +--ro nominal-bit-rate uint64 + +--:(cbr) + | +--ro client-type identityref + +--:(gfp-n-k) + | +--ro gfp-n uint8 + | +--ro gfp-k? l1-types:gfp-k + +--:(flexe-client) + | +--ro flexe-client + | l1-types:flexe-client-rate + +--:(flexe-aware) + | +--ro flexe-aware-n uint16 + +--:(packet) + +--ro opuflex-payload-rate uint64 augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry /tet:max-link-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--ro odulist* [odu-type] +--ro odu-type identityref +--ro number? uint16 augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry @@ -349,20 +389,35 @@ +--ro odulist* [odu-type] +--ro odu-type identityref +--ro number? uint16 augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:interface-switching-capability /tet:max-lsp-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--rw odu-type? identityref + +--rw (oduflex-type)? + +--:(generic) + | +--rw nominal-bit-rate uint64 + +--:(cbr) + | +--rw client-type identityref + +--:(gfp-n-k) + | +--rw gfp-n uint8 + | +--rw gfp-k? l1-types:gfp-k + +--:(flexe-client) + | +--rw flexe-client + | l1-types:flexe-client-rate + +--:(flexe-aware) + | +--rw flexe-aware-n uint16 + +--:(packet) + +--rw opuflex-payload-rate uint64 augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:max-link-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes @@ -377,238 +432,238 @@ /tet:unreserved-bandwidth/tet:te-bandwidth /tet:technology: +--:(otn) +--rw odulist* [odu-type] +--rw odu-type identityref +--rw number? uint16 augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction /tet:label-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction /tet:label-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts + augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:underlay /tet:primary-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: - +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices/tet:path-properties /tet:path-route-objects/tet:path-route-object /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string 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: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:underlay /tet:primary-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type @@ -607,648 +662,650 @@ augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: + +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:te-node-attributes /tet:connectivity-matrices /tet:connectivity-matrix/tet:path-properties /tet:path-route-objects/tet:path-route-object /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction: - +--ro range-type? identityref + +--ro range-type? l1-types:otn-label-range-type +--ro tsg? identityref +--ro odu-type-list* identityref +--ro priority? uint8 augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction /tet:label-start/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:label-restrictions/tet:label-restriction /tet:label-end/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string - augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices/tet:path-properties /tet:path-route-objects/tet:path-route-object /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string 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: - +--ro range-type? identityref + +--ro range-type? l1-types:otn-label-range-type +--ro tsg? identityref +--ro odu-type-list* identityref +--ro priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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: - +--ro range-type? identityref + +--ro range-type? l1-types:otn-label-range-type +--ro tsg? identityref +--ro odu-type-list* identityref +--ro priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:connectivity-matrix/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:connectivity-matrix/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:connectivity-matrix/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:information-source-entry /tet:connectivity-matrices /tet:connectivity-matrix/tet:path-properties /tet:path-route-objects/tet:path-route-object /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:label-restrictions/tet:label-restriction: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:path-properties/tet:path-route-objects /tet:path-route-object/tet:type/tet:label /tet:label-hop/tet:te-label/tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string 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: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 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-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:local-link-connectivity/tet:underlay /tet:primary-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:local-link-connectivity/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:local-link-connectivity/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-exclude-objects /tet:route-object-exclude-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:local-link-connectivity/tet:optimizations /tet:algorithm/tet:metric /tet:optimization-metric /tet:explicit-route-include-objects /tet:route-object-include-object/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nw:node/tet:te /tet:tunnel-termination-point /tet:local-link-connectivities /tet:local-link-connectivity/tet:path-properties /tet:path-route-objects/tet:path-route-object /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--ro tpn? uint16 + +--ro otn-tpn? l1-types:otn-tpn +--ro tsg? identityref +--ro ts-list? string augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:underlay /tet:primary-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:underlay /tet:backup-path/tet:path-element/tet:type /tet:label/tet:label-hop/tet:te-label /tet:technology: + +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:label-restrictions /tet:label-restriction: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:label-restrictions /tet:label-restriction/tet:label-start /tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nt:link/tet:te /tet:te-link-attributes/tet:label-restrictions /tet:label-restriction/tet:label-end /tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry /tet:label-restrictions/tet:label-restriction: - +--ro range-type? identityref + +--ro range-type? l1-types:otn-label-range-type +--ro tsg? identityref +--ro odu-type-list* identityref +--ro priority? uint8 + augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry /tet:label-restrictions/tet:label-restriction /tet:label-start/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts augment /nw:networks/nw:network/nt:link/tet:te /tet:information-source-entry /tet:label-restrictions/tet:label-restriction /tet:label-end/tet:te-label/tet:technology: +--:(otn) - +--ro (otn-label-type)? - +--:(tributary-port) - | +--ro tpn? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--ro ts? uint16 + +--ro (range-type)? + +--:(trib-port) + | +--ro otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--ro otn-ts? l1-types:otn-ts augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:underlay/tet:primary-path/tet:path-element /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:underlay/tet:backup-path/tet:path-element /tet:type/tet:label/tet:label-hop/tet:te-label /tet:technology: +--:(otn) - +--rw tpn? uint16 + +--rw otn-tpn? l1-types:otn-tpn +--rw tsg? identityref +--rw ts-list? string + augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:label-restrictions/tet:label-restriction: - +--rw range-type? identityref + +--rw range-type? l1-types:otn-label-range-type +--rw tsg? identityref +--rw odu-type-list* identityref +--rw priority? uint8 augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:label-restrictions/tet:label-restriction /tet:label-start/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts augment /nw:networks/tet:te/tet:templates /tet:link-template/tet:te-link-attributes /tet:label-restrictions/tet:label-restriction /tet:label-end/tet:te-label/tet:technology: +--:(otn) - +--rw (otn-label-type)? - +--:(tributary-port) - | +--rw tpn? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 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? uint16 - +--:(tributary-slot) - +--rw ts? uint16 + +--rw (range-type)? + +--:(trib-port) + | +--rw otn-tpn? l1-types:otn-tpn + +--:(trib-slot) + +--rw otn-ts? l1-types:otn-ts 4. The YANG Code - file "ietf-otn-topology@2019-11-02.yang" + file "ietf-otn-topology@2020-03-09.yang" module ietf-otn-topology { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-otn-topology"; prefix "otntopo"; import ietf-network { prefix "nw"; reference "RFC 8345: A YANG Data Model for Network Topologies"; - } import ietf-network-topology { prefix "nt"; reference "RFC 8345: A YANG Data Model for Network Topologies"; } import ietf-te-topology { prefix "tet"; reference @@ -1250,21 +1307,21 @@ } import ietf-te-topology { prefix "tet"; reference "I-D.ietf-teas-yang-te-topo: YANG Data Model for Traffic Engineering (TE) Topologies"; } import ietf-layer1-types { - prefix "layer1-types"; + prefix "l1-types"; reference "I-D.ietf-ccamp-layer1-types: A YANG Data Model for Layer 1 Types"; } organization "IETF CCAMP Working Group"; contact "WG Web: WG List: @@ -1282,52 +1339,52 @@ Editor: Oscar Gonzalez de Dios "; description "This module defines a protocol independent Layer 1/ODU topology data model. The model fully conforms to the Network Management Datastore Architecture (NMDA). - Copyright (c) 2019 IETF Trust and the persons + Copyright (c) 2020 IETF Trust and the persons identified as authors of the code. All rights reserved. Redistribution and use in source and binary forms, with or without modification, is permitted pursuant to, and subject to the license terms contained in, the Simplified BSD License set forth in Section 4.c of the IETF Trust's Legal Provisions Relating to IETF Documents (https://trustee.ietf.org/license-info). This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2019-11-02 { + revision 2020-03-09 { description "Initial Revision"; reference "RFC XXXX: A YANG Data Model for Optical Transport Network Topology"; // RFC Ed.: replace XXXX with actual RFC number, update date // information and remove this note } /* * Groupings */ grouping otn-link-attributes { description "link attributes for OTN"; leaf tsg { type identityref { - base layer1-types:tributary-slot-granularity; + base l1-types:tributary-slot-granularity; } description "Tributary slot granularity."; reference "G.709/Y.1331, February 2016: Interfaces for the Optical Transport Network (OTN)"; } leaf distance { type uint32; description "distance in the unit of kilometers"; } @@ -1342,21 +1398,21 @@ "OTN LTP Service attributes."; leaf client-facing { type boolean; default 'false'; description "Indicates whether this LTP is a client-facing LTP."; } leaf-list supported-client-signal { type identityref { - base layer1-types:client-signal; + base l1-types:client-signal; } description "List of client signal types supported by the LTP."; } } } /* * Data nodes */ @@ -1398,34 +1454,34 @@ augment "/nw:networks/nw:network/nw:node/nt:termination-point/" + "tet:te/" + "tet:interface-switching-capability/tet:max-lsp-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-path-bandwidth; + uses l1-types:otn-path-bandwidth; } } /* Augment bandwidth path constraints of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:path-constraints/tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment bandwidth path constraints of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/" + "tet:path-constraints/tet:te-bandwidth/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -1422,74 +1478,75 @@ } } /* Augment bandwidth path constraints of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/" + "tet:path-constraints/tet:te-bandwidth/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { + description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; - + uses l1-types:otn-link-bandwidth; } } /* Augment bandwidth path constraints of * connectivity-matrices information-source */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:information-source-entry/tet:connectivity-matrices/" + "tet:path-constraints/tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment bandwidth path constraints 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:path-constraints/tet:te-bandwidth/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment client bandwidth of tunnel termination point (TTP) */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:client-layer-adaptation/tet:switching-capability/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } + /* Augment bandwidth path constraints of * local-link-connectivities */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/tet:path-constraints/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } @@ -1488,55 +1545,56 @@ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/tet:path-constraints/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment bandwidth path constraints 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:path-constraints/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE bandwidth"; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment maximum LSP bandwidth of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:interface-switching-capability/tet:max-lsp-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-path-bandwidth; + uses l1-types:otn-path-bandwidth; } } + /* Augment maximum bandwidth of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:max-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; @@ -1534,99 +1592,99 @@ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:max-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment maximum reservable bandwidth of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:max-resv-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment unreserved bandwidth of TE Link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:unreserved-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; + } } /* Augment maximum LSP bandwidth of TE link information-source */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:interface-switching-capability/" + "tet:max-lsp-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-path-bandwidth; + uses l1-types:otn-path-bandwidth; } } /* Augment maximum bandwidth of TE link information-source */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:max-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } - /*Augment maximum reservable BW of TE link information-source*/ + /* Augment max reservable bandwidth of TE link information-source */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:max-resv-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } - /* Augment unreserved bandwidth of TE link information-source */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:unreserved-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; @@ -1624,57 +1682,58 @@ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:unreserved-bandwidth/" + "tet:te-bandwidth/tet:technology" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment maximum LSP bandwidth of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:interface-switching-capability/" + "tet:max-lsp-bandwidth/" + "tet:te-bandwidth/tet:technology" { /* when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } */ description "OTN bandwidth."; case otn { - uses layer1-types:otn-path-bandwidth; + uses l1-types:otn-path-bandwidth; } } /* Augment maximum bandwidth of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:max-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { /* when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } */ description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } + } /* Augment maximum reservable bandwidth of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:max-resv-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { /* when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -1676,101 +1735,102 @@ + "tet:max-resv-link-bandwidth/" + "tet:te-bandwidth/tet:technology" { /* when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } */ description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* Augment unreserved bandwidth of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:unreserved-bandwidth/" + "tet:te-bandwidth/tet:technology" { /* when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "OTN TE bandwidth."; } */ description "OTN bandwidth."; case otn { - uses layer1-types:otn-link-bandwidth; + uses l1-types:otn-link-bandwidth; } } /* * Augment TE label. */ /* Augment label restrictions 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" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label restriction, represented by otn-label-range-info."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end 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-end/" - + "tet:te-label/tet:technology" { + + "tet:label-restrictions/tet:label-restriction/" + + "tet:label-end/tet:te-label/tet:technology" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } + } /* Augment label hop of underlay primary path * of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:underlay/tet:primary-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../" @@ -1773,96 +1833,95 @@ + "tet:underlay/tet:primary-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path * of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:underlay/tet:backup-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; - + uses l1-types:otn-label-hop; } } /* Augment label hop of route-include of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of path-route of connectivity-matrices */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology"{ when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment ingress label restrictions 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" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -1860,160 +1919,159 @@ } /* Augment ingress label restrictions 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" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; - } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment ingress label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment ingress label restrictions end 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-end/" + "tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment egress label restrictions 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" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment egress label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment egress label restrictions end 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-end/" - + "tet:te-label/tet:technology" { + + "tet:label-restrictions/tet:label-restriction/" + + "tet:label-end/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { - description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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" { + + "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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment label hop of underlay primary path of * connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/" + "tet:underlay/tet:primary-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } + } /* Augment label hop of underlay backup path of * connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/" + "tet:underlay/tet:backup-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { @@ -2017,40 +2075,40 @@ + "tet:underlay/tet:backup-path/tet:path-element/" + "tet:type/tet:label/tet:label-hop/" + "tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/tet:optimizations/" + "tet:algorithm/tet:metric/tet:optimization-metric/" + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-include of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/tet:optimizations/" + "tet:algorithm/tet:metric/tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" @@ -2048,61 +2106,62 @@ } /* Augment label hop of route-include of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/tet:optimizations/" + "tet:algorithm/tet:metric/tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { + when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of path-route of connectivity-matrix */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:te-node-attributes/tet:connectivity-matrices/" + "tet:connectivity-matrix/" + "tet:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label range information 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" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../" @@ -2102,64 +2161,62 @@ * 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-start/tet:te-label/tet:technology" { when "../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; - } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end 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-end/tet:te-label/tet:technology" { when "../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } - /* Augment label hop of underlay primary path of * connectivity-matrices information-source */ 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" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; @@ -2159,60 +2216,61 @@ + "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" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path of * connectivity-matrices information-source */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:information-source-entry/tet:connectivity-matrices/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude of * connectivity-matrices information-source */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:information-source-entry/tet:connectivity-matrices/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } + /* Augment label hop of route-include of * connectivity-matrices information-source */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:information-source-entry/tet:connectivity-matrices/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" @@ -2215,94 +2273,95 @@ + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of path-route of * connectivity-matrices information-source */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:information-source-entry/tet:connectivity-matrices/" + "tet:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment ingress label restrictions 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" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment ingress label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment ingress label restrictions end 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-end/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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"; } @@ -2301,56 +2360,55 @@ + "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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment egress label restrictions 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" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment egress label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } - /* Augment egress label restrictions end 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-end/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -2351,59 +2409,60 @@ + "tet:connectivity-matrix/" + "tet:to/tet:label-restrictions/tet:label-restriction/" + "tet:label-end/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment label hop of underlay primary path 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:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } + /* Augment label hop of underlay backup path 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:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -2404,97 +2463,96 @@ + "tet:connectivity-matrix/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude 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:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-include 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:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of path-route 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:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label restrictions 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" { when "../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } - /* Augment label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } @@ -2493,56 +2551,55 @@ + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/" + "tet:label-restrictions/tet:label-restriction/" + "tet:label-start/tet:te-label/tet:technology" { when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end 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-end/tet:te-label/tet:technology"{ when "../../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } - /* Augment label hop of underlay primary path * of local-link-connectivities */ 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:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { @@ -2543,102 +2600,101 @@ + "tet:local-link-connectivities/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path * of local-link-connectivities */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude of * local-link-connectivities */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-include of * local-link-connectivities */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/" + "tet:optimizations/tet:algorithm/tet:metric/" + "tet:optimization-metric/" + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of path-route of local-link-connectivities */ augment "/nw:networks/nw:network/nw:node/tet:te/" + "tet:tunnel-termination-point/" + "tet:local-link-connectivities/" + "tet:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } - /* Augment label restrictions 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" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } @@ -2636,57 +2692,58 @@ 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" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label start 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-start/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label end 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-end/tet:te-label/tet:technology" { when "../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } + } /* Augment label 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 "../../../../../../../../" @@ -2689,59 +2746,59 @@ + "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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment label hop of underlay primary path * 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:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path 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:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-exclude 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:optimizations/tet:algorithm/tet:metric/" @@ -2749,21 +2806,21 @@ + "tet:explicit-route-exclude-objects/" + "tet:route-object-exclude-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of route-include 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:optimizations/tet:algorithm/tet:metric/" @@ -2771,23 +2828,24 @@ + "tet:explicit-route-include-objects/" + "tet:route-object-include-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } + /* Augment label hop of path-route 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:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" @@ -2790,184 +2848,184 @@ + "tet:path-properties/tet:path-route-objects/" + "tet:path-route-object/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay primary path of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { when "../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label restrictions of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:label-restrictions/tet:label-restriction" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label restrictions start of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:label-restrictions/tet:label-restriction/" + "tet:label-start/tet:te-label/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end of TE link */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:te-link-attributes/" + "tet:label-restrictions/tet:label-restriction/" + "tet:label-end/tet:te-label/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment label restrictions of TE link information-source */ augment "/nw:networks/nw:network/nt:link/tet:te/" + "tet:information-source-entry/" + "tet:label-restrictions/tet:label-restriction" { when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label restrictions start 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-start/tet:te-label/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end 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-end/tet:te-label/tet:technology" { when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } /* Augment label hop of underlay primary path of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:underlay/tet:primary-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { /* when "../../../../../../../../../../" + "nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } */ description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label hop of underlay backup path of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { /* when "../../../../../../../../../../nw:network-types/" @@ -2966,57 +3024,56 @@ /* Augment label hop of underlay backup path of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:underlay/tet:backup-path/tet:path-element/tet:type/" + "tet:label/tet:label-hop/tet:te-label/tet:technology" { /* when "../../../../../../../../../../nw:network-types/" + "tet:te-topology/otntopo:otn-topology" { description "Augment OTN TE label"; - } */ description "OTN label."; case otn { - uses layer1-types:otn-label-hop; + uses l1-types:otn-label-hop; } } /* Augment label restrictions of TE link template */ augment "/nw:networks/tet:te/tet:templates/" + "tet:link-template/tet:te-link-attributes/" + "tet:label-restrictions/tet:label-restriction" { /* when "../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } */ description "OTN label."; - uses layer1-types:otn-label-range-info; + uses l1-types:otn-label-range-info; } /* Augment label restrictions start 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-start/tet:te-label/tet:technology" { /* when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; } */ description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* Augment label restrictions end 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-end/tet:te-label/tet:technology" { /* when "../../../../../../../nw:network-types/tet:te-topology/" @@ -3015,57 +3072,63 @@ /* Augment label restrictions end 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-end/tet:te-label/tet:technology" { /* when "../../../../../../../nw:network-types/tet:te-topology/" + "otntopo:otn-topology" { description "Augment OTN TE label"; - } */ description "OTN label."; case otn { - uses layer1-types:otn-label-start-end; + uses l1-types:otn-label-start-end; } } /* 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 layer1-types:otn-label-step; + uses l1-types:otn-label-step; } } } 5. IANA Considerations It is proposed that IANA should assign new URIs from the "IETF XML - Registry" [RFC3688] as follows: URI: - 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 - registers a YANG module in the YANG Module Names registry [RFC7950]. - name: ietf-otn-topology namespace: urn:ietf:params:xml:ns:yang:ietf- - otn-topology prefix: otntopo reference: RFC XXXX + Registry" [RFC3688] as follows: + + URI: 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 registers a YANG module in the YANG Module Names + registry [RFC7950]. + + name: ietf-otn-topology + namespace: urn:ietf:params:xml:ns:yang:ietf-otn-topology + prefix: otntopo + reference: RFC XXXX 6. Security Considerations The YANG module specified in this document defines a schema for data that is designed to be accessed via network management protocols such as NETCONF [RFC6241] or RESTCONF [RFC8040]. The lowest NETCONF layer is the secure transport layer, and the mandatory-to-implement secure transport is Secure Shell (SSH) [RFC6242]. The lowest RESTCONF layer is HTTPS, and the mandatory-to-implement secure transport is TLS [RFC8446]. @@ -3141,44 +3204,49 @@ Telefonica Email: victor.lopezalvarez@telefonica.com Yunbo Li China Mobile Email: liyunbo@chinamobile.com Dieter Beller Nokia Email: dieter.beller@nokia.com - Yanlei Zheng China Unicom Email: zhengyanlei@chinaunicom.cn 9. References 9.1. Normative References + [I-D.ietf-ccamp-layer1-types] + Zheng, H. and I. Busi, "A YANG Data Model for Layer 1 + Types", draft-ietf-ccamp-layer1-types-04 (work in + progress), December 2019. + [I-D.ietf-ccamp-otn-tunnel-model] Zheng, H., Busi, I., Belotti, S., Lopezalvarez, V., and Y. Xu, "OTN Tunnel YANG Model", draft-ietf-ccamp-otn-tunnel- - model-08 (work in progress), October 2019. + model-09 (work in progress), November 2019. [I-D.ietf-teas-yang-te-topo] Liu, X., Bryskin, I., Beeram, V., Saad, T., Shah, H., and O. Dios, "YANG Data Model for Traffic Engineering (TE) Topologies", draft-ietf-teas-yang-te-topo-22 (work in progress), June 2019. - [ITU-T] ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA, + [ITU-Tg709] + ITU-, T., "SERIES G: TRANSMISSION SYSTEMS AND MEDIA, DIGITAL SYSTEMS AND NETWORKS; Digital networks; Interfaces - for the optical transport network", ITU-T Rec. G.709v5 , - June 2016. + for the optical transport network", ITU-T Rec. G.709 , + March 2020. [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, . [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, DOI 10.17487/RFC3688, January 2004, . @@ -3190,28 +3258,38 @@ [RFC6242] Wasserman, M., "Using the NETCONF Protocol over Secure Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011, . [RFC7138] Ceccarelli, D., Ed., Zhang, F., Belotti, S., Rao, R., and J. Drake, "Traffic Engineering Extensions to OSPF for GMPLS Control of Evolving G.709 Optical Transport Networks", RFC 7138, DOI 10.17487/RFC7138, March 2014, . + [RFC7139] Zhang, F., Ed., Zhang, G., Belotti, S., Ceccarelli, D., + and K. Pithewan, "GMPLS Signaling Extensions for Control + of Evolving G.709 Optical Transport Networks", RFC 7139, + DOI 10.17487/RFC7139, March 2014, + . + [RFC7950] Bjorklund, M., Ed., "The YANG 1.1 Data Modeling Language", RFC 7950, DOI 10.17487/RFC7950, August 2016, . [RFC8040] Bierman, A., Bjorklund, M., and K. Watsen, "RESTCONF Protocol", RFC 8040, DOI 10.17487/RFC8040, January 2017, . + [RFC8174] Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC + 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, + May 2017, . + [RFC8341] Bierman, A. and M. Bjorklund, "Network Configuration Access Control Model", STD 91, RFC 8341, DOI 10.17487/RFC8341, March 2018, . [RFC8342] Bjorklund, M., Schoenwaelder, J., Shafer, P., Watsen, K., and R. Wilton, "Network Management Datastore Architecture (NMDA)", RFC 8342, DOI 10.17487/RFC8342, March 2018, . @@ -3220,43 +3298,43 @@ Network Topologies", RFC 8345, DOI 10.17487/RFC8345, March 2018, . [RFC8446] Rescorla, E., "The Transport Layer Security (TLS) Protocol Version 1.3", RFC 8446, DOI 10.17487/RFC8446, August 2018, . 9.2. Informative References [I-D.ietf-ccamp-flexigrid-yang] - Madrid, U., Perdices, D., Lopezalvarez, V., King, D., and - Y. Lee, "YANG data model for Flexi-Grid Optical Networks", - draft-ietf-ccamp-flexigrid-yang-04 (work in progress), - July 2019. + Madrid, U., Perdices, D., Lopezalvarez, V., King, D., Lee, + Y., and H. Zheng, "YANG data model for Flexi-Grid Optical + Networks", draft-ietf-ccamp-flexigrid-yang-05 (work in + progress), January 2020. [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-08 (work in progress), + ccamp-transport-nbi-app-statement-10 (work in progress), November 2019. [I-D.ietf-ccamp-wson-yang] - Lee, Y., Dhody, D., Guo, A., Lopezalvarez, V., and D. + Zheng, H., Lee, Y., Guo, A., Lopezalvarez, V., and D. King, "A YANG Data Model for WSON (Wavelength Switched - Optical Networks)", draft-ietf-ccamp-wson-yang-22 (work in - progress), July 2019. + Optical Networks)", draft-ietf-ccamp-wson-yang-23 (work in + progress), November 2019. [I-D.ietf-teas-actn-yang] Lee, Y., Zheng, H., Ceccarelli, D., Yoon, B., Dios, O., Shin, J., and S. Belotti, "Applicability of YANG models for Abstraction and Control of Traffic Engineered - Networks", draft-ietf-teas-actn-yang-04 (work in - progress), August 2019. + Networks", draft-ietf-teas-actn-yang-05 (work in + progress), February 2020. [RFC7062] Zhang, F., Ed., Li, D., Li, H., Belotti, S., and D. Ceccarelli, "Framework for GMPLS and PCE Control of G.709 Optical Transport Networks", RFC 7062, DOI 10.17487/RFC7062, November 2013, . [RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams", BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018, . @@ -3260,24 +3338,23 @@ [RFC8340] Bjorklund, M. and L. Berger, Ed., "YANG Tree Diagrams", BCP 215, RFC 8340, DOI 10.17487/RFC8340, March 2018, . [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, . Authors' Addresses - Haomian Zheng Huawei Technologies - H1-1-A043S Huawei Industrial Base, Songshanhu + H1, Huawei Industrial Base, Songshan Lake Dongguan, Guangdong 523808 China Email: zhenghaomian@huawei.com Italo Busi Huawei Technologies HUAWEI TECHNOLOGIES ITALIA Srl Centro Direzionale Milano 2 Milan, Milan 20090 Italy