--- 1/draft-ietf-ospf-yang-28.txt 2019-10-17 10:13:05.527346285 -0700 +++ 2/draft-ietf-ospf-yang-29.txt 2019-10-17 10:13:05.747351865 -0700 @@ -1,25 +1,25 @@ Internet D. Yeung Internet-Draft Arrcus Intended status: Standards Track Y. Qu -Expires: February 27, 2020 Futurewei +Expires: April 19, 2020 Futurewei J. Zhang Juniper Networks I. Chen The MITRE Corporation A. Lindem Cisco Systems - August 26, 2019 + October 17, 2019 YANG Data Model for OSPF Protocol - draft-ietf-ospf-yang-28 + draft-ietf-ospf-yang-29 Abstract This document defines a YANG data model that can be used to configure and manage OSPF. The model is based on YANG 1.1 as defined in RFC 7950 and conforms to the Network Management Datastore Architecture (NMDA) as described in RFC 8342. Status of This Memo @@ -29,21 +29,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 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 February 27, 2020. + This Internet-Draft will expire on April 19, 2020. Copyright Notice Copyright (c) 2019 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 @@ -1092,21 +1092,21 @@ -> /rt:routing/control-plane-protocols/ control-plane-protocol/name 3. OSPF YANG Module The following RFCs and drafts are not referenced in the document text but are referenced in the ietf-ospf.yang module: [RFC0905], [RFC4576], [RFC4973], [RFC5250], [RFC5309], [RFC5642], [RFC5881], [RFC6991], [RFC7770], [RFC7884], [RFC8294], and [RFC8476]. - file "ietf-ospf@2019-08-26.yang" + file "ietf-ospf@2019-10-17.yang" module ietf-ospf { yang-version 1.1; namespace "urn:ietf:params:xml:ns:yang:ietf-ospf"; prefix ospf; import ietf-inet-types { prefix "inet"; reference "RFC 6991: Common YANG Data Types"; } @@ -1198,21 +1198,21 @@ The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'NOT RECOMMENDED', 'MAY', and 'OPTIONAL' in this document are to be interpreted as described in BCP 14 (RFC 2119) (RFC 8174) when, and only when, they appear in all capitals, as shown here. This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2019-08-26 { + revision 2019-10-17 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for OSPF."; } feature multi-topology { description "Support Multiple-Topology Routing (MTR)."; reference "RFC 4915: Multi-Topology Routing"; @@ -4758,21 +4758,21 @@ determine interface cost (Mbits). The cost is the reference bandwidth divided by the interface speed with 1 being the minimum cost."; } } container spf-control { leaf paths { if-feature max-ecmp; type uint16 { - range "1..32"; + range "1..65535"; } description "Maximum number of Equal-Cost Multi-Path (ECMP) paths."; } container ietf-spf-delay { if-feature ietf-spf-delay; uses ietf-spf-delay; description "IETF SPF delay algorithm configuration."; } @@ -5122,21 +5122,21 @@ } description "This reason for the LSA log entry."; } } } } augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol" { - when "derived-from(rt:type, 'ospf-protocol')" { + when "derived-from(rt:type, 'ospf')" { description "This augmentation is only valid for a routing protocol instance of OSPF (type 'ospfv2' or 'ospfv3')."; } description "OSPF protocol ietf-routing module control-plane-protocol augmentation."; container ospf { description "OSPF protocol Instance"; @@ -5241,21 +5241,21 @@ uses interface-state; } } } } } } augment "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/ospf" { - when "derived-from(../rt:type, 'ospf-protocol')" { + when "derived-from(../rt:type, 'ospf')" { description "This augmentation is only valid for OSPF (type 'ospfv2' or 'ospfv3')."; } if-feature multi-topology; description "OSPF multi-topology instance configuration state augmentation."; container topologies { @@ -5368,21 +5368,21 @@ default "0"; description "OSPF route tag."; } leaf route-type { type route-type; description "OSPF route type"; } } augment "/rt:routing/rt:ribs/rt:rib/rt:routes/rt:route" { - when "derived-from(rt:source-protocol, 'ospf-protocol')" { + when "derived-from(rt:source-protocol, 'ospf')" { description "This augmentation is only valid for routes whose source protocol is OSPF."; } description "OSPF-specific route attributes."; uses route-content; } /* @@ -5461,21 +5461,21 @@ data for OSPF notifications."; leaf routing-protocol-name { type leafref { path "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol/rt:name"; } must "derived-from( " + "/rt:routing/rt:control-plane-protocols/" + "rt:control-plane-protocol[rt:name=current()]/" - + "rt:type, 'ospf-protocol')"; + + "rt:type, 'ospf')"; description "OSPF routing protocol instance name."; } leaf address-family { type leafref { path "/rt:routing/" + "rt:control-plane-protocols/rt:control-plane-protocol" + "[rt:name=current()/../routing-protocol-name]/" + "ospf/address-family"; @@ -5894,22 +5894,23 @@ registry [RFC6020]. name: ietf-ospf namespace: urn:ietf:params:xml:ns:yang:ietf-ospf prefix: ospf reference: RFC XXXX 6. Acknowledgements The authors wish to thank Yi Yang, Alexander Clemm, Gaurav Gupta, - Ladislav Lhotka, Stephane Litkowski, Greg Hankins, Manish Gupta and - Alan Davey for their thorough reviews and helpful comments. + Ladislav Lhotka, Stephane Litkowski, Greg Hankins, Manish Gupta, + Michael Darwish, and Alan Davey for their thorough reviews and + helpful comments. Thanks to Tom Petch for last call review and improvement of the document organization. Thanks to Alvaro Retana for AD comments. Thanks to Benjamin Kaduk, Suresh Krishnan, and Roman Dannyliw for IESG review comments. This document was produced using Marshall Rose's xml2rfc tool.