--- 1/draft-ietf-netmod-routing-cfg-21.txt 2016-07-05 10:16:47.857785782 -0700 +++ 2/draft-ietf-netmod-routing-cfg-22.txt 2016-07-05 10:16:47.985788998 -0700 @@ -1,47 +1,47 @@ NETMOD Working Group L. Lhotka Internet-Draft CZ.NIC Intended status: Standards Track A. Lindem -Expires: September 10, 2016 Cisco Systems - March 17, 2016 +Expires: January 6, 2017 Cisco Systems + July 05, 2016 A YANG Data Model for Routing Management - draft-ietf-netmod-routing-cfg-21 + draft-ietf-netmod-routing-cfg-22 Abstract This document contains a specification of three YANG modules and one submodule. Together they form the core routing data model which serves as a framework for configuring and managing a routing subsystem. It is expected that these modules will be augmented by - additional YANG modules defining data models for routing protocols, - route filters and other functions. The core routing data model - provides common building blocks for such extensions - routes, routing - information bases (RIB), and routing protocols. + additional YANG modules defining data models for control plane + protocols, route filters and other functions. The core routing data + model provides common building blocks for such extensions - routes, + routing information bases (RIB), and control plane protocols. 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 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 September 10, 2016. + This Internet-Draft will expire on January 6, 2017. Copyright Notice Copyright (c) 2016 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 @@ -57,67 +57,68 @@ 2. Terminology and Notation . . . . . . . . . . . . . . . . . . 4 2.1. Glossary of New Terms . . . . . . . . . . . . . . . . . . 5 2.2. Tree Diagrams . . . . . . . . . . . . . . . . . . . . . . 5 2.3. Prefixes in Data Node Names . . . . . . . . . . . . . . . 6 3. Objectives . . . . . . . . . . . . . . . . . . . . . . . . . 6 4. The Design of the Core Routing Data Model . . . . . . . . . . 7 4.1. System-Controlled and User-Controlled List Entries . . . 8 5. Basic Building Blocks . . . . . . . . . . . . . . . . . . . . 9 5.1. Route . . . . . . . . . . . . . . . . . . . . . . . . . . 9 5.2. Routing Information Base (RIB) . . . . . . . . . . . . . 9 - 5.3. Routing Protocol . . . . . . . . . . . . . . . . . . . . 10 + 5.3. Control Plane Protocol . . . . . . . . . . . . . . . . . 10 5.3.1. Routing Pseudo-Protocols . . . . . . . . . . . . . . 10 - 5.3.2. Defining New Routing Protocols . . . . . . . . . . . 11 + 5.3.2. Defining New Control Plane Protocols . . . . . . . . 11 5.4. RPC Operations . . . . . . . . . . . . . . . . . . . . . 12 5.5. Parameters of IPv6 Router Advertisements . . . . . . . . 12 6. Interactions with Other YANG Modules . . . . . . . . . . . . 13 6.1. Module "ietf-interfaces" . . . . . . . . . . . . . . . . 13 6.2. Module "ietf-ip" . . . . . . . . . . . . . . . . . . . . 13 7. Routing Management YANG Module . . . . . . . . . . . . . . . 14 - 8. IPv4 Unicast Routing Management YANG Module . . . . . . . . . 25 - 9. IPv6 Unicast Routing Management YANG Module . . . . . . . . . 30 - 9.1. IPv6 Router Advertisements Submodule . . . . . . . . . . 34 - 10. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 44 - 11. Security Considerations . . . . . . . . . . . . . . . . . . . 45 - 12. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . . 46 - 13. References . . . . . . . . . . . . . . . . . . . . . . . . . 46 - 13.1. Normative References . . . . . . . . . . . . . . . . . . 46 - 13.2. Informative References . . . . . . . . . . . . . . . . . 47 - Appendix A. The Complete Data Trees . . . . . . . . . . . . . . 48 - A.1. Configuration Data . . . . . . . . . . . . . . . . . . . 48 - A.2. State Data . . . . . . . . . . . . . . . . . . . . . . . 50 - Appendix B. Minimum Implementation . . . . . . . . . . . . . . . 50 - Appendix C. Example: Adding a New Routing Protocol . . . . . . . 51 - Appendix D. Example: NETCONF Reply . . . . . . . . . . . . 53 - Appendix E. Change Log . . . . . . . . . . . . . . . . . . . . . 59 - E.1. Changes Between Versions -20 and -21 . . . . . . . . . . 59 - E.2. Changes Between Versions -19 and -20 . . . . . . . . . . 60 - E.3. Changes Between Versions -18 and -19 . . . . . . . . . . 60 - E.4. Changes Between Versions -17 and -18 . . . . . . . . . . 60 - E.5. Changes Between Versions -16 and -17 . . . . . . . . . . 61 - E.6. Changes Between Versions -15 and -16 . . . . . . . . . . 61 - E.7. Changes Between Versions -14 and -15 . . . . . . . . . . 62 - E.8. Changes Between Versions -13 and -14 . . . . . . . . . . 62 - E.9. Changes Between Versions -12 and -13 . . . . . . . . . . 62 - E.10. Changes Between Versions -11 and -12 . . . . . . . . . . 63 - E.11. Changes Between Versions -10 and -11 . . . . . . . . . . 63 - E.12. Changes Between Versions -09 and -10 . . . . . . . . . . 63 - E.13. Changes Between Versions -08 and -09 . . . . . . . . . . 64 - E.14. Changes Between Versions -07 and -08 . . . . . . . . . . 64 - E.15. Changes Between Versions -06 and -07 . . . . . . . . . . 64 - E.16. Changes Between Versions -05 and -06 . . . . . . . . . . 64 - E.17. Changes Between Versions -04 and -05 . . . . . . . . . . 65 - E.18. Changes Between Versions -03 and -04 . . . . . . . . . . 66 - E.19. Changes Between Versions -02 and -03 . . . . . . . . . . 66 - E.20. Changes Between Versions -01 and -02 . . . . . . . . . . 67 - E.21. Changes Between Versions -00 and -01 . . . . . . . . . . 67 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 67 + 8. IPv4 Unicast Routing Management YANG Module . . . . . . . . . 27 + 9. IPv6 Unicast Routing Management YANG Module . . . . . . . . . 33 + 9.1. IPv6 Router Advertisements Submodule . . . . . . . . . . 38 + 10. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 48 + 11. Security Considerations . . . . . . . . . . . . . . . . . . . 49 + 12. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . . 50 + 13. References . . . . . . . . . . . . . . . . . . . . . . . . . 50 + 13.1. Normative References . . . . . . . . . . . . . . . . . . 50 + 13.2. Informative References . . . . . . . . . . . . . . . . . 51 + Appendix A. The Complete Data Trees . . . . . . . . . . . . . . 51 + A.1. Configuration Data . . . . . . . . . . . . . . . . . . . 51 + A.2. State Data . . . . . . . . . . . . . . . . . . . . . . . 53 + Appendix B. Minimum Implementation . . . . . . . . . . . . . . . 55 + Appendix C. Example: Adding a New Control Plane Protocol . . . . 55 + Appendix D. Example: NETCONF Reply . . . . . . . . . . . . 57 + Appendix E. Change Log . . . . . . . . . . . . . . . . . . . . . 64 + E.1. Changes Between Versions -21 and -22 . . . . . . . . . . 64 + E.2. Changes Between Versions -20 and -21 . . . . . . . . . . 64 + E.3. Changes Between Versions -19 and -20 . . . . . . . . . . 64 + E.4. Changes Between Versions -18 and -19 . . . . . . . . . . 64 + E.5. Changes Between Versions -17 and -18 . . . . . . . . . . 65 + E.6. Changes Between Versions -16 and -17 . . . . . . . . . . 65 + E.7. Changes Between Versions -15 and -16 . . . . . . . . . . 66 + E.8. Changes Between Versions -14 and -15 . . . . . . . . . . 66 + E.9. Changes Between Versions -13 and -14 . . . . . . . . . . 66 + E.10. Changes Between Versions -12 and -13 . . . . . . . . . . 67 + E.11. Changes Between Versions -11 and -12 . . . . . . . . . . 67 + E.12. Changes Between Versions -10 and -11 . . . . . . . . . . 68 + E.13. Changes Between Versions -09 and -10 . . . . . . . . . . 68 + E.14. Changes Between Versions -08 and -09 . . . . . . . . . . 68 + E.15. Changes Between Versions -07 and -08 . . . . . . . . . . 69 + E.16. Changes Between Versions -06 and -07 . . . . . . . . . . 69 + E.17. Changes Between Versions -05 and -06 . . . . . . . . . . 69 + E.18. Changes Between Versions -04 and -05 . . . . . . . . . . 70 + E.19. Changes Between Versions -03 and -04 . . . . . . . . . . 70 + E.20. Changes Between Versions -02 and -03 . . . . . . . . . . 71 + E.21. Changes Between Versions -01 and -02 . . . . . . . . . . 71 + E.22. Changes Between Versions -00 and -01 . . . . . . . . . . 72 + Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 72 1. Introduction This document contains a specification of the following YANG modules: o Module "ietf-routing" provides generic components of a routing data model. o Module "ietf-ipv4-unicast-routing" augments the "ietf-routing" module with additional data specific to IPv4 unicast. @@ -127,24 +128,25 @@ submodule "ietf-ipv6-router-advertisements" also augments the "ietf-interfaces" module [RFC7223] with IPv6 router configuration variables required by [RFC4861]. These modules together define the so-called core routing data model, which is intended as a basis for future data model development covering more sophisticated routing systems. While these three modules can be directly used for simple IP devices with static routing (see Appendix B), their main purpose is to provide essential building blocks for more complicated data models involving multiple - routing protocols, multicast routing, additional address families, - and advanced functions such as route filtering or policy routing. To - this end, it is expected that the core routing data model will be - augmented by numerous modules developed by other IETF working groups. + control plane protocols, multicast routing, additional address + families, and advanced functions such as route filtering or policy + routing. To this end, it is expected that the core routing data + model will be augmented by numerous modules developed by other IETF + working groups. 2. Terminology and Notation 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]. The following terms are defined in [RFC6241]: o client, @@ -259,22 +261,22 @@ o The data model should be suitable for the common address families, in particular IPv4 and IPv6, and for unicast and multicast routing, as well as Multiprotocol Label Switching (MPLS). o A simple IP routing system, such as one that uses only static routing, should be configurable in a simple way, ideally without any need to develop additional YANG modules. o On the other hand, the core routing framework must allow for complicated implementations involving multiple routing information - bases (RIB) and multiple routing protocols, as well as controlled - redistributions of routing information. + bases (RIB) and multiple control plane protocols, as well as + controlled redistributions of routing information. o Device vendors will want to map the data models built on this generic framework to their proprietary data models and configuration interfaces. Therefore, the framework should be flexible enough to facilitate such a mapping and accommodate data models with different logic. 4. The Design of the Core Routing Data Model The core routing data model consists of three YANG modules and one @@ -284,65 +286,61 @@ routing" module with additional data nodes that are needed for IPv4 and IPv6 unicast routing, respectively. Module "ietf-ipv6-unicast- routing" has a submodule, "ietf-ipv6-router-advertisements", that defines configuration variables for IPv6 router advertisements as required by [RFC4861]. Figures 1 and 2 show abridged views of the configuration and state data hierarchies. See Appendix A for the complete data trees. +--rw routing +--rw router-id? - +--rw routing-protocols - | +--rw routing-protocol* [type name] + +--rw control-plane-protocols + | +--rw control-plane-protocol* [type name] | +--rw type | +--rw name | +--rw description? | +--rw static-routes - | | +--rw v6ur:ipv6 - | | | ... - | | +--rw v4ur:ipv4 - | | ... - | +--rw rip:rip! - | +--rw rip:interfaces + | +--rw v6ur:ipv6 | | ... - | +--rw rip:update-interval? + | +--rw v4ur:ipv4 + | ... +--rw ribs +--rw rib* [name] +--rw name +--rw address-family? +--rw description? Figure 1: Configuration data hierarchy. +--ro routing-state +--ro router-id? +--ro interfaces | +--ro interface* - +--ro routing-protocols - | +--ro routing-protocol* [type name] + +--ro control-plane-protocols + | +--ro control-plane-protocol* [type name] | +--ro type | +--ro name +--ro ribs +--ro rib* [name] +--ro name +--ro address-family +--ro default-rib? +--ro routes +--ro route* ... Figure 2: State data hierarchy. As can be seen from Figures 1 and 2, the core routing data model introduces several generic components of a routing framework: routes, - RIBs containing lists of routes, and routing protocols. Section 5 - describes these components in more detail. + RIBs containing lists of routes, and control plane protocols. + Section 5 describes these components in more detail. 4.1. System-Controlled and User-Controlled List Entries The core routing data model defines several lists in the schema tree, such as "rib", that have to be populated with at least one entry in any properly functioning device, and additional entries may be configured by a client. In such a list, the server creates the required item as a so-called system-controlled entry in state data, i.e., inside the "routing- @@ -405,46 +403,47 @@ 5.2. Routing Information Base (RIB) Every implementation of the core routing data model manages one or more routing information bases (RIB). A RIB is a list of routes complemented with administrative data. Each RIB contains only routes of one address family. An address family is represented by an identity derived from the "rt:address-family" base identity. In the core routing data model, RIBs are state data represented as entries of the list "/routing-state/ribs/rib". The contents of RIBs - are controlled and manipulated by routing protocol operations which - may result in route additions, removals and modifications. This also - includes manipulations via the "static" and/or "direct" pseudo- - protocols, see Section 5.3.1. + are controlled and manipulated by control plane protocol operations + which may result in route additions, removals and modifications. + This also includes manipulations via the "static" and/or "direct" + pseudo-protocols, see Section 5.3.1. For every supported address family, exactly one RIB MUST be marked as the so-called default RIB. Its role is explained in Section 5.3. Simple router implementations that do not advertise the feature "multiple-ribs" will typically create one system-controlled RIB per supported address family, and mark it as the default RIB. More complex router implementations advertising the "multiple-ribs" feature support multiple RIBs per address family that can be used for policy routing and other purposes. -5.3. Routing Protocol +5.3. Control Plane Protocol The core routing data model provides an open-ended framework for - defining multiple routing protocol instances. Each routing protocol - instance MUST be assigned a type, which is an identity derived from - the "rt:routing-protocol" base identity. The core routing data model - defines two identities for the direct and static pseudo-protocols + defining multiple control plane protocol instances, e.g., for Layer 3 + routing protocols. Each routing protocol instance MUST be assigned a + type, which is an identity derived from the "rt:control-plane- + protocol" base identity. The core routing data model defines two + identities for the direct and static pseudo-protocols (Section 5.3.1). - Multiple routing protocol instances of the same type MAY be + Multiple control plane protocol instances of the same type MAY be configured. 5.3.1. Routing Pseudo-Protocols The core routing data model defines two special routing protocol types - "direct" and "static". Both are in fact pseudo-protocols, which means they are confined to the local device and do not exchange any routing information with adjacent routers. Every implementation of the core routing data model MUST provide @@ -452,47 +451,47 @@ source of direct routes for all configured address families. Direct routes are normally supplied by the operating system kernel, based on the configuration of network interface addresses, see Section 6.2. Direct routes MUST be installed in default RIBs of all supported address families. A pseudo-protocol of the type "static" allows for specifying routes manually. It MAY be configured in zero or multiple instances, although a typical configuration will have exactly one instance. -5.3.2. Defining New Routing Protocols +5.3.2. Defining New Control Plane Protocols It is expected that future YANG modules will create data models for - additional routing protocol types. Such a new module has to define - the protocol-specific configuration and state data, and it has to - integrate it into the core routing framework in the following way: + additional control plane protocol types. Such a new module has to + define the protocol-specific configuration and state data, and it has + to integrate it into the core routing framework in the following way: - o A new identity MUST be defined for the routing protocol and its - base identity MUST be set to "rt:routing-protocol", or to an - identity derived from "rt:routing-protocol". + o A new identity MUST be defined for the control plane protocol and + its base identity MUST be set to "rt:control-plane-protocol", or + to an identity derived from "rt:control-plane-protocol". o Additional route attributes MAY be defined, preferably in one place by means of defining a YANG grouping. The new attributes have to be inserted by augmenting the definitions of the nodes /rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route and /rt:fib-route/rt:output/rt:route, and possibly other places in the configuration, state data, notifications, and RPC input or output. o Configuration parameters and/or state data for the new protocol - can be defined by augmenting the "routing-protocol" data node - under both "/routing" and "/routing-state". + can be defined by augmenting the "control-plane-protocol" data + node under both "/routing" and "/routing-state". By using a "when" statement, the augmented configuration parameters and state data specific to the new protocol SHOULD be made conditional and valid only if the value of "rt:type" or "rt:source- protocol" is equal to the new protocol's identity. It is also RECOMMENDED that protocol-specific data nodes be encapsulated in an appropriately named container with presence. Such a container may contain mandatory data nodes that are otherwise forbidden at the top level of an augment. @@ -619,21 +618,21 @@ direct route. The destination prefix of this route is set according to the configured IP address and network prefix/mask, and the interface is set as the outgoing interface for that route. 7. Routing Management YANG Module RFC Editor: In this section, replace all occurrences of 'XXXX' with the actual RFC number and all occurrences of the revision date below with the date of RFC publication (and remove this note). - file "ietf-routing@2016-03-09.yang" + file "ietf-routing@2016-07-01.yang" module ietf-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-routing"; prefix "rt"; import ietf-yang-types { prefix "yang"; } @@ -645,23 +644,20 @@ organization "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; contact "WG Web: WG List: WG Chair: Lou Berger - WG Chair: Juergen Schoenwaelder - - WG Chair: Kent Watsen Editor: Ladislav Lhotka Editor: Acee Lindem "; description @@ -680,28 +676,28 @@ The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and 'OPTIONAL' in the module text are to be interpreted as described in RFC 2119 (http://tools.ietf.org/html/rfc2119). This version of this YANG module is part of RFC XXXX (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for full legal notices."; - revision 2016-03-09 { + revision 2016-07-01 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } - /* Features */ + /* Features */ feature multiple-ribs { description "This feature indicates that the server supports user-defined RIBs. Servers that do not advertise this feature SHOULD provide exactly one system-controlled RIB per supported address family and make them also the default RIBs. These RIBs then appear as entries of the list /routing-state/ribs/rib."; } @@ -730,25 +726,30 @@ description "This identity represents IPv4 address family."; } identity ipv6 { base address-family; description "This identity represents IPv6 address family."; } + identity control-plane-protocol { + description + "Base identity from which control plane protocol identities are + derived."; + } identity routing-protocol { + base control-plane-protocol; description - "Base identity from which routing protocol identities are + "Identity from which Layer 3 routing protocol identities are derived."; - } identity direct { base routing-protocol; description "Routing pseudo-protocol that provides routes to directly connected networks."; } identity static { @@ -819,69 +820,175 @@ enum receive { description "The packet will be received by the local system."; } } description "Special next-hop options."; } } + grouping next-hop-classifiers { + description + "This grouping provides two next-hop classifiers."; + leaf priority { + type enumeration { + enum primary { + value "1"; + description + "Primary next-hop."; + } + enum backup { + value "2"; + description + "Backup next-hop."; + } + } + description + "Simple priority for distinguishing between primary and + backup next-hops. + + Backup next-hops are used if and only if no primary + next-hops are reachable."; + } + leaf weight { + type uint8; + must ". = 0 or not(../../next-hop/weight = 0)" { + error-message "Illegal combination of zero and non-zero " + + "next-hop weights."; + description + "Next-hop weights must be either all zero (equal + load-balancing) or all non-zero."; + } + description + "This parameter specifies the weight of the next-hop for load + balancing. The number specifies the relative fraction of the + traffic that will use the corresponding next-hop. + + A value of 0 represents equal load-balancing. + + If both primary and backup next-hops are present, then the + weights for each priority level are used separately."; + } + } + grouping next-hop-content { description "Generic parameters of next-hops in static routes."; choice next-hop-options { mandatory "true"; description "Options for next-hops in static routes. Modules for address families MUST augment this choice with the 'next-hop-address' case, which is a leaf containing a gateway address of that address family. It is expected that further cases will be added through - augments from other modules, e.g., for Equal-Cost Multipath - routing (ECMP)."; + augments from other modules."; leaf outgoing-interface { type if:interface-ref; description "Name of the outgoing interface."; } case special-next-hop { uses special-next-hop; } + case next-hop-list { + container next-hop-list { + description + "Container for multiple next-hops."; + list next-hop { + key "index"; + description + "An entry of a next-hop list."; + leaf index { + type string; + description + "An user-specified identifier utilised to uniquely + reference the next-hop entry in the next-hop list. + The value of this index has no semantic meaning + other than for referencing the entry."; } - } + choice address-or-interface { + mandatory "true"; + description + "Choice between outgoing interface and next-hop + address in next-hop list entries. + Modules for address families MUST augment this + choice with the 'next-hop-address' case, which is a + leaf containing a gateway address of that address + family."; + leaf outgoing-interface { + type if:interface-ref; + description + "Name of the outgoing interface."; + } + } + uses next-hop-classifiers; + } + } + } + } + } grouping next-hop-state-content { description "Generic parameters of next-hops in state data."; choice next-hop-options { mandatory "true"; description "Options for next-hops in state data. Modules for address families MUST augment this choice with the 'next-hop-address' case, which is a leaf containing a gateway address of that address family. It is expected that further cases will be added through - augments from other modules, e.g., for ECMP or recursive + augments from other modules, e.g., for recursive next-hops."; leaf outgoing-interface { type if:interface-state-ref; description "Name of the outgoing interface."; } case special-next-hop { uses special-next-hop; } + case next-hop-list { + container next-hop-list { + description + "Container for multiple next-hops."; + list next-hop { + description + "An entry of a next-hop list."; + choice address-or-interface { + mandatory "true"; + description + "Choice between outgoing interface and next-hop + address in next-hop list entries. + + Modules for address families MUST augment this + choice with the 'next-hop-address' case, which is a + leaf containing a gateway address of that address + family."; + leaf outgoing-interface { + type if:interface-state-ref; + description + "Name of the outgoing interface."; + } + } + uses next-hop-classifiers; + } + + } + } } } grouping route-metadata { description "Common route metadata."; leaf source-protocol { type identityref { base routing-protocol; } @@ -922,42 +1029,43 @@ container interfaces { description "Network layer interfaces used for routing."; leaf-list interface { type if:interface-state-ref; description "Each entry is a reference to the name of a configured network layer interface."; } } - container routing-protocols { + container control-plane-protocols { description "Container for the list of routing protocol instances."; - list routing-protocol { + list control-plane-protocol { key "type name"; description - "State data of a routing protocol instance. + "State data of a control plane protocol instance. An implementation MUST provide exactly one - system-controlled instance of the type 'direct'. Other - instances MAY be created by configuration."; + system-controlled instance of the 'direct' + pseudo-protocol. Instances of other control plane + protocols MAY be created by configuration."; leaf type { type identityref { - base routing-protocol; + base control-plane-protocol; } description - "Type of the routing protocol."; + "Type of the control plane protocol."; } leaf name { type string; description - "The name of the routing protocol instance. + "The name of the control plane protocol instance. For system-controlled instances this name is persistent, i.e., it SHOULD NOT change across reboots."; } } } container ribs { description "Container for RIBs."; list rib { @@ -970,21 +1078,21 @@ An implementation SHOULD provide one system-controlled default RIB for each supported address family."; leaf name { type string; description "The name of the RIB."; } uses address-family; leaf default-rib { - if-feature multiple-ribs; + if-feature "multiple-ribs"; type boolean; default "true"; description "This flag has the value of 'true' if and only if the RIB is the default RIB for the given address family. A default RIB always receives direct routes. By default it also receives routes from all routing protocols."; } container routes { @@ -1009,57 +1117,57 @@ uses next-hop-state-content; } uses route-metadata; } } } } } /* Configuration Data */ - container routing { description "Configuration parameters for the routing subsystem."; uses router-id { - if-feature router-id; + if-feature "router-id"; description "Configuration of the global router ID. Routing protocols that use router ID can use this parameter or override it with another value."; } - container routing-protocols { + container control-plane-protocols { description - "Configuration of routing protocol instances."; - - list routing-protocol { + "Configuration of control plane protocol instances."; + list control-plane-protocol { key "type name"; description - "Each entry contains configuration of a routing protocol - instance."; + "Each entry contains configuration of a control plane + protocol instance."; leaf type { type identityref { - base routing-protocol; + base control-plane-protocol; } description - "Type of the routing protocol - an identity derived from - the 'routing-protocol' base identity."; + "Type of the control plane protocol - an identity derived + from the 'control-plane-protocol' base identity."; } leaf name { type string; description - "An arbitrary name of the routing protocol instance."; + "An arbitrary name of the control plane protocol + instance."; } leaf description { type string; description - "Textual description of the routing protocol instance."; + "Textual description of the control plane protocol + instance."; } container static-routes { when "../type='rt:static'" { description "This container is only valid for the 'static' routing protocol."; } description "Configuration of the 'static' pseudo-protocol. @@ -1155,21 +1263,21 @@ } 8. IPv4 Unicast Routing Management YANG Module RFC Editor: In this section, replace all occurrences of 'XXXX' with the actual RFC number and all occurrences of the revision date below with the date of RFC publication (and remove this note). - file "ietf-ipv4-unicast-routing@2016-03-09.yang" + file "ietf-ipv4-unicast-routing@2016-07-01.yang" module ietf-ipv4-unicast-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing"; prefix "v4ur"; import ietf-routing { prefix "rt"; } @@ -1182,23 +1289,20 @@ organization "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; contact "WG Web: WG List: WG Chair: Lou Berger - WG Chair: Juergen Schoenwaelder - - WG Chair: Kent Watsen Editor: Ladislav Lhotka Editor: Acee Lindem "; description @@ -1207,31 +1311,30 @@ Copyright (c) 2016 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 (http://trustee.ietf.org/license-info). - The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and 'OPTIONAL' in the module text are to be interpreted as described in RFC 2119 (http://tools.ietf.org/html/rfc2119). This version of this YANG module is part of RFC XXXX (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for full legal notices."; - revision 2016-03-09 { + revision 2016-07-01 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* Identities */ identity ipv4-unicast { base rt:ipv4; @@ -1256,31 +1359,49 @@ } augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/" + "rt:next-hop/rt:next-hop-options" { when "../../../rt:address-family = 'v4ur:ipv4-unicast'" { description "This augment is valid only for IPv4 unicast."; } description "Augment 'next-hop-options' in IPv4 unicast routes."; + leaf next-hop-address { type inet:ipv4-address; description "IPv4 address of the next-hop."; } } + augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/" + + "rt:next-hop/rt:next-hop-options/rt:next-hop-list/" + + "rt:next-hop-list/rt:next-hop/rt:address-or-interface" { + when "../../../../../rt:address-family = 'v4ur:ipv4-unicast'" { + description + "This augment is valid only for IPv4 unicast."; + } + description + "This leaf augments the 'next-hop-list' case of IPv4 unicast + routes."; + leaf address { + type inet:ipv4-address; + description + "IPv4 address of the next-hop."; + } + } + /* Configuration data */ - augment "/rt:routing/rt:routing-protocols/rt:routing-protocol/" - + "rt:static-routes" { + augment "/rt:routing/rt:control-plane-protocols/" + + "rt:control-plane-protocol/rt:static-routes" { description "This augment defines the configuration of the 'static' pseudo-protocol with data specific to IPv4 unicast."; container ipv4 { description "Configuration of a 'static' pseudo-protocol instance consists of a list of routes."; list route { key "destination-prefix"; description @@ -1302,20 +1423,30 @@ uses rt:next-hop-content { augment "next-hop-options" { description "Augment 'next-hop-options' in IPv4 static routes."; leaf next-hop-address { type inet:ipv4-address; description "IPv4 address of the next-hop."; } } + augment "next-hop-options/next-hop-list/next-hop-list/" + + "next-hop/address-or-interface" { + description + "Augment 'next-hop-options' in IPv4 static routes."; + leaf next-hop-address { + type inet:ipv4-address; + description + "IPv4 address of the next-hop."; + } + } } } } } } /* RPC operations */ augment "/rt:fib-route/rt:input/rt:destination-address" { when "rt:address-family='v4ur:ipv4-unicast'" { @@ -1356,63 +1485,76 @@ } description "Augment 'next-hop-options' in the reply to the 'rt:fib-route' operation."; leaf next-hop-address { type inet:ipv4-address; description "IPv4 address of the next-hop."; } } - } + augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/" + + "rt:next-hop-options/rt:next-hop-list/rt:next-hop-list/" + + "rt:next-hop/rt:address-or-interface" { + when "../rt:address-family='v4ur:ipv4-unicast'" { + description + "This augment is valid only for IPv4 unicast."; + } + description + "Augment 'next-hop' list entry in the reply to the + 'rt:fib-route' operation."; + leaf next-hop-address { + type inet:ipv4-address; + description + "IPv4 address of the next-hop."; + } + } + } 9. IPv6 Unicast Routing Management YANG Module RFC Editor: In this section, replace all occurrences of 'XXXX' with the actual RFC number and all occurrences of the revision date below with the date of RFC publication (and remove this note). - file "ietf-ipv6-unicast-routing@2016-03-09.yang" + file "ietf-ipv6-unicast-routing@2016-07-01.yang" module ietf-ipv6-unicast-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing"; prefix "v6ur"; import ietf-routing { prefix "rt"; } import ietf-inet-types { prefix "inet"; } include ietf-ipv6-router-advertisements { - revision-date 2016-03-09; + revision-date 2016-07-01; } organization "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; contact "WG Web: WG List: WG Chair: Lou Berger - WG Chair: Juergen Schoenwaelder - - WG Chair: Kent Watsen Editor: Ladislav Lhotka Editor: Acee Lindem "; description @@ -1431,21 +1573,21 @@ The key words 'MUST', 'MUST NOT', 'REQUIRED', 'SHALL', 'SHALL NOT', 'SHOULD', 'SHOULD NOT', 'RECOMMENDED', 'MAY', and 'OPTIONAL' in the module text are to be interpreted as described in RFC 2119 (http://tools.ietf.org/html/rfc2119). This version of this YANG module is part of RFC XXXX (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for full legal notices."; - revision 2016-03-09 { + revision 2016-07-01 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* Identities */ identity ipv6-unicast { base rt:ipv6; @@ -1477,31 +1619,49 @@ } description "Augment 'next-hop-options' in IPv6 unicast routes."; leaf next-hop-address { type inet:ipv6-address; description "IPv6 address of the next-hop."; } } + augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/" + + "rt:next-hop/rt:next-hop-options/rt:next-hop-list/" + + "rt:next-hop-list/rt:next-hop/rt:address-or-interface" { + when "../../../../../rt:address-family = 'v6ur:ipv6-unicast'" { + description + "This augment is valid only for IPv6 unicast."; + } + description + "This leaf augments the 'next-hop-list' case of IPv6 unicast + routes."; + leaf address { + type inet:ipv6-address; + description + "IPv6 address of the next-hop."; + } + } + /* Configuration data */ - augment "/rt:routing/rt:routing-protocols/rt:routing-protocol/" - + "rt:static-routes" { + augment "/rt:routing/rt:control-plane-protocols/" + + "rt:control-plane-protocol/rt:static-routes" { description "This augment defines the configuration of the 'static' pseudo-protocol with data specific to IPv6 unicast."; container ipv6 { description "Configuration of a 'static' pseudo-protocol instance consists of a list of routes."; + list route { key "destination-prefix"; description "A list of static routes."; leaf destination-prefix { type inet:ipv6-prefix; mandatory "true"; description "IPv6 destination prefix."; } @@ -1516,20 +1676,30 @@ uses rt:next-hop-content { augment "next-hop-options" { description "Augment 'next-hop-options' in IPv6 static routes."; leaf next-hop-address { type inet:ipv6-address; description "IPv6 address of the next-hop."; } } + augment "next-hop-options/next-hop-list/next-hop-list/" + + "next-hop/address-or-interface" { + description + "Augment 'next-hop-options' in IPv6 static routes."; + leaf next-hop-address { + type inet:ipv6-address; + description + "IPv6 address of the next-hop."; + } + } } } } } } /* RPC operations */ augment "/rt:fib-route/rt:input/rt:destination-address" { when "rt:address-family='v6ur:ipv6-unicast'" { @@ -1570,31 +1739,48 @@ } description "Augment 'next-hop-options' in the reply to the 'rt:fib-route' operation."; leaf next-hop-address { type inet:ipv6-address; description "IPv6 address of the next-hop."; } } + + augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/" + + "rt:next-hop-options/rt:next-hop-list/rt:next-hop-list/" + + "rt:next-hop/rt:address-or-interface" { + when "../rt:address-family='v6ur:ipv6-unicast'" { + description + "This augment is valid only for IPv6 unicast."; + } + description + "Augment 'next-hop' list entry in the reply to the + 'rt:fib-route' operation."; + leaf next-hop-address { + type inet:ipv6-address; + description + "IPv6 address of the next-hop."; + } + } } 9.1. IPv6 Router Advertisements Submodule RFC Editor: In this section, replace all occurrences of 'XXXX' with the actual RFC number and all occurrences of the revision date below with the date of RFC publication (and remove this note). - file "ietf-ipv6-router-advertisements@2016-03-09.yang" + file "ietf-ipv6-router-advertisements@2016-07-01.yang" submodule ietf-ipv6-router-advertisements { belongs-to ietf-ipv6-unicast-routing { prefix "v6ur"; } import ietf-inet-types { prefix "inet"; } @@ -1606,27 +1792,23 @@ import ietf-ip { prefix "ip"; } organization "IETF NETMOD (NETCONF Data Modeling Language) Working Group"; contact "WG Web: WG List: - WG Chair: Lou Berger - WG Chair: Juergen Schoenwaelder - - WG Chair: Kent Watsen Editor: Ladislav Lhotka Editor: Acee Lindem "; description @@ -1648,21 +1830,21 @@ 'OPTIONAL' in the module text are to be interpreted as described in RFC 2119 (http://tools.ietf.org/html/rfc2119). This version of this YANG module is part of RFC XXXX (http://tools.ietf.org/html/rfcXXXX); see the RFC itself for full legal notices."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6)."; - revision 2016-03-09 { + revision 2016-07-01 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* State data */ augment "/if:interfaces-state/if:interface/ip:ipv6" { description @@ -2143,22 +2326,22 @@ configuration part of the core routing data model are writable/creatable/deletable (i.e., "config true" in YANG terms, which is the default). These data nodes may be considered sensitive or vulnerable in some network environments. Write operations to these data nodes, such as "edit-config", can have negative effects on the network if the protocol operations are not properly protected. The vulnerable "config true" parameters and subtrees are the following: - /routing/routing-protocols/routing-protocol: This list specifies the - routing protocols configured on a device. + /routing/control-plane-protocols/control-plane-protocol: This list + specifies the control plane protocols configured on a device. /routing/ribs/rib: This list specifies the RIBs configured for the device. Unauthorised access to any of these lists can adversely affect the routing subsystem of both the local device and the network. This may lead to network malfunctions, delivery of packets to inappropriate destinations and other problems. 12. Acknowledgments @@ -2231,99 +2414,124 @@ . Appendix A. The Complete Data Trees This appendix presents the complete configuration and state data trees of the core routing data model. See Section 2.2 for an explanation of the symbols used. Data type of every leaf node is shown near the right end of the corresponding line. A.1. Configuration Data + +--rw routing +--rw router-id? yang:dotted-quad - +--rw routing-protocols - | +--rw routing-protocol* [type name] + +--rw control-plane-protocols + | +--rw control-plane-protocol* [type name] | +--rw type identityref | +--rw name string | +--rw description? string | +--rw static-routes - | | +--rw v6ur:ipv6 - | | | +--rw v6ur:route* [destination-prefix] - | | | +--rw v6ur:destination-prefix inet:ipv6-prefix - | | | +--rw v6ur:description? string - | | | +--rw v6ur:next-hop - | | | +--rw (v6ur:next-hop-options) - | | | +--:(v6ur:outgoing-interface) - | | | | +--rw v6ur:outgoing-interface? if:interface-ref - | | | +--:(v6ur:special-next-hop) - | | | | +--rw v6ur:special-next-hop? enumeration - | | | +--:(v6ur:next-hop-address) - | | | +--rw v6ur:next-hop-address? inet:ipv6-address - | | +--rw v4ur:ipv4 - | | +--rw v4ur:route* [destination-prefix] - | | +--rw v4ur:destination-prefix inet:ipv4-prefix - | | +--rw v4ur:description? string - | | +--rw v4ur:next-hop - | | +--rw (v4ur:next-hop-options) - | | +--:(v4ur:outgoing-interface) - | | | +--rw v4ur:outgoing-interface? if:interface-ref - | | +--:(v4ur:special-next-hop) - | | | +--rw v4ur:special-next-hop? enumeration - | | +--:(v4ur:next-hop-address) - | | +--rw v4ur:next-hop-address? inet:ipv4-address - | +--rw rip:rip! - | +--rw rip:interfaces - | | +--rw rip:interface* [name] - | | +--rw rip:name if:interface-ref - | | +--rw rip:enabled? boolean - | | +--rw rip:metric? rip-metric - | +--rw rip:update-interval? uint8 + | +--rw v6ur:ipv6 + | | +--rw v6ur:route* [destination-prefix] + | | +--rw v6ur:destination-prefix inet:ipv6-prefix + | | +--rw v6ur:description? string + | | +--rw v6ur:next-hop + | | +--rw (v6ur:next-hop-options) + | | +--:(v6ur:outgoing-interface) + | | | +--rw v6ur:outgoing-interface? + | | +--:(v6ur:special-next-hop) + | | | +--rw v6ur:special-next-hop? + | | +--:(v6ur:next-hop-list) + | | | +--rw v6ur:next-hop-list + | | | +--rw v6ur:next-hop* [index] + | | | +--rw v6ur:index string + | | | +--rw (v6ur:address-or-interface) + | | | | +--:(v6ur:outgoing-interface) + | | | | | +--rw v6ur:outgoing-interface? + | | | | +--:(v6ur:next-hop-address) + | | | | +--rw v6ur:next-hop-address? + | | | +--rw v6ur:priority? enumeration + | | | +--rw v6ur:weight? uint8 + | | +--:(v6ur:next-hop-address) + | | +--rw v6ur:next-hop-address? + | +--rw v4ur:ipv4 + | +--rw v4ur:route* [destination-prefix] + | +--rw v4ur:destination-prefix inet:ipv4-prefix + | +--rw v4ur:description? string + | +--rw v4ur:next-hop + | +--rw (v4ur:next-hop-options) + | +--:(v4ur:outgoing-interface) + | | +--rw v4ur:outgoing-interface? + | +--:(v4ur:special-next-hop) + | | +--rw v4ur:special-next-hop? + | +--:(v4ur:next-hop-list) + | | +--rw v4ur:next-hop-list + | | +--rw v4ur:next-hop* [index] + | | +--rw v4ur:index string + | | +--rw (v4ur:address-or-interface) + | | | +--:(v4ur:outgoing-interface) + | | | | +--rw v4ur:outgoing-interface? + | | | +--:(v4ur:next-hop-address) + | | | +--rw v4ur:next-hop-address? + | | +--rw v4ur:priority? enumeration + | | +--rw v4ur:weight? uint8 + | +--:(v4ur:next-hop-address) + | +--rw v4ur:next-hop-address? +--rw ribs +--rw rib* [name] +--rw name string +--rw address-family? identityref +--rw description? string A.2. State Data - +--ro routing-state +--ro router-id? yang:dotted-quad +--ro interfaces | +--ro interface* if:interface-state-ref - +--ro routing-protocols - | +--ro routing-protocol* [type name] + +--ro control-plane-protocols + | +--ro control-plane-protocol* [type name] | +--ro type identityref | +--ro name string +--ro ribs +--ro rib* [name] +--ro name string +--ro address-family identityref +--ro default-rib? boolean {multiple-ribs}? +--ro routes +--ro route* +--ro route-preference? route-preference +--ro next-hop | +--ro (next-hop-options) | +--:(outgoing-interface) - | | +--ro outgoing-interface? if:interface-state-ref + | | +--ro outgoing-interface? | +--:(special-next-hop) | | +--ro special-next-hop? enumeration + | +--:(next-hop-list) + | | +--ro next-hop-list + | | +--ro next-hop* + | | +--ro (address-or-interface) + | | | +--:(outgoing-interface) + | | | | +--ro outgoing-interface? + | | | +--:(v6ur:address) + | | | | +--ro v6ur:address? + | | | +--:(v4ur:address) + | | | +--ro v4ur:address? + | | +--ro priority? enumeration + | | +--ro weight? uint8 | +--:(v6ur:next-hop-address) - | | +--ro v6ur:next-hop-address? inet:ipv6-address + | | +--ro v6ur:next-hop-address? | +--:(v4ur:next-hop-address) - | +--ro v4ur:next-hop-address? inet:ipv4-address + | +--ro v4ur:next-hop-address? +--ro source-protocol identityref +--ro active? empty +--ro last-updated? yang:date-and-time +--ro v6ur:destination-prefix? inet:ipv6-prefix - +--ro rip:metric? rip-metric - +--ro rip:tag? uint16 +--ro v4ur:destination-prefix? inet:ipv4-prefix Appendix B. Minimum Implementation Some parts and options of the core routing model, such as user- defined RIBs, are intended only for advanced routers. This appendix gives basic non-normative guidelines for implementing a bare minimum of available functions. Such an implementation may be used for hosts or very simple routers. @@ -2331,26 +2539,26 @@ ribs". This means that a single system-controlled RIB is available for each supported address family - IPv4, IPv6 or both. These RIBs are also the default RIBs. No user-controlled RIBs are allowed. In addition to the mandatory instance of the "direct" pseudo- protocol, a minimum implementation should support configuring instance(s) of the "static" pseudo-protocol. Platforms with severely constrained resources may use deviations for restricting the data model, e.g., limiting the number of "static" - routing protocol instances. + control plane protocol instances. -Appendix C. Example: Adding a New Routing Protocol +Appendix C. Example: Adding a New Control Plane Protocol This appendix demonstrates how the core routing data model can be - extended to support a new routing protocol. The YANG module + extended to support a new control plane protocol. The YANG module "example-rip" shown below is intended as an illustration rather than a real definition of a data model for the RIP routing protocol. For the sake of brevity, this module does not obey all the guidelines specified in [RFC6087]. See also Section 5.3.2. module example-rip { namespace "http://example.com/rip"; prefix "rip"; @@ -2402,21 +2610,22 @@ uses route-content; } augment "/rt:fib-route/rt:output/rt:route" { description "RIP-specific route attributes in the output of 'active-route' RPC."; uses route-content; } - augment "/rt:routing/rt:routing-protocols/rt:routing-protocol" { + augment "/rt:routing/rt:control-plane-protocols/" + + "rt:control-plane-protocol" { when "rt:type = 'rip:rip'" { description "This augment is only valid for a routing protocol instance of type 'rip'."; } container rip { presence "RIP configuration"; description "RIP instance configuration."; container interfaces { @@ -2566,21 +2775,23 @@ eth0 ianaift:ethernetCsmacd 00:0C:42:E5:B1:E9 up - 2015-10-24T17:11:27+02:00 + + 2015-10-24T17:11:27+02:00 + true 1500 192.0.2.1 24 @@ -2599,21 +2810,23 @@ eth1 ianaift:ethernetCsmacd 00:0C:42:E5:B1:EA up - 2015-10-24T17:11:29+02:00 + + 2015-10-24T17:11:29+02:00 + true 1500 198.51.100.1 24 @@ -2629,22 +2842,22 @@ 2001:db8:0:2::/64 192.0.2.1 - - + + rt:static st0 Static routing is used for the internal network. 0.0.0.0/0 @@ -2654,57 +2867,60 @@ ::/0 2001:db8:0:1::2 - - + + eth0 eth1 - - + + rt:static st0 - - + + ipv4-master v4ur:ipv4-unicast true 192.0.2.1/24 eth0 0 rt:direct 2015-10-24T17:11:27+02:00 - 198.51.100.0/24 + + 198.51.100.0/24 + eth1 rt:direct 0 2015-10-24T17:11:27+02:00 + 0.0.0.0/0 rt:static 5 192.0.2.2 2015-10-24T18:02:45+02:00 @@ -2709,90 +2925,104 @@ 2015-10-24T18:02:45+02:00 ipv6-master v6ur:ipv6-unicast true - 2001:db8:0:1::/64 + + 2001:db8:0:1::/64 + eth0 rt:direct 0 2015-10-24T17:11:27+02:00 - 2001:db8:0:2::/64 + + 2001:db8:0:2::/64 + eth1 rt:direct 0 2015-10-24T17:11:27+02:00 ::/0 - 2001:db8:0:1::2 + + 2001:db8:0:1::2 + rt:static 5 2015-10-24T18:02:45+02:00 Appendix E. Change Log RFC Editor: Remove this section upon publication as an RFC. -E.1. Changes Between Versions -20 and -21 +E.1. Changes Between Versions -21 and -22 + + o Added "next-hop-list" as a new case of the "next-hop-options" + choice. + + o Renamed "routing protocol" to "control plane protocol" in both the + YANG modules and I-D text. + +E.2. Changes Between Versions -20 and -21 o Routing instances were removed. o IPv6 RA parameters were moved to the "ietf-ipv6-router- advertisements". -E.2. Changes Between Versions -19 and -20 +E.3. Changes Between Versions -19 and -20 o Assignment of L3 interfaces to routing instances is now part of interface configuration. o Next-hop options in configuration were aligned with state data. o It is recommended to enclose protocol-specific configuration in a presence container. -E.3. Changes Between Versions -18 and -19 +E.4. Changes Between Versions -18 and -19 o The leaf "route-preference" was removed from the "routing- protocol" container in both "routing" and "routing-state". o The "vrf-routing-instance" identity was added in support of a common routing-instance type in addition to the "default-routing- instance". o Removed "enabled" switch from "routing-protocol". -E.4. Changes Between Versions -17 and -18 +E.5. Changes Between Versions -17 and -18 o The container "ribs" was moved under "routing-instance" (in both "routing" and "routing-state"). o Typedefs "rib-ref" and "rib-state-ref" were removed. o Removed "recipient-ribs" (both state and configuration). o Removed "connected-ribs" from "routing-protocol" (both state and configuration). @@ -2804,38 +3034,38 @@ rather than list (both config and state). The opposite reference from "if:interface" to "rt:routing-instance" was changed to a single leaf (an interface cannot belong to multiple routing instances). o Specification of a default RIB is now a simple flag under "rib" (both config and state). o Default RIBs are marked by a flag in state data. -E.5. Changes Between Versions -16 and -17 +E.6. Changes Between Versions -16 and -17 o Added Acee as a co-author. o Removed all traces of route filters. o Removed numeric IDs of list entries in state data. o Removed all next-hop cases except "simple-next-hop" and "special- next-hop". o Removed feature "multipath-routes". o Augmented "ietf-interfaces" module with a leaf-list of leafrefs pointing form state data of an interface entry to the routing instance(s) to which the interface is assigned. -E.6. Changes Between Versions -15 and -16 +E.7. Changes Between Versions -15 and -16 o Added 'type' as the second key component of 'routing-protocol', both in configuration and state data. o The restriction of no more than one connected RIB per address family was removed. o Removed the 'id' key of routes in RIBs. This list has no keys anymore. @@ -2856,39 +3086,39 @@ o Added next-hop lists to state data. o Added two cases for specifying next-hops indirectly - via a new RIB or a recursive list of next-hops. o Reorganized next-hop in static routes. o Removed all 'if-feature' statements from state data. -E.7. Changes Between Versions -14 and -15 +E.8. Changes Between Versions -14 and -15 o Removed all defaults from state data. o Removed default from 'cur-hop-limit' in config. -E.8. Changes Between Versions -13 and -14 +E.9. Changes Between Versions -13 and -14 o Removed dependency of 'connected-ribs' on the 'multiple-ribs' feature. o Removed default value of 'cur-hop-limit' in state data. o Moved parts of descriptions and all references on IPv6 RA parameters from state data to configuration. o Added reference to RFC 6536 in the Security section. -E.9. Changes Between Versions -12 and -13 +E.10. Changes Between Versions -12 and -13 o Wrote appendix about minimum implementation. o Remove "when" statement for IPv6 router interface state data - it was dependent on a config value that may not be present. o Extra container for the next-hop list. o Names rather than numeric ids are used for referring to list entries in state data. @@ -2901,34 +3131,34 @@ o o Removed "if-feature multiple-ribs;" from connected-ribs. o "rib-name" instead of "name" is used as the name of leafref nodes. o "next-hop" instead of "nexthop" or "gateway" used throughout, both in node names and text. -E.10. Changes Between Versions -11 and -12 +E.11. Changes Between Versions -11 and -12 o Removed feature "advanced-router" and introduced two features instead: "multiple-ribs" and "multipath-routes". o Unified the keys of config and state versions of "routing- instance" and "rib" lists. o Numerical identifiers of state list entries are not keys anymore, but they are constrained using the "unique" statement. o Updated acknowledgements. -E.11. Changes Between Versions -10 and -11 +E.12. Changes Between Versions -10 and -11 o Migrated address families from IANA enumerations to identities. o Terminology and node names aligned with the I2RS RIB model: router -> routing instance, routing table -> RIB. o Introduced uint64 keys for state lists: routing-instance, rib, route, nexthop. o Described the relationship between system-controlled and user- @@ -2938,70 +3168,70 @@ router". o Made nexthop into a choice in order to allow for nexthop-list (I2RS requirement). o Added nexthop-list with entries having priorities (backup) and weights (load balancing). o Updated bibliography references. -E.12. Changes Between Versions -09 and -10 +E.13. Changes Between Versions -09 and -10 o Added subtree for state data ("/routing-state"). o Terms "system-controlled entry" and "user-controlled entry" defined and used. o New feature "user-defined-routing-tables". Nodes that are useful only with user-defined routing tables are now conditional. o Added grouping "router-id". o In routing tables, "source-protocol" attribute of routes now reports only protocol type, and its datatype is "identityref". o Renamed "main-routing-table" to "default-routing-table". -E.13. Changes Between Versions -08 and -09 +E.14. Changes Between Versions -08 and -09 o Fixed "must" expression for "connected-routing-table". o Simplified "must" expression for "main-routing-table". o Moved per-interface configuration of a new routing protocol under 'routing-protocol'. This also affects the 'example-rip' module. -E.14. Changes Between Versions -07 and -08 +E.15. Changes Between Versions -07 and -08 o Changed reference from RFC6021 to RFC6021bis. -E.15. Changes Between Versions -06 and -07 +E.16. Changes Between Versions -06 and -07 o The contents of in Appendix D was updated: "eth[01]" is used as the value of "location", and "forwarding" is on for both interfaces and both IPv4 and IPv6. o The "must" expression for "main-routing-table" was modified to avoid redundant error messages reporting address family mismatch when "name" points to a non-existent routing table. o The default behavior for IPv6 RA prefix advertisements was clarified. o Changed type of "rt:router-id" to "ip:dotted-quad". o Type of "rt:router-id" changed to "yang:dotted-quad". o Fixed missing prefixes in XPath expressions. -E.16. Changes Between Versions -05 and -06 +E.17. Changes Between Versions -05 and -06 o Document title changed: "Configuration" was replaced by "Management". o New typedefs "routing-table-ref" and "route-filter-ref". o Double slashes "//" were removed from XPath expressions and replaced with the single "/". o Removed uniqueness requirement for "router-id". @@ -3009,21 +3239,21 @@ o Complete data tree is now in Appendix A. o Changed type of "source-protocol" from "leafref" to "string". o Clarified the relationship between routing protocol instances and connected routing tables. o Added a must constraint saying that a routing table connected to the direct pseudo-protocol must not be a main routing table. -E.17. Changes Between Versions -04 and -05 +E.18. Changes Between Versions -04 and -05 o Routing tables are now global, i.e., "routing-tables" is a child of "routing" rather than "router". o "must" statement for "static-routes" changed to "when". o Added "main-routing-tables" containing references to main routing tables for each address family. o Removed the defaults for "address-family" and "safi" and made them @@ -3044,35 +3274,35 @@ o The "direct" pseudo-protocol is always connected to main routing tables. o Entries in the list of connected routing tables renamed from "routing-table" to "connected-routing-table". o Added "must" constraint saying that a routing table must not be its own recipient. -E.18. Changes Between Versions -03 and -04 +E.19. Changes Between Versions -03 and -04 o Changed "error-tag" for both RPC operations from "missing element" to "data-missing". o Removed the decrementing behavior for advertised IPv6 prefix parameters "valid-lifetime" and "preferred-lifetime". o Changed the key of the static route lists from "seqno" to "id" because the routes needn't be sorted. o Added 'must' constraint saying that "preferred-lifetime" must not be greater than "valid-lifetime". -E.19. Changes Between Versions -02 and -03 +E.20. Changes Between Versions -02 and -03 o Module "iana-afn-safi" moved to I-D "iana-if-type". o Removed forwarding table. o RPC "get-route" changed to "active-route". Its output is a list of routes (for multi-path routing). o New RPC "route-count". @@ -3090,21 +3320,21 @@ "ietf-ip". o Added "router-id" leaf. o Specified the names for IPv4/IPv6 unicast main routing tables. o Route parameter "last-modified" changed to "age". o Added container "recipient-routing-tables". -E.20. Changes Between Versions -01 and -02 +E.21. Changes Between Versions -01 and -02 o Added module "ietf-ipv6-unicast-routing". o The example in Appendix D now uses IP addresses from blocks reserved for documentation. o Direct routes appear by default in the forwarding table. o Network layer interfaces must be assigned to a router instance. Additional interface configuration may be present. @@ -3114,21 +3344,21 @@ o Additional "must" statements were added. o The "route-content" grouping for IPv4 and IPv6 unicast now includes the material from the "ietf-routing" version via "uses rt:route-content". o Explanation of symbols in the tree representation of data model hierarchy. -E.21. Changes Between Versions -00 and -01 +E.22. Changes Between Versions -00 and -01 o AFN/SAFI-independent stuff was moved to the "ietf-routing" module. o Typedefs for AFN and SAFI were placed in a separate "iana-afn- safi" module. o Names of some data nodes were changed, in particular "routing- process" is now "router". o The restriction of a single AFN/SAFI per router was lifted.