--- 1/draft-ietf-netmod-routing-cfg-14.txt 2014-05-25 11:14:25.815114621 -0700 +++ 2/draft-ietf-netmod-routing-cfg-15.txt 2014-05-25 11:14:25.959118151 -0700 @@ -1,18 +1,18 @@ NETMOD L. Lhotka Internet-Draft CZ.NIC -Intended status: Standards Track May 22, 2014 -Expires: November 23, 2014 +Intended status: Standards Track May 25, 2014 +Expires: November 26, 2014 A YANG Data Model for Routing Management - draft-ietf-netmod-routing-cfg-14 + draft-ietf-netmod-routing-cfg-15 Abstract This document contains a specification of three YANG modules. 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 individual routing protocols and other related functions. The core routing data model provides common building blocks for such extensions - routing instances, routes, @@ -26,21 +26,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 November 23, 2014. + This Internet-Draft will expire on November 26, 2014. Copyright Notice Copyright (c) 2014 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 @@ -84,34 +84,35 @@ 13. References . . . . . . . . . . . . . . . . . . . . . . . . . . 73 13.1. Normative References . . . . . . . . . . . . . . . . . . . 73 13.2. Informative References . . . . . . . . . . . . . . . . . . 73 Appendix A. The Complete Data Trees . . . . . . . . . . . . . . . 74 A.1. Configuration Data . . . . . . . . . . . . . . . . . . . . 74 A.2. Operational State Data . . . . . . . . . . . . . . . . . . 76 Appendix B. Minimum Implementation . . . . . . . . . . . . . . . 78 Appendix C. Example: Adding a New Routing Protocol . . . . . . . 79 Appendix D. Example: NETCONF Reply . . . . . . . . . . . . 82 Appendix E. Change Log . . . . . . . . . . . . . . . . . . . . . 89 - E.1. Changes Between Versions -13 and -14 . . . . . . . . . . . 89 - E.2. Changes Between Versions -12 and -13 . . . . . . . . . . . 89 - E.3. Changes Between Versions -11 and -12 . . . . . . . . . . . 90 - E.4. Changes Between Versions -10 and -11 . . . . . . . . . . . 90 - E.5. Changes Between Versions -09 and -10 . . . . . . . . . . . 90 - E.6. Changes Between Versions -08 and -09 . . . . . . . . . . . 91 - E.7. Changes Between Versions -07 and -08 . . . . . . . . . . . 91 - E.8. Changes Between Versions -06 and -07 . . . . . . . . . . . 91 - E.9. Changes Between Versions -05 and -06 . . . . . . . . . . . 91 - E.10. Changes Between Versions -04 and -05 . . . . . . . . . . . 92 - E.11. Changes Between Versions -03 and -04 . . . . . . . . . . . 93 - E.12. Changes Between Versions -02 and -03 . . . . . . . . . . . 93 - E.13. Changes Between Versions -01 and -02 . . . . . . . . . . . 94 - E.14. Changes Between Versions -00 and -01 . . . . . . . . . . . 94 + E.1. Changes Between Versions -14 and -15 . . . . . . . . . . . 89 + E.2. Changes Between Versions -13 and -14 . . . . . . . . . . . 89 + E.3. Changes Between Versions -12 and -13 . . . . . . . . . . . 89 + E.4. Changes Between Versions -11 and -12 . . . . . . . . . . . 90 + E.5. Changes Between Versions -10 and -11 . . . . . . . . . . . 90 + E.6. Changes Between Versions -09 and -10 . . . . . . . . . . . 90 + E.7. Changes Between Versions -08 and -09 . . . . . . . . . . . 91 + E.8. Changes Between Versions -07 and -08 . . . . . . . . . . . 91 + E.9. Changes Between Versions -06 and -07 . . . . . . . . . . . 91 + E.10. Changes Between Versions -05 and -06 . . . . . . . . . . . 91 + E.11. Changes Between Versions -04 and -05 . . . . . . . . . . . 92 + E.12. Changes Between Versions -03 and -04 . . . . . . . . . . . 93 + E.13. Changes Between Versions -02 and -03 . . . . . . . . . . . 93 + E.14. Changes Between Versions -01 and -02 . . . . . . . . . . . 94 + E.15. Changes Between Versions -00 and -01 . . . . . . . . . . . 94 Author's Address . . . . . . . . . . . . . . . . . . . . . . . . . 95 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" @@ -771,21 +772,21 @@ 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 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:route + /rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route and /rt:active-route/rt:output/rt:route, and possibly other places in the configuration, state data 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 @@ -899,21 +900,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 Ed.: 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@2014-05-22.yang" + file "ietf-routing@2014-05-24.yang" module ietf-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-routing"; prefix "rt"; import ietf-yang-types { prefix "yang"; } @@ -948,21 +949,21 @@ 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). This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2014-05-22 { + revision 2014-05-24 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* Features */ feature multiple-ribs { description @@ -1211,44 +1212,42 @@ value "1"; description "Primary next-hop."; } enum backup { value "2"; description "Backup next-hop."; } } - default "primary"; 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."; } - default "0"; 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. - The default value of 0 represents equal load-balancing. + 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 routes."; choice next-hop-options { @@ -1325,23 +1324,21 @@ i.e., it SHOULD NOT change across reboots."; } uses state-entry-id { refine "id" { mandatory "true"; } } leaf type { type identityref { base routing-instance-type; - } - default "rt:standard-routing-instance"; description "The routing instance type, primarily intended for discriminating among different types of logical routers, route virtualization, master-slave arrangements etc., while keeping all routing instances in the same flat list."; } uses router-id { description "Global router ID. @@ -1932,21 +1927,21 @@ } 8. IPv4 Unicast Routing Management YANG Module RFC Ed.: 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@2014-05-22.yang" + file "ietf-ipv4-unicast-routing@2014-05-24.yang" module ietf-ipv4-unicast-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing"; prefix "v4ur"; import ietf-routing { prefix "rt"; } @@ -1982,21 +1977,21 @@ 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). This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2014-05-22 { + revision 2014-05-24 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* Identities */ identity ipv4-unicast { base rt:ipv4; @@ -2144,21 +2139,28 @@ type leafref { path "../../../../../../../../rt:interfaces/" + "rt:interface/rt:name"; } description "Name of the outgoing interface. Only interfaces configured for the ancestor routing instance can be given."; } - uses rt:next-hop-classifiers; + uses rt:next-hop-classifiers { + refine "priority" { + default "primary"; + } + refine "weight" { + default "0"; + } + } } } } } } } } /* RPC methods */ @@ -2229,21 +2229,21 @@ } 9. IPv6 Unicast Routing Management YANG Module RFC Ed.: 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@2014-05-22.yang" + file "ietf-ipv6-unicast-routing@2014-05-25.yang" module ietf-ipv6-unicast-routing { namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing"; prefix "v6ur"; import ietf-routing { prefix "rt"; } @@ -2287,21 +2287,21 @@ 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). This version of this YANG module is part of RFC XXXX; see the RFC itself for full legal notices."; - revision 2014-05-22 { + revision 2014-05-25 { description "Initial revision."; reference "RFC XXXX: A YANG Data Model for Routing Management"; } /* Identities */ identity ipv6-unicast { base rt:ipv6; @@ -2313,94 +2313,86 @@ augment "/rt:routing-state/rt:routing-instance/rt:interfaces/" + "rt:interface" { description "IPv6-specific parameters of router interfaces."; container ipv6-router-advertisements { description "Parameters of IPv6 Router Advertisements."; leaf send-advertisements { type boolean; - default "false"; description "A flag indicating whether or not the router sends periodic Router Advertisements and responds to Router Solicitations."; } leaf max-rtr-adv-interval { type uint16 { range "4..1800"; } units "seconds"; - default "600"; description "The maximum time allowed between sending unsolicited multicast Router Advertisements from the interface."; } leaf min-rtr-adv-interval { type uint16 { range "3..1350"; } units "seconds"; description "The minimum time allowed between sending unsolicited multicast Router Advertisements from the interface."; } leaf managed-flag { type boolean; - default "false"; description - "The boolean value that is placed in the 'Managed address + "The value that is placed in the 'Managed address configuration' flag field in the Router Advertisement."; } leaf other-config-flag { type boolean; - default "false"; description - "The boolean value that is placed in the 'Other - configuration' flag field in the Router Advertisement."; + "The value that is placed in the 'Other configuration' flag + field in the Router Advertisement."; } leaf link-mtu { type uint32; - default "0"; description "The value that is placed in MTU options sent by the router. A value of zero indicates that no MTU options are sent."; } leaf reachable-time { type uint32 { range "0..3600000"; } units "milliseconds"; - default "0"; description "The value that is placed in the Reachable Time field in - the Router Advertisement messages sent by the router. The - value zero means unspecified (by this router)."; + the Router Advertisement messages sent by the router. A + value of zero means unspecified (by this router)."; } leaf retrans-timer { type uint32; units "milliseconds"; - default "0"; description "The value that is placed in the Retrans Timer field in the - Router Advertisement messages sent by the router. The - value zero means unspecified (by this router)."; + Router Advertisement messages sent by the router. A value + of zero means unspecified (by this router)."; } leaf cur-hop-limit { type uint8; description - "The default value that is placed in the Cur Hop Limit - field in the Router Advertisement messages sent by the - router. The value zero means unspecified (by this - router)."; + "The value that is placed in the Cur Hop Limit field in the + Router Advertisement messages sent by the router. A value + of zero means unspecified (by this router)."; } leaf default-lifetime { type uint16 { range "0..9000"; } units "seconds"; description "The value that is placed in the Router Lifetime field of Router Advertisements sent from the interface, in seconds. A value of zero indicates that the router is not to be @@ -2420,46 +2412,42 @@ description "Advertised prefix entry and its parameters."; leaf prefix-spec { type inet:ipv6-prefix; description "IPv6 address prefix."; } leaf valid-lifetime { type uint32; units "seconds"; - default "2592000"; description "The value that is placed in the Valid Lifetime in the Prefix Information option. The designated value of all 1's (0xffffffff) represents infinity."; } leaf on-link-flag { type boolean; - default "true"; description "The value that is placed in the on-link flag ('L-bit') field in the Prefix Information option."; } leaf preferred-lifetime { type uint32; units "seconds"; - default "604800"; description "The value that is placed in the Preferred Lifetime in the Prefix Information option, in seconds. The designated value of all 1's (0xffffffff) represents infinity."; } leaf autonomous-flag { type boolean; - default "true"; description "The value that is placed in the Autonomous Flag field in the Prefix Information option."; } } } } } augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route" { @@ -2572,32 +2560,32 @@ - otherwise it is 0.75 * max-rtr-adv-interval."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - MinRtrAdvInterval."; } leaf managed-flag { type boolean; default "false"; description - "The boolean value to be placed in the 'Managed address + "The value to be placed in the 'Managed address configuration' flag field in the Router Advertisement."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvManagedFlag."; } leaf other-config-flag { type boolean; default "false"; description - "The boolean value to be placed in the 'Other - configuration' flag field in the Router Advertisement."; + "The value to be placed in the 'Other configuration' flag + field in the Router Advertisement."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvOtherConfigFlag."; } leaf link-mtu { type uint32; default "0"; description "The value to be placed in MTU options sent by the router. A value of zero indicates that no MTU options are sent."; @@ -2606,66 +2594,64 @@ AdvLinkMTU."; } leaf reachable-time { type uint32 { range "0..3600000"; } units "milliseconds"; default "0"; description "The value to be placed in the Reachable Time field in the - Router Advertisement messages sent by the router. The - value zero means unspecified (by this router)."; - + Router Advertisement messages sent by the router. A value + of zero means unspecified (by this router)."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvReachableTime."; } leaf retrans-timer { type uint32; units "milliseconds"; default "0"; description "The value to be placed in the Retrans Timer field in the - Router Advertisement messages sent by the router. The - value zero means unspecified (by this router)."; + Router Advertisement messages sent by the router. A value + of zero means unspecified (by this router)."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvRetransTimer."; } leaf cur-hop-limit { type uint8; - default "64"; description - "The default value to be placed in the Cur Hop Limit field - in the Router Advertisement messages sent by the router. - The value zero means unspecified (by this router). + "The value to be placed in the Cur Hop Limit field in the + Router Advertisement messages sent by the router. A value + of zero means unspecified (by this router). If this parameter is not configured, the device SHOULD use the value specified in IANA Assigned Numbers that was in effect at the time of implementation."; reference - "- RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - + "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvCurHopLimit. - - IANA: IP Parameters, + IANA: IP Parameters, http://www.iana.org/assignments/ip-parameters"; } leaf default-lifetime { type uint16 { range "0..9000"; } units "seconds"; description "The value to be placed in the Router Lifetime field of Router Advertisements sent from the interface, in seconds. - MUST be either zero or between max-rtr-adv-interval and + It MUST be either zero or between max-rtr-adv-interval and 9000 seconds. A value of zero indicates that the router is not to be used as a default router. These limits may be overridden by specific documents that describe how IPv6 operates over different link layers. If this parameter is not configured, the device SHOULD use a value of 3 * max-rtr-adv-interval."; reference "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) - AdvDefaultLifeTime."; @@ -2855,21 +2841,29 @@ type leafref { path "../../../../../../../../rt:interfaces/" + "rt:interface/rt:name"; } description "Name of the outgoing interface. Only interfaces configured for the ancestor routing instance can be given."; } - uses rt:next-hop-classifiers; + uses rt:next-hop-classifiers { + refine "priority" { + default "primary"; + } + refine "weight" { + default "0"; + } + + } } } } } } } } /* RPC methods */ @@ -3740,33 +3733,39 @@ Appendix E. Change Log RFC Editor: remove this section upon publication as an RFC. -E.1. Changes Between Versions -13 and -14 +E.1. Changes Between Versions -14 and -15 + + o Removed all defaults from state data. + + o Removed default from 'cur-hop-limit' in config. + +E.2. 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.2. Changes Between Versions -12 and -13 +E.3. Changes Between Versions -12 and -13 o Wrote appendix about minimum implementation. o Remove "when" statement for IPv6 router interface operational state - 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 @@ -3780,34 +3779,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.3. Changes Between Versions -11 and -12 +E.4. 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.4. Changes Between Versions -10 and -11 +E.5. 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- @@ -3817,70 +3816,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.5. Changes Between Versions -09 and -10 +E.6. Changes Between Versions -09 and -10 o Added subtree for operational 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.6. Changes Between Versions -08 and -09 +E.7. Changes Between Versions -08 and -09 o Fixed "must" expresion 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.7. Changes Between Versions -07 and -08 +E.8. Changes Between Versions -07 and -08 o Changed reference from RFC6021 to RFC6021bis. -E.8. Changes Between Versions -06 and -07 +E.9. 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.9. Changes Between Versions -05 and -06 +E.10. 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". @@ -3888,21 +3887,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.10. Changes Between Versions -04 and -05 +E.11. 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 @@ -3923,35 +3922,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.11. Changes Between Versions -03 and -04 +E.12. Changes Between Versions -03 and -04 o Changed "error-tag" for both RPC methods 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.12. Changes Between Versions -02 and -03 +E.13. 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". @@ -3969,21 +3968,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.13. Changes Between Versions -01 and -02 +E.14. 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. @@ -3993,21 +3992,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.14. Changes Between Versions -00 and -01 +E.15. 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.