--- 1/draft-ietf-lisp-yang-01.txt 2016-06-20 00:15:54.904795188 -0700 +++ 2/draft-ietf-lisp-yang-02.txt 2016-06-20 00:15:55.088799789 -0700 @@ -1,26 +1,26 @@ -Network Working Group V. Ermagan +LISP Working Group V. Ermagan Internet-Draft Cisco Systems Intended status: Experimental A. Rodriguez-Natal -Expires: June 19, 2016 F. Coras +Expires: December 20, 2016 F. Coras Technical University of Catalonia C. Moberg Cisco Systems A. Cabellos-Aparicio Technical University of Catalonia F. Maino Cisco Systems - December 17, 2015 + June 18, 2016 LISP Configuration YANG Model - draft-ietf-lisp-yang-01 + draft-ietf-lisp-yang-02 Abstract This document describes a YANG data model to use with the Locator/ID Separation Protocol (LISP). Status of This Memo This Internet-Draft is submitted in full conformance with the provisions of BCP 78 and BCP 79. @@ -28,25 +28,25 @@ 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 June 19, 2016. + This Internet-Draft will expire on December 20, 2016. Copyright Notice - Copyright (c) 2015 IETF Trust and the persons identified as the + 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 carefully, as they describe your rights and restrictions with respect to this document. Code Components extracted from this document must include Simplified BSD License text as described in Section 4.e of the Trust Legal Provisions and are provided without warranty as @@ -229,28 +229,27 @@ "Group that defines a list of LISP locators."; list rloc { key "id"; description "List of routing locators"; leaf id { type string; description "Locator id"; } - // FC need to be sure we don't use interface-name in itr // cached mappings choice address-type { description "The address type of the locator"; case interface-name { leaf interface { - type if:interface-state-ref; + type if:interface-ref; description "The name of the interface supporting the locator."; } } case address { container locator-address { uses lcaf:lisp-address; description "The locator address provided in LISP canonincal address format."; @@ -1016,21 +1016,21 @@ | +--ro dest? inet:ip-prefix +--ro priority? uint8 +--ro weight? uint8 +--ro multicast-priority? uint8 +--ro multicast-weight? uint8 3.2. Module Definition file "ietf-lisp-itr@2015-07-02.yang" module ietf-lisp-itr { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-itr"; + namespace "urn:ietf:params:xml:ns:yang:lisp-itr"; prefix lisp-itr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -1061,21 +1062,21 @@ "Initial revision."; reference "https://tools.ietf.org/html/rfc6830"; } identity itr { base lisp:lisp-device; description "LISP ITR."; } augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-itr:itr" { + when "lisp:type = 'lisp-itr:itr'" { description "Augment is valid when LISP device type is ITR."; } description "This augments LISP devices list with ITR specific parameters."; container itr-cfg { presence "LISP ITR operation enabled"; description "ITR configuration"; @@ -1191,21 +1192,21 @@ } } container static-mappings { uses lisp:mappings; description "EID to RLOCs mappings cache."; } } } augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = lisp-itr:itr" { + when "lisp:type = 'lisp-itr:itr'" { description "Augment is valid when LISP device type is ITR."; } description "This augments LISP devices list state with ITR specific parameters."; container itr-state { config false; description "ITR state."; @@ -1388,21 +1389,21 @@ | +--rw multicast-weight? uint8 +--rw record-ttl? uint32 +--rw want-map-notify? boolean +--rw proxy-reply? boolean +--rw registration-interval? uint16 4.2. Module Definition file "ietf-lisp-etr@2015-07-02.yang" module ietf-lisp-etr { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-etr"; + namespace "urn:ietf:params:xml:ns:yang:lisp-etr"; prefix lisp-etr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -1432,23 +1433,24 @@ revision 2015-07-02 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6830"; } identity etr { base lisp:lisp-device; description "LISP ETR."; + } augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-etr:etr" { + when "lisp:type = 'lisp-etr:etr'" { description "Augment is valid when LISP device type is ETR."; } description "This augments LISP devices list with ETR specific parameters."; container etr-cfg { presence "LISP ETR operation enabled"; description "ETR configuration parameters."; @@ -2018,22 +2020,22 @@ | +--ro source? inet:ip-prefix | +--ro dest? inet:ip-prefix +--ro priority? uint8 +--ro weight? uint8 +--ro multicast-priority? uint8 +--ro multicast-weight? uint8 5.2. Module Definition file "ietf-lisp-mapserver@2015-07-02.yang" - module ietf-lisp-mapserver { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-mapserver"; +module ietf-lisp-map-server { + namespace "urn:ietf:params:xml:ns:yang:lisp-ms"; prefix lisp-ms; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -2061,27 +2063,29 @@ the RFC itself for full legal notices. "; revision 2015-07-02 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6833"; } + identity ms { base lisp:lisp-device; description "LISP Map-Server."; } + augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-ms:ms" { + when "lisp:type = 'lisp-ms:ms'" { description "Augment is valid when LISP device type is Map-Server."; } description "This augments LISP devices list with Map-Server specific parameters."; container map-server-cfg { presence "LISP Map-Server operation enabled"; description "Map-Server configuration parameters."; @@ -2091,28 +2095,29 @@ list site { key "site-id"; description "List of sites for which the Map-Server acceptes registrations."; leaf site-id { type uint64; description "Site identifier."; } - //Can be augmented to have below for per site auth-key + // This model can be augmented with below for per site auth-key // leaf auth-key { // description "clear text authentication key"; // type string; // } container devices { description "Site devices registered with the Map-Server."; + list device { key "device-id"; description "List of site devices registered with the Map-Server."; leaf device-id { type uint64; description "Device identifier."; } @@ -2147,30 +2152,31 @@ uses lcaf:lisp-address; description "EID in generic LISP address format registered with the Map-Server."; } leaf more-specifics-accepted { type boolean; description "Flag indicating if more specific prefixes can be registered."; + } leaf mapping-expiration-timeout { type int16; units "seconds"; default "180"; //3 times the mapregister int description "Time before mapping is expired if no new registrations are received."; } - // Can be augmented to have below for per-eid auth-key + // This model can be augmented to have below for per-eid auth-key // leaf auth-key { // description "clear text authentication key"; // type string; // } } } } } } } @@ -2215,21 +2221,21 @@ container alt-mapping-system { presence "ALT Mapping System in use"; description "ALT Mapping System interface."; // TBD } } } } augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = lisp-ms:ms" { + when "lisp:type = 'lisp-ms:ms'" { description "Augment is valid when LISP device type is Map-Server."; } description "This augments LISP devices list state with Map-Server specific parameters."; container ms-state { config false; description "Map-Server state."; @@ -2257,22 +2263,22 @@ +--rw (mapping-system) +--:(ddt-mapping-system) | +--rw ddt-mapping-system! | +--rw ddt-root* inet:ip-address +--:(alt-mapping-system) +--rw alt-mapping-system! 6.2. Module Definition file "ietf-lisp-mapresolver@2015-07-02.yang" - module ietf-lisp-mapresolver { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-mapresolver"; + module ietf-lisp-map-resolver { + namespace "urn:ietf:params:xml:ns:yang:lisp-mr"; prefix lisp-mr; import ietf-lisp { prefix lisp; } import ietf-inet-types { prefix inet; } organization "IETF LISP (Locator/ID Separation Protocol) Working Group"; contact @@ -2301,21 +2307,21 @@ "Initial revision."; reference "https://tools.ietf.org/html/rfc6833"; } identity mr { base lisp:lisp-device; description "LISP Map-Resolver."; } augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-mr:mr" { + when "lisp:type = 'lisp-mr:mr'" { description "Augment is valid when LISP device type is Map-Resolver."; } description "This augments LISP devices list with Map-Resolver specific parameters."; container map-resolver-cfg { presence "LISP Map-Resolver operation enabled"; description "Map-Resolver configuration parameters."; @@ -2817,21 +2823,21 @@ | +--ro dest? inet:ip-prefix +--ro priority? uint8 +--ro weight? uint8 +--ro multicast-priority? uint8 +--ro multicast-weight? uint8 7.2. Module Definition file "ietf-lisp-pitr@2015-07-02.yang" module ietf-lisp-pitr { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-pitr"; + namespace "urn:ietf:params:xml:ns:yang:lisp-pitr"; prefix lisp-pitr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -2863,21 +2869,21 @@ "Initial revision."; reference "https://tools.ietf.org/html/rfc6832"; } identity pitr { base lisp:lisp-device; description "LISP PITR."; } augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-pitr:pitr" { + when "lisp:type = 'lisp-pitr:pitr'" { description "Augment is valid when LISP device type is PITR."; } description "This augments LISP devices list with PITR specific parameters."; container proxy-itr-cfg { presence "LISP PITR operation enabled"; description @@ -2928,21 +2934,21 @@ } } container static-mappings{ uses lisp:mappings; description "EID to RLOCs mappings cache."; } } } augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = lisp-pitr:pitr" { + when "lisp:type = 'lisp-pitr:pitr'" { description "Augment is valid when LISP device type is PITR."; } description "This augments LISP devices list state with PITR specific parameters."; container pitr-state { config false; description "ITR state."; @@ -3037,21 +3043,21 @@ | +--rw lrs-bits? bits +--:(sourc-dest-key) +--rw sourc-dest-key +--rw source? inet:ip-prefix +--rw dest? inet:ip-prefix 8.2. Module Definition file "ietf-lisp-petr@2015-07-02.yang" module ietf-lisp-petr { - namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-petr"; + namespace "urn:ietf:params:xml:ns:yang:lisp-petr"; prefix lisp-petr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } organization "IETF LISP (Locator/ID Separation Protocol) Working Group"; contact @@ -3079,21 +3085,21 @@ "Initial revision."; reference "https://tools.ietf.org/html/rfc6832"; } identity petr { base lisp:lisp-device; description "LISP PETR."; } augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = lisp-petr:petr" { + when "lisp:type = 'lisp-petr:petr'" { description "Augment is valid when LISP device type is PETR."; } description "This augments LISP devices list with PETR specific parameters."; container proxy-etr-cfg { presence "LISP PETR operation enabled"; description "Proxy ETR configuration parameters."; @@ -3128,25 +3134,25 @@ essential building block used in other LISP modules. 9.1. Module Definition file "ietf-lisp-address-types@2015-11-05.yang" module ietf-lisp-address-types { namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-address-types"; prefix laddr; import ietf-inet-types { prefix inet; - //revision-date 2010-09-24; + revision-date 2013-07-15; } import ietf-yang-types { prefix yang; - //revision-date 2010-09-24; + revision-date 2013-07-15; } organization "IETF LISP (Locator/ID Separation Protocol) Working Group"; contact "lisp@ietf.org"; description "This YANG module defines the LISP Canonical Address Formats (LCAF) for LISP. The module can be extended by vendors to define vendor-specific parameters. @@ -3372,123 +3378,123 @@ leaf virtual-network-id { type instance-id-type; description "Virtual Network Identifier (instance-id) of the address."; } choice address { description "Various LISP address types, including IP, MAC, and LCAF."; leaf no-address { - when "../../address-type = 'laddr:no-addr-afi'" { + when "../address-type = 'laddr:no-addr-afi'" { description "When AFI is 0."; } type empty; description "No address."; } leaf ipv4 { - when "../../address-type = 'laddr:ipv4-afi'" { + when "../address-type = 'laddr:ipv4-afi'" { description "When AFI is IPv4."; } type inet:ipv4-address; description "IPv4 address."; } leaf ipv4-prefix { - when "../../address-type = 'laddr:ipv4-prefix-afi'" { + when "../address-type = 'laddr:ipv4-prefix-afi'" { description "When AFI is IPv4."; } type inet:ipv4-prefix; description "IPv4 prefix."; } leaf ipv6 { - when "../../address-type = 'laddr:ipv6-afi'" { + when "../address-type = 'laddr:ipv6-afi'" { description "When AFI is IPv6."; } type inet:ipv6-address; description "IPv6 address."; } leaf ipv6-prefix { - when "../../address-type = 'laddr:ipv6-prefix-afi'" { + when "../address-type = 'laddr:ipv6-prefix-afi'" { description "When AFI is IPv6."; } type inet:ipv6-prefix; description "IPv6 address."; } leaf mac { - when "../../address-type = 'laddr:mac-afi'" { + when "../address-type = 'laddr:mac-afi'" { description "When AFI is MAC."; } type yang:mac-address; description "MAC address."; } leaf distinguished-name { - when "../../address-type = 'laddr:distinguished-name-afi'" { + when "../address-type = 'laddr:distinguished-name-afi'" { description "When AFI is distinguished-name."; } type distinguished-name-type; description "Distinguished Name address."; } leaf as-number { - when "../../address-type = 'laddr:as-number-afi'" { + when "../address-type = 'laddr:as-number-afi'" { description "When AFI is as-number."; } type inet:as-number; description "AS Number."; } container null-address { - when "../../address-type = 'null-address-lcaf'" { + when "../address-type = 'null-address-lcaf'" { description "When LCAF type is null."; } description "Null body LCAF type"; leaf address { type empty; description "AFI address."; } } container afi-list { - when "../../address-type = 'afi-list-lcaf'" { + when "../address-type = 'afi-list-lcaf'" { description "When LCAF type is AFI-List."; } description "AFI-List LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.16.1"; leaf-list address-list { type simple-address; description "List of AFI addresses."; } } container instance-id { - when "../../address-type = 'instance-id-lcaf'" { + when "../address-type = 'instance-id-lcaf'" { description "When LCAF type is Instance-ID"; } description "Instance ID LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.2"; leaf iid { type instance-id-type; @@ -3500,42 +3506,42 @@ description "Mask length."; } leaf address { type simple-address; description "AFI address."; } } container as-number-lcaf { - when "../../address-type = 'as-number-lcaf'" { + when "../address-type = 'as-number-lcaf'" { description "When LCAF type is AS-Number."; } description "AS Number LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.3"; leaf as { type inet:as-number; description "AS number."; } leaf address { type simple-address; description "AFI address."; } } container application-data { - when "../../address-type = 'application-data-lcaf'" { + when "../address-type = 'application-data-lcaf'" { description "When LCAF type is Application Data."; } description "Application Data LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.4"; leaf address { type simple-address; @@ -3567,21 +3573,21 @@ description "Low end of remote port range."; } leaf remote-port-high { type inet:port-number; description "High end of remote port range."; } } container geo-coordinates { - when "../../address-type = 'geo-coordinates-lcaf'" { + when "../address-type = 'geo-coordinates-lcaf'" { description "When LCAF type is Geo-coordinates."; } description "Geo-coordinates LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.5"; leaf latitude { type bits { @@ -3650,21 +3656,21 @@ description "Height relative to sea level in meters."; } leaf address { type simple-address; description "AFI address."; } } container nat-traversal { - when "../../address-type = 'nat-traversal-lcaf'" { + when "../address-type = 'nat-traversal-lcaf'" { description "When LCAF type is NAT-Traversal."; } description "NAT-Traversal LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.6"; leaf ms-udp-port { type uint16; @@ -3691,21 +3697,21 @@ description "Private ETR RLOC address."; } leaf-list rtr-rlocs { type simple-address; description "List of RTR RLOC addresses."; } } container explicit-locator-path { - when "../../address-type = 'explicit-locator-path-lcaf'" { + when "../address-type = 'explicit-locator-path-lcaf'" { description "When LCAF type type is Explicit Locator Path."; } description "Explicit Locator Path LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.9"; list hop { key "hop-id"; @@ -3737,63 +3743,63 @@ "Strict bit."; } } description "Flag bits per hop."; } } } container source-dest-key { - when "../../address-type = 'source-dest-key-lcaf'" { + when "../address-type = 'source-dest-key-lcaf'" { description "When LCAF type type is Source/Dest."; } description "Source/Dest LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.11"; leaf source { type simple-address; description "Source address."; } leaf dest { type simple-address; description "Destination address."; } } container key-value-address { - when "../../address-type = 'key-value-address-lcaf'" { + when "../address-type = 'key-value-address-lcaf'" { description "When LCAF type type is Key/Value Address."; } description "Key/Value Address LCAF type."; reference "http://tools.ietf.org/html/draft-ietf-lisp-lcaf-10 #section-4.11"; leaf key { type simple-address; description "Address as Key."; } leaf value { type simple-address; description "Address as Value."; } } container service-path { - when "../../address-type = 'service-path-lcaf'" { + when "../address-type = 'service-path-lcaf'" { description "When LCAF type service path identifier."; } description "Service Path LCAF type."; reference "http://tools.ietf.org/html/draft-ermagan-lisp-nsh-00"; leaf service-path-id { type service-path-id-type; @@ -3820,28 +3827,28 @@ This memo includes no request to IANA. 12. Security Considerations Security Considerations TBD 13. Normative References [I-D.ietf-lisp-ddt] - Fuller, V., Lewis, D., Ermagan, V., and A. Jain, "LISP - Delegated Database Tree", draft-ietf-lisp-ddt-03 (work in - progress), April 2015. + Fuller, V., Lewis, D., Ermagan, V., Jain, A., and A. + Smirnov, "LISP Delegated Database Tree", draft-ietf-lisp- + ddt-07 (work in progress), May 2016. [I-D.ietf-lisp-lcaf] Farinacci, D., Meyer, D., and J. Snijders, "LISP Canonical - Address Format (LCAF)", draft-ietf-lisp-lcaf-11 (work in - progress), September 2015. + Address Format (LCAF)", draft-ietf-lisp-lcaf-13 (work in + progress), May 2016. [RFC2119] Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997, . [RFC6830] Farinacci, D., Fuller, V., Meyer, D., and D. Lewis, "The Locator/ID Separation Protocol (LISP)", RFC 6830, DOI 10.17487/RFC6830, January 2013, .