--- 1/draft-ietf-mpls-static-yang-02.txt 2017-03-13 10:13:09.526479933 -0700 +++ 2/draft-ietf-mpls-static-yang-03.txt 2017-03-13 10:13:09.562480781 -0700 @@ -1,32 +1,32 @@ MPLS Working Group T. Saad Internet-Draft K. Raza Intended status: Standards Track R. Gandhi -Expires: July 12, 2017 Cisco Systems Inc +Expires: September 14, 2017 Cisco Systems, Inc. X. Liu - Ericsson + Jabil V. Beeram Juniper Networks H. Shah Ciena I. Bryskin X. Chen Huawei Technologies R. Jones Brocade B. Wen Comcast - January 08, 2017 + March 13, 2017 A YANG Data Model for MPLS Static LSPs - draft-ietf-mpls-static-yang-02 + draft-ietf-mpls-static-yang-03 Abstract This document contains the specification for the MPLS Static Label Switched Paths (LSPs) YANG model. The model allows for the provisioning of static LSP(s) on LER(s) and LSR(s) devices along a LSP path without the dependency on any signaling protocol. The MPLS Static LSP model augments the MPLS base YANG model with specific data to configure and manage MPLS Static LSP(s). @@ -38,21 +38,21 @@ 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 http://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 July 12, 2017. + This Internet-Draft will expire on September 14, 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 @@ -180,89 +180,93 @@ augment /rt:routing/mpls:mpls: +--rw static-lsps +--rw static-lsp* [name] | +--rw name string | +--rw config | | +--rw in-segment | | | +--rw (type)? | | | | +--:(ip-prefix) | | | | | +--rw ip-prefix? inet:ip-prefix | | | | +--:(mpls-label) - | | | | | +--rw incoming-label? mpls:mpls-label + | | | | | +--rw incoming-label? rt-types:mpls-label | | | | +--:(tunnel) | | | | +--rw tunnel? te:tunnel-ref | | | +--rw incoming-interface? if:interface-ref | | +--rw operation? enumeration | | +--rw (out-segment)? | | +--:(simple-path) | | | +--rw next-hop? inet:ip-address - | | | +--rw outgoing-label? mpls:mpls-label + | | | +--rw outgoing-label? rt-types:mpls-label | | | +--rw outgoing-interface? if:interface-ref | | +--:(path-list) | | +--rw paths* [path-index] | | +--rw path-index uint16 | | +--rw backup-path-index? uint16 | | +--rw next-hop? inet:ip-address - | | +--rw outgoing-labels* mpls:mpls-label + | | +--rw outgoing-labels* rt-types:mpls-label | | +--rw outgoing-interface? if:interface-ref | | +--rw loadshare? uint16 | | +--rw role? enumeration | +--ro state | +--ro in-segment | | +--ro (type)? | | | +--:(ip-prefix) | | | | +--ro ip-prefix? inet:ip-prefix | | | +--:(mpls-label) - | | | | +--ro incoming-label? mpls:mpls-label + | | | | +--ro incoming-label? rt-types:mpls-label | | | +--:(tunnel) | | | +--ro tunnel? te:tunnel-ref | | +--ro incoming-interface? if:interface-ref | +--ro operation? enumeration | +--ro (out-segment)? | +--:(simple-path) | | +--ro next-hop? inet:ip-address - | | +--ro outgoing-label? mpls:mpls-label + | | +--ro outgoing-label? rt-types:mpls-label | | +--ro outgoing-interface? if:interface-ref | +--:(path-list) | +--ro paths* [path-index] | +--ro path-index uint16 | +--ro backup-path-index? uint16 | +--ro next-hop? inet:ip-address - | +--ro outgoing-labels* mpls:mpls-label + | +--ro outgoing-labels* rt-types:mpls-label | +--ro outgoing-interface? if:interface-ref | +--ro loadshare? uint16 | +--ro role? enumeration +--rw mpls-static-ext:bandwidth? uint32 +--rw mpls-static-ext:lsp-priority-setup? uint8 +--rw mpls-static-ext:lsp-priority-hold? uint8 Figure 2: MPLS Static LSP tree diagram 1.4. MPLS Static LSP YANG Module(s) The MPLS Static LSP module is shown in Figure 3. - file "ietf-mpls-static@2016-07-05.yang" + file "ietf-mpls-static@2017-03-10.yang" module ietf-mpls-static { namespace "urn:ietf:params:xml:ns:yang:ietf-mpls-static"; prefix "mpls-static"; import ietf-mpls { prefix mpls; } import ietf-routing { prefix "rt"; } + import ietf-routing-types { + prefix "rt-types"; + } + import ietf-inet-types { prefix inet; } import ietf-interfaces { prefix "if"; } /* Import TE generic types */ import ietf-te { @@ -312,21 +316,21 @@ Editor: Raqib Jones Editor: Bin Wen "; description "This YANG module augments the 'ietf-routing' module with basic configuration and operational state data for MPLS static"; - revision "2016-07-05" { + revision "2017-03-10" { description "Latest revision: - Addressed MPLS-RT review comments"; reference "RFC 3031: A YANG Data Model for Static MPLS LSPs"; } typedef static-lsp-ref { type leafref { path "/rt:routing/mpls:mpls/mpls-static:static-lsps/" + "mpls-static:static-lsp/mpls-static:name"; @@ -338,21 +343,21 @@ grouping path-basic_config { description "common definitions for statics"; leaf next-hop { type inet:ip-address; description "next hop IP address for the LSP"; } leaf outgoing-label { - type mpls:mpls-label; + type rt-types:mpls-label; description "label value to push at the current hop for the LSP"; } leaf outgoing-interface { type if:interface-ref; description "The outgoing interface"; } @@ -371,23 +376,22 @@ type uint16; description "Backup path identifier"; } leaf next-hop { type inet:ip-address; description "The address of the next-hop"; } - leaf-list outgoing-labels { - type mpls:mpls-label; + type rt-types:mpls-label; ordered-by user; description "The outgoing MPLS labels to impose"; } leaf outgoing-interface { type if:interface-ref; description "The outgoing interface"; } @@ -431,21 +436,21 @@ description "Basic FEC choice"; case ip-prefix { leaf ip-prefix { type inet:ip-prefix; description "An IP prefix"; } } case mpls-label { leaf incoming-label { - type mpls:mpls-label; + type rt-types:mpls-label; description "label value on the incoming packet"; } } case tunnel { leaf tunnel { type te:tunnel-ref; description "TE tunnel FEC mapping"; } } } @@ -782,38 +788,38 @@ 4.2. Informative References [I-D.openconfig-netmod-opstate] Shakir, R., Shaikh, A., and M. Hines, "Consistent Modeling of Operational State Data in YANG", draft-openconfig- netmod-opstate-01 (work in progress), July 2015. Authors' Addresses Tarek Saad - Cisco Systems Inc + Cisco Systems, Inc. Email: tsaad@cisco.com Kamran Raza - Cisco Systems Inc + Cisco Systems, Inc. Email: skraza@cisco.com Rakesh Gandhi - Cisco Systems Inc + Cisco Systems, Inc. Email: rgandhi@cisco.com Xufeng Liu - Ericsson + Jabil - Email: xufeng.liu.ietf@gmail.com + Email: Xufeng_Liu@jabil.com Vishnu Pavan Beeram Juniper Networks Email: vbeeram@juniper.net Himanshu Shah Ciena Email: hshah@ciena.com