--- 1/draft-ietf-teas-yang-te-topo-11.txt 2017-07-17 05:15:58.762504949 -0700 +++ 2/draft-ietf-teas-yang-te-topo-12.txt 2017-07-17 05:15:59.098513007 -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: January 3, 2018 July 3, 2017 +Expires: January 17, 2018 July 17, 2017 YANG Data Model for TE Topologies - draft-ietf-teas-yang-te-topo-11 + draft-ietf-teas-yang-te-topo-12 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 January 3, 2018. + This Internet-Draft will expire on January 17, 2018. 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 @@ -105,21 +105,21 @@ 5.9. Templates................................................30 5.10. Scheduling Parameters...................................31 5.11. Notifications...........................................31 6. Tree Structure................................................32 7. TE Topology Yang Module.......................................68 8. Security Considerations......................................115 9. IANA Considerations..........................................115 10. References..................................................116 10.1. Normative References...................................116 10.2. Informative References.................................116 - 11. Acknowledgments.............................................116 + 11. Acknowledgments.............................................117 Appendix A. Companion YANG Model for Non-NMDA Compliant Implementations.................................................118 A.1. TE Topology State Yang Module...........................118 Contributors....................................................125 Authors' Addresses..............................................126 1. Introduction The Traffic Engineering Database (TED) is an essential component of Traffic Engineered (TE) systems that are based on MPLS-TE [RFC2702] @@ -3029,21 +3029,21 @@ | +--rw generic? te-bandwidth +--rw inter-layer-lock-id* uint32 +--ro oper-status? te-types:te-oper-status +--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-07-02.yang" + file "ietf-te-topology@2017-07-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"; } @@ -3061,21 +3061,21 @@ import ietf-network-topology { prefix "nt"; } import ietf-routing-types { prefix "rt-types"; } organization - "Traffic Engineering Architecture and Signaling (TEAS) + "IETF Traffic Engineering Architecture and Signaling (TEAS) Working Group"; contact "WG Web: WG List: WG Chair: Lou Berger WG Chair: Vishnu Pavan Beeram @@ -3093,23 +3093,25 @@ Editor: Himanshu Shah Editor: Oscar Gonzalez De Dios "; description "TE topology model"; - revision "2017-07-02" { + revision "2017-07-12" { description "Initial revision"; - reference "TBD"; + reference "RFC XXXX: YANG Data Model for TE Topologies"; + // RFC Ed.: replace XXXX with actual RFC number and remove + // this note } /* * Features */ feature nsrlg { description "This feature indicates that the system supports NSRLG (Not Sharing Risk Link Group)."; } @@ -4824,32 +4828,32 @@ } } augment "/nw:networks" { description "Augmentation parameters for TE topologies."; uses te-topologies-augment; } augment "/nw:networks/nw:network" { - when "nw:network-types/te-topology" { + when "nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE topology."; uses te-topology-augment; } augment "/nw:networks/nw:network/nw:node" { - when "../nw:network-types/te-topology" { + when "../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at node level."; leaf te-node-id { type te-types:te-node-id; description "The identifier of a node in the TE topology. @@ -4867,21 +4871,21 @@ the underlay-topology is used."; } presence "TE support."; description "Indicates TE support."; uses te-node-augment; } // te } augment "/nw:networks/nw:network/nt:link" { - when "../nw:network-types/te-topology" { + when "../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at link level."; container te { must "count(../nt:supporting-link)<=1" { description "For a link in a TE topology, there cannot be more @@ -4890,34 +4894,34 @@ } presence "TE support."; description "Indicates TE support."; uses te-link-augment; } // te } augment "/nw:networks/nw:network/nw:node/" + "nt:termination-point" { - when "../../nw:network-types/te-topology" { + when "../../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at termination point level."; uses te-termination-point-augment; } augment "/nw:networks/nw:network/nt:link/te/bundle-stack-level/" + "bundle/bundled-links/bundled-link" { - when "../../../../nw:network-types/te-topology" { + when "../../../../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE link bundled link."; leaf src-tp-ref { type leafref { path "../../../../../nw:node[nw:node-id = " + "current()/../../../../nt:source/" @@ -4940,46 +4944,48 @@ description "Reference to another TE termination point on the same destination node."; } } augment "/nw:networks/nw:network/nw:node/te/" + "information-source-entry/connectivity-matrices/" + "connectivity-matrix" { - when "../../../../../nw:network-types/te-topology" { + when "../../../../../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node connectivity-matrix."; uses te-node-connectivity-matrix-attributes; } augment "/nw:networks/nw:network/nw:node/te/te-node-attributes/" + "connectivity-matrices/connectivity-matrix" { - when "../../../../../nw:network-types/te-topology" { + when "../../../../../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node connectivity-matrix."; uses te-node-connectivity-matrix-attributes; + } + augment "/nw:networks/nw:network/nw:node/te/" + "tunnel-termination-point/local-link-connectivities" { - when "../../../../nw:network-types/te-topology" { + when "../../../../nw:network-types/tet:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node tunnel termination point LLCs (Local Link Connectivities)."; uses te-node-tunnel-termination-point-llc-list; } } @@ -5078,21 +5084,21 @@ The companion module, ietf-te-topology-state, is redundant and SHOULD NOT be supported by implementations that support NMDA. As the structure of the module ietf-te-topology-state mirrors that of the module ietf-te-topology. The YANG tree of the module ietf-te- topology-state is not depicted separately. A.1. TE Topology State Yang Module - file "ietf-te-topology-state@2017-07-02.yang" + file "ietf-te-topology-state@2017-07-12.yang" module ietf-te-topology-state { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-te-topology-state"; prefix "tet-s"; import ietf-te-types { prefix "te-types"; } @@ -5101,21 +5107,21 @@ } import ietf-network-state { prefix "nw-s"; } import ietf-network-topology-state { prefix "nt-s"; } organization - "Traffic Engineering Architecture and Signaling (TEAS) + "IETF Traffic Engineering Architecture and Signaling (TEAS) Working Group"; contact "WG Web: WG List: WG Chair: Lou Berger WG Chair: Vishnu Pavan Beeram @@ -5134,25 +5140,26 @@ Editor: Himanshu Shah Editor: Oscar Gonzalez De Dios "; description "TE topology state model"; - revision "2017-07-02" { + revision "2017-07-12" { description "Initial revision"; - reference "TBD"; + reference "RFC XXXX: YANG Data Model for TE Topologies"; + // RFC Ed.: replace XXXX with actual RFC number and remove + // this note } - /* * Groupings */ grouping te-node-connectivity-matrix-attributes { description "Termination point references of a connectivity matrix entry."; container from { description "Reference to source link termination point."; leaf tp-ref { @@ -5221,34 +5227,33 @@ description "Its presence identifies the TE topology type."; } } augment "/nw-s:networks" { description "Augmentation parameters for TE topologies."; uses tet:te-topologies-augment; } - augment "/nw-s:networks/nw-s:network" { - when "nw-s:network-types/te-topology" { + when "nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE topology."; uses tet:te-topology-augment; } augment "/nw-s:networks/nw-s:network/nw-s:node" { - when "../nw-s:network-types/te-topology" { + when "../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at node level."; leaf te-node-id { type te-types:te-node-id; description "The identifier of a node in the TE topology. @@ -5262,24 +5267,26 @@ must "count(../nw-s:supporting-node)<=1" { description "For a node in a TE topology, there cannot be more than 1 supporting node. If multiple nodes are abstracted, the underlay-topology is used."; } presence "TE support."; description "Indicates TE support."; uses tet:te-node-augment; + } // te } + augment "/nw-s:networks/nw-s:network/nt-s:link" { - when "../nw-s:network-types/te-topology" { + when "../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at link level."; container te { must "count(../nt-s:supporting-link)<=1" { description "For a link in a TE topology, there cannot be more @@ -5288,34 +5295,34 @@ } presence "TE support."; description "Indicates TE support."; uses tet:te-link-augment; } // te } augment "/nw-s:networks/nw-s:network/nw-s:node/" + "nt-s:termination-point" { - when "../../nw-s:network-types/te-topology" { + when "../../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Configuration parameters for TE at termination point level."; uses tet:te-termination-point-augment; } augment "/nw-s:networks/nw-s:network/nt-s:link/te/bundle-stack-level/" + "bundle/bundled-links/bundled-link" { - when "../../../../nw-s:network-types/te-topology" { + when "../../../../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE link bundled link."; leaf src-tp-ref { type leafref { path "../../../../../nw-s:node[nw-s:node-id = " + "current()/../../../../nt-s:source/" @@ -5338,48 +5345,47 @@ description "Reference to another TE termination point on the same destination node."; } } augment "/nw-s:networks/nw-s:network/nw-s:node/te/" + "information-source-entry/connectivity-matrices/" + "connectivity-matrix" { - when "../../../../../nw-s:network-types/te-topology" { + when "../../../../../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node connectivity-matrix."; - uses te-node-connectivity-matrix-attributes; } augment "/nw-s:networks/nw-s:network/nw-s:node/te/te-node-attributes/" + "connectivity-matrices/connectivity-matrix" { - when "../../../../../nw-s:network-types/te-topology" { + when "../../../../../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node connectivity-matrix."; uses te-node-connectivity-matrix-attributes; } augment "/nw-s:networks/nw-s:network/nw-s:node/te/" + "tunnel-termination-point/local-link-connectivities" { - when "../../../../nw-s:network-types/te-topology" { + when "../../../../nw-s:network-types/tet-s:te-topology" { description "Augmentation parameters apply only for networks with TE topology type."; } description "Augment TE node tunnel termination point LLCs (Local Link Connectivities)."; uses te-node-tunnel-termination-point-llc-list; } }