--- 1/draft-ietf-teas-yang-te-topo-07.txt 2017-03-13 09:14:43.123953187 -0700 +++ 2/draft-ietf-teas-yang-te-topo-08.txt 2017-03-13 09:14:43.327957988 -0700 @@ -4,24 +4,24 @@ Huawei Technologies Vishnu Pavan Beeram Juniper Networks Tarek Saad Cisco Systems Inc Himanshu Shah Ciena Oscar Gonzalez De Dios Telefonica -Expires: September 12, 2017 March 12, 2017 +Expires: September 13, 2017 March 13, 2017 YANG Data Model for TE Topologies - draft-ietf-teas-yang-te-topo-07 + draft-ietf-teas-yang-te-topo-08 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), its areas, and its working groups. Note that other groups may also distribute working documents as Internet- Drafts. @@ -30,21 +30,21 @@ 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." The list of current Internet-Drafts can be accessed at http://www.ietf.org/ietf/1id-abstracts.txt The list of Internet-Draft Shadow Directories can be accessed at http://www.ietf.org/shadow.html - This Internet-Draft will expire on September 12, 2017. + This Internet-Draft will expire on September 13, 2017. Copyright Notice Copyright (c) 2017 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 (http://trustee.ietf.org/license-info) in effect on the date of publication of this document. Please review these documents @@ -101,24 +101,24 @@ 5.5. Generic TE Link Attributes...............................27 5.6. Generic TE Node Attributes...............................28 5.7. TED Information Sources..................................30 5.8. Overlay/Underlay Relationship............................31 5.9. Templates................................................32 5.10. Scheduling Parameters...................................33 5.11. Notifications...........................................33 6. Tree Structure................................................34 7. TE Topology Yang Module.......................................66 8. Security Considerations......................................117 - 9. IANA Considerations..........................................117 + 9. IANA Considerations..........................................118 10. References..................................................118 10.1. Normative References...................................118 - 10.2. Informative References.................................118 + 10.2. Informative References.................................119 11. Acknowledgments.............................................119 Contributors....................................................119 Authors' Addresses..............................................119 1. Introduction The Traffic Engineering Database (TED) is an essential component of Traffic Engineered (TE) systems that are based on MPLS-TE [RFC2702] and GMPLS [RFC3945]. The TED is a collection of all TE information about all TE nodes and TE links in the network. The TE Topology is a @@ -2539,22 +2539,22 @@ | | +--ro in-service-clears? yang:counter32 | | +--ro in-service-sets? yang:counter32 | +--ro local-link-connectivity | +--ro creates? yang:counter32 | +--ro deletes? yang:counter32 | +--ro disables? yang:counter32 | +--ro enables? yang:counter32 | +--ro modifies? yang:counter32 +--rw supporting-tunnel-termination-point* [node-ref tunnel- tp-ref] - +--rw node-ref union - +--rw tunnel-tp-ref union + +--rw node-ref inet:uri + +--rw tunnel-tp-ref binary augment /nw:networks/nw:network/nt:link: +--rw te! +--rw config | +--rw (bundle-stack-level)? | | +--:(bundle) | | | +--rw bundled-links | | | +--rw bundled-link* [sequence] | | | +--rw sequence uint32 | | | +--rw src-tp-ref? leafref | | | +--rw des-tp-ref? leafref @@ -2855,21 +2855,21 @@ | +--ro priority uint8 | +--ro bandwidth? te-bandwidth +--ro inter-layer-lock-id? uint32 +--ro geolocation +--ro altitude? int64 +--ro latitude? geographic-coordinate-degree +--ro longitude? geographic-coordinate-degree 7. TE Topology Yang Module - file "ietf-te-topology@2017-03-10.yang" + file "ietf-te-topology@2017-03-12.yang" module ietf-te-topology { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-te-topology"; prefix "tet"; import ietf-yang-types { prefix "yang"; } @@ -2919,21 +2919,21 @@ Editor: Himanshu Shah Editor: Oscar Gonzalez De Dios "; description "TE topology model"; - revision "2017-03-10" { + revision "2017-03-12" { description "Initial revision"; reference "TBD"; } /* * Features */ feature nsrlg { description "This feature indicates that the system supports NSRLG (Not Sharing Risk Link Group)."; @@ -4184,20 +4184,23 @@ uses statistics-per-ttp; } // statistics // Relations to other tunnel termination points list supporting-tunnel-termination-point { key "node-ref tunnel-tp-ref"; description "Identifies the tunnel termination points, that this tunnel termination point is depending on."; leaf node-ref { + type inet:uri; + /* The followings are the intended valications + * but some Yang validation tools fail on them. type union { type leafref { path "../../../../nw:supporting-node/nw:node-ref"; require-instance false; } type leafref { path "/nw:networks/nw:network"+ "[nw:network-id="+ "current()/../../../../te/config/"+ "te-node-attributes/underlay-topology/"+ @@ -4205,26 +4208,31 @@ require-instance false; } type leafref { path "/nw:networks/nw:network"+ "[nw:network-id="+ "current()/../../../../te/state/"+ "te-node-attributes/underlay-topology/"+ "network-ref]/nw:node/nw:node-id"; require-instance false; } + } + ***************************************************/ description "This leaf identifies in which node the supporting tunnel termination point is present."; } leaf tunnel-tp-ref { + type binary; + /* The followings are the intended valications + * but some Yang validation tools fail on them. type union { type leafref { path "/nw:networks/nw:network"+ "[nw:network-id="+ "current()/../../../../nw:supporting-node/"+ "nw:network-ref]/"+ "nw:node[nw:node-id=current()/../node-ref]/te/"+ "tunnel-termination-point/tunnel-tp-id"; require-instance false; } @@ -4241,28 +4249,30 @@ type leafref { path "/nw:networks/nw:network"+ "[nw:network-id="+ "current()/../../../../te/state/"+ "te-node-attributes/underlay-topology/"+ "network-ref]/"+ "nw:node[nw:node-id=current()/../node-ref]/te/"+ "tunnel-termination-point/tunnel-tp-id"; require-instance false; } + } + ***************************************************/ description - "Reference to the underlay node, must be in a - different topology"; + "Reference to a tunnel terminiation point, which is + either in the supporting node or a node in an + underlay topology."; } } // supporting-tunnel-termination-point } // tunnel-termination-point - } // te } // te-node-augment grouping te-node-config { description "TE node configuration grouping."; leaf-list te-node-template { if-feature template; type leafref { path "../../../../../te/templates/node-template/name";