--- 1/draft-ietf-lisp-yang-02.txt 2016-07-07 14:15:57.778068549 -0700 +++ 2/draft-ietf-lisp-yang-03.txt 2016-07-07 14:15:57.938072551 -0700 @@ -1,26 +1,26 @@ LISP Working Group V. Ermagan Internet-Draft Cisco Systems Intended status: Experimental A. Rodriguez-Natal -Expires: December 20, 2016 F. Coras +Expires: January 7, 2017 F. Coras Technical University of Catalonia C. Moberg Cisco Systems A. Cabellos-Aparicio Technical University of Catalonia F. Maino Cisco Systems - June 18, 2016 + July 6, 2016 LISP Configuration YANG Model - draft-ietf-lisp-yang-02 + draft-ietf-lisp-yang-03 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,21 +28,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 December 20, 2016. + This Internet-Draft will expire on January 7, 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 @@ -50,78 +50,181 @@ 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 described in the Simplified BSD License. Table of Contents 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2 2. LISP Module . . . . . . . . . . . . . . . . . . . . . . . . . 3 2.1. Module Structure . . . . . . . . . . . . . . . . . . . . 3 - 2.2. Module Definition . . . . . . . . . . . . . . . . . . . . 3 - 3. LISP-ITR Module . . . . . . . . . . . . . . . . . . . . . . . 9 - 3.1. Module Structure . . . . . . . . . . . . . . . . . . . . 9 - 3.2. Module Definition . . . . . . . . . . . . . . . . . . . . 22 - 4. LISP ETR Module . . . . . . . . . . . . . . . . . . . . . . . 26 - 4.1. Module Structure . . . . . . . . . . . . . . . . . . . . 26 - 4.2. Module Definition . . . . . . . . . . . . . . . . . . . . 30 - 5. LISP Map Server Module . . . . . . . . . . . . . . . . . . . 33 - 5.1. Module Structure . . . . . . . . . . . . . . . . . . . . 33 - 5.2. Module Definition . . . . . . . . . . . . . . . . . . . . 43 - 6. LISP Map Resolver Module . . . . . . . . . . . . . . . . . . 47 - 6.1. Module Structure . . . . . . . . . . . . . . . . . . . . 48 - 6.2. Module Definition . . . . . . . . . . . . . . . . . . . . 48 - 7. LISP Proxy ITR Module . . . . . . . . . . . . . . . . . . . . 50 - 7.1. Module Structure . . . . . . . . . . . . . . . . . . . . 50 + 2.2. Module Definition . . . . . . . . . . . . . . . . . . . . 5 + 3. LISP-ITR Module . . . . . . . . . . . . . . . . . . . . . . . 13 + 3.1. Module Structure . . . . . . . . . . . . . . . . . . . . 14 + 3.2. Module Definition . . . . . . . . . . . . . . . . . . . . 27 + 4. LISP ETR Module . . . . . . . . . . . . . . . . . . . . . . . 30 + 4.1. Module Structure . . . . . . . . . . . . . . . . . . . . 31 + 4.2. Module Definition . . . . . . . . . . . . . . . . . . . . 33 + 5. LISP Map Server Module . . . . . . . . . . . . . . . . . . . 36 + 5.1. Module Structure . . . . . . . . . . . . . . . . . . . . 36 + 5.2. Module Definition . . . . . . . . . . . . . . . . . . . . 42 + 6. LISP Map Resolver Module . . . . . . . . . . . . . . . . . . 45 + 6.1. Module Structure . . . . . . . . . . . . . . . . . . . . 45 + 6.2. Module Definition . . . . . . . . . . . . . . . . . . . . 45 + 7. LISP Proxy ITR Module . . . . . . . . . . . . . . . . . . . . 47 + 7.1. Module Structure . . . . . . . . . . . . . . . . . . . . 47 7.2. Module Definition . . . . . . . . . . . . . . . . . . . . 59 - 8. LISP Proxy ETR Module . . . . . . . . . . . . . . . . . . . . 62 - 8.1. Module Structure . . . . . . . . . . . . . . . . . . . . 62 - 8.2. Module Definition . . . . . . . . . . . . . . . . . . . . 64 - 9. LISP Address Types . . . . . . . . . . . . . . . . . . . . . 66 - 9.1. Module Definition . . . . . . . . . . . . . . . . . . . . 66 - 10. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . . 80 - 11. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 80 - 12. Security Considerations . . . . . . . . . . . . . . . . . . . 80 - 13. Normative References . . . . . . . . . . . . . . . . . . . . 80 - Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 81 + 8. LISP Proxy ETR Module . . . . . . . . . . . . . . . . . . . . 61 + 8.1. Module Structure . . . . . . . . . . . . . . . . . . . . 61 + 8.2. Module Definition . . . . . . . . . . . . . . . . . . . . 63 + 9. LISP Address Types . . . . . . . . . . . . . . . . . . . . . 65 + 9.1. Module Definition . . . . . . . . . . . . . . . . . . . . 65 + 10. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . . 79 + 11. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 79 + 12. Security Considerations . . . . . . . . . . . . . . . . . . . 79 + 13. Normative References . . . . . . . . . . . . . . . . . . . . 79 + Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 80 1. Introduction The Locator/ID Separation Protocol (LISP) defines several network elements subject to be configured. This document presents the YANG data models required for basic configuration of all major LISP [RFC6830]elements. The models also capture some essential operational data elements as well. 2. LISP Module This module is the base LISP module that is augmented in multiple models to represent various LISP device roles. 2.1. Module Structure module: ietf-lisp +--rw lisp - | +--rw devices - | +--rw device* [type id] - | +--rw type device-ref - | +--rw id string + | +--rw locator-sets + | | +--rw locator-set* [locator-set-name] + | | +--rw locator-set-name string + | | +--rw (locator-type)? + | | +--:(local-interface) + | | | +--rw interface* [interface-ref] + | | | +--rw interface-ref if:interface-ref + | | | +--rw priority? uint8 + | | | +--rw weight? uint8 + | | | +--rw multicast-priority? uint8 + | | | +--rw multicast-weight? uint8 + | | +--:(general-locator) + | | +--rw locator* [id] + | | +--rw id string + | | +--rw locator-address + | | | +--rw address-type lisp-address-family-ref + | | | +--rw virtual-network-id? instance-id-type + | | | +--rw (address)? + | | | +--:(no-address) + | | | | +--rw no-address? empty + | | | +--:(ipv4) + | | | | +--rw ipv4? inet:ipv4-address + | | | +--:(ipv4-prefix) + | | | | +--rw ipv4-prefix? inet:ipv4-prefix + | | | +--:(ipv6) + | | | | +--rw ipv6? inet:ipv6-address + | | | +--:(ipv6-prefix) + | | | | +--rw ipv6-prefix? inet:ipv6-prefix + | | | +--:(mac) + | | | | +--rw mac? yang:mac-address + | | | +--:(distinguished-name) + | | | | +--rw distinguished-name? distinguished-name-type + | | | +--:(as-number) + | | | | +--rw as-number? inet:as-number + | | | +--:(null-address) + | | | | +--rw null-address + | | | | +--rw address? empty + | | | +--:(afi-list) + | | | | +--rw afi-list + | | | | +--rw address-list* simple-address + | | | +--:(instance-id) + | | | | +--rw instance-id + | | | | +--rw iid? instance-id-type + | | | | +--rw mask-length? uint8 + | | | | +--rw address? simple-address + | | | +--:(as-number-lcaf) + | | | | +--rw as-number-lcaf + | | | | +--rw as? inet:as-number + | | | | +--rw address? simple-address + | | | +--:(application-data) + | | | | +--rw application-data + | | | | +--rw address? simple-address + | | | | +--rw protocol? uint8 + | | | | +--rw ip-tos? int32 + | | | | +--rw local-port-low? inet:port-number + | | | | +--rw local-port-high? inet:port-number + | | | | +--rw remote-port-low? inet:port-number + | | | | +--rw remote-port-high? inet:port-number + | | | +--:(geo-coordinates) + | | | | +--rw geo-coordinates + | | | | +--rw latitude? bits + | | | | +--rw latitude-degrees? uint8 + | | | | +--rw latitude-minutes? uint8 + | | | | +--rw latitude-seconds? uint8 + | | | | +--rw longitude? bits + | | | | +--rw longitude-degrees? uint16 + | | | | +--rw longitude-minutes? uint8 + | | | | +--rw longitude-seconds? uint8 + | | | | +--rw altitude? int32 + | | | | +--rw address? simple-address + | | | +--:(nat-traversal) + | | | | +--rw nat-traversal + | | | | +--rw ms-udp-port? uint16 + | | | | +--rw etr-udp-port? uint16 + | | | | +--rw global-etr-rloc? simple-address + | | | | +--rw ms-rloc? simple-address + | | | | +--rw private-etr-rloc? simple-address + | | | | +--rw rtr-rlocs* simple-address + | | | +--:(explicit-locator-path) + | | | | +--rw explicit-locator-path + | | | | +--rw hop* [hop-id] + | | | | +--rw hop-id string + | | | | +--rw address? simple-address + | | | | +--rw lrs-bits? bits + | | | +--:(source-dest-key) + | | | | +--rw source-dest-key + | | | | +--rw source? simple-address + | | | | +--rw dest? simple-address + | | | +--:(key-value-address) + | | | | +--rw key-value-address + | | | | +--rw key? simple-address + | | | | +--rw value? simple-address + | | | +--:(service-path) + | | | +--rw service-path + | | | +--rw service-path-id? service-path-id-type + | | | +--rw service-index? uint8 + | | +--rw priority? uint8 + | | +--rw weight? uint8 + | | +--rw multicast-priority? uint8 + | | +--rw multicast-weight? uint8 + | +--rw lisp-router-instances + | +--rw lisp-router-instance* [lisp-router-instance-id] + | +--rw lisp-router-instance-id int32 + | +--rw lisp-role* [lisp-role-type] + | +--rw lisp-role-type lisp-role-ref | +--rw enabled? boolean +--ro lisp-state - +--ro devices - +--ro device* [type id] - +--ro type device-ref - +--ro id string + +--ro lisp-router-instances + +--ro lisp-router-instance* [lisp-router-instance-id] + +--ro lisp-router-instance-id int32 + +--ro lisp-role* [lisp-role-type] + +--ro lisp-role-type lisp-role-ref + +--ro enabled? boolean 2.2. Module Definition - file "ietf-lisp@2014-12-19.yang" + file "ietf-lisp@2016-06-30.yang" module ietf-lisp { namespace "urn:ietf:params:xml:ns:yang:ietf-lisp"; prefix lisp; import ietf-interfaces { prefix if; } import ietf-lisp-address-types { prefix lcaf; } organization @@ -141,36 +244,53 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2014-12-19 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6830"; } - identity lisp-device { + identity lisp-role { description - "LISP network device."; + "LISP router role."; } - typedef device-ref { + identity mapping-system { + description + "Mapping System interface"; + } + identity single-node-mapping-system { + base mapping-system; + description + "logically singular Map Server"; + } + typedef mapping-system-ref { type identityref { - base lisp-device; + base mapping-system; } description - "LISP device reference"; + "Mapping System reference"; + } + + typedef lisp-role-ref { + type identityref { + base lisp-role; + } + description + "LISP role reference"; } typedef map-reply-action { type enumeration { enum no-action { value 0; description "Mapping is kept alive and no encapsulation occurs."; } enum natively-forward { value 1; @@ -217,71 +336,108 @@ description "HMAC-SHA-256-128 (RFC4868) authentication is used."; } } description "Enumeration of the authentication mechansms supported by LISP."; reference "https://tools.ietf.org/html/rfc6830#section-6.1.6"; } - grouping locators { + + grouping locator-properties { + description + "Properties of a RLOC"; + leaf priority { + type uint8; + description + "Locator priority."; + } + leaf weight { + type uint8; + description + "Locator weight."; + } + leaf multicast-priority { + type uint8; + description + "Locator's multicast priority"; + } + leaf multicast-weight { + type uint8; + description + "Locator's multicast weight"; + } + } + + grouping locators-grouping { description "Group that defines a list of LISP locators."; - list rloc { + // vina: container? + list locator { key "id"; description "List of routing locators"; leaf id { - type string; - description - "Locator id"; + type string { + length "1..64"; } - // cached mappings - choice address-type { - description - "The address type of the locator"; - case interface-name { - leaf interface { - type if:interface-ref; description - "The name of the interface supporting the locator."; - } + "Locator id"; } - case address { container locator-address { uses lcaf:lisp-address; description "The locator address provided in LISP canonincal address format."; } + uses locator-properties; } + } - leaf priority { - type uint8; + + grouping local-locators-grouping { description - "Locator priority."; - } - leaf weight { - type uint8; + "Group that defines a list of LISP locators."; + list interface { + key "interface-ref"; description - "Locator weight."; + "The address type of the locator"; + leaf interface-ref { + type if:interface-ref; + description + "The name of the interface supporting the locator."; } - leaf multicast-priority { - type uint8; + uses locator-properties; + } + } + grouping servicing-eids-grouping { description - "Locator's multicast priority"; + "Group of EIDs serviced by the this lisp device."; + container servicing-eids { + description + "This node defines list of EIDs serviced by the this" + + " lisp device."; + list servicing-eid { + key "id"; + description + "List of EIDs serviced by the this lisp device."; + leaf id { + type lisp:eid-id; + description + "Id of serviced EID."; } - leaf multicast-weight { - type uint8; + container eid-address { + uses lcaf:lisp-address; description - "Locator's multicast weight"; + "Serviced EID address in generic LISP address format."; + } } } } grouping mappings { description "Group that defines a list of LISP mappings."; list mapping { key "id"; description "List of EID to RLOCs mappings."; @@ -306,101 +461,164 @@ type bits { bit A { description "Authoritative bit."; } } description "Bit that indicates if mapping comes from an authoritative source."; } + leaf static { + type boolean; + default "false"; + description + "This leaf should be true if the mapping is static."; + } choice locator-list { + description + "list of locartors are either negative, or positive."; + case negative-mapping { leaf map-reply-action { type map-reply-action; description "Forwarding action for a negative mapping."; } } case positive-mapping { container rlocs { - uses locators; + uses locators-grouping; description "List of locators for a positive mapping."; } } - default "positive-mapping"; - description - "Choice of locator list based on type of mapping."; } } } + /* Configuration Data */ container lisp { description "Configuration parameters for LISP subsystem."; - container devices { + + container locator-sets { description - "Configuration of LISP devices."; - list device { - key "type id"; + "Container that defines a named locator set which can be + referenced elsewhere."; + list locator-set { + key "locator-set-name"; description - "Each entry contains configuration of a lisp-device."; - leaf type { - type device-ref; + "Multiple locator sets can be configured."; + leaf locator-set-name { + type string { + length "1..64"; + } description - "The type of LISP device - identity derived from the - 'lisp-device' base identity."; + "Locator set name"; } - leaf id { - type string; + choice locator-type { description - "Arbitrary device name."; + "Locator sets can be based on local interfaces, or + general locators."; + case local-interface { + uses local-locators-grouping; + description + "List of locators in this set based on local + interfaces."; + } + case general-locator { + uses locators-grouping; + description + "List of locators in this set based on lisp-address."; + } + } + } + } + + container lisp-router-instances { + description + "Configuration of LISP router instances."; + list lisp-router-instance { + key "lisp-router-instance-id"; + description + "Each entry contains configuration of a lisp-router + instance."; + leaf lisp-router-instance-id { + type int32; + description + "Arbitrary lisp-router id."; + } + list lisp-role { + key lisp-role-type; + description + "List of lisp device roles such as MS, MR, ITR, + ETR, RTR."; + leaf lisp-role-type { + type lisp-role-ref; + description + "The type of LISP device - identity derived from the + 'lisp-device' base identity."; } leaf enabled { type boolean; default "true"; description - "Enable/disable the lisp-device."; + "Enable/disable the lisp-role."; + } } } } } /* Operational state data */ container lisp-state { config false; description "Operational state of the LISP subsystem."; - container devices { + container lisp-router-instances { description - "Operational state of lisp-devices."; - list device { - key "type id"; + "Configuration of LISP router instances."; + list lisp-router-instance { + key "lisp-router-instance-id"; description - "Each entry contains operational data of a lisp-device."; - leaf type { - type device-ref; + "Each entry contains configuration of a lisp-router + instance."; + leaf lisp-router-instance-id { + type int32; description - "Type of LISP device."; - + "Arbitrary lisp-router id."; } - leaf id { - type string; + list lisp-role { + key lisp-role-type; description - "Name of LISP device."; + "List of lisp device roles such as MS, MR, ITR, + ETR, RTR."; + leaf lisp-role-type { + type lisp-role-ref; + description + "The type of LISP device - identity derived from the + 'lisp-device' base identity."; + } + leaf enabled { + type boolean; + default "true"; + description + "Enable/disable the lisp-role."; + } } } } } } + 3. LISP-ITR Module This module captures the configuration data model of a LISP ITR. The model also captures some operational data elements. 3.1. Module Structure module: ietf-lisp-itr @@ -397,202 +615,63 @@ 3. LISP-ITR Module This module captures the configuration data model of a LISP ITR. The model also captures some operational data elements. 3.1. Module Structure module: ietf-lisp-itr -augment /lisp:lisp/lisp:devices/lisp:device: +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--rw itr-cfg! +--rw rloc-probing! | +--rw interval? uint16 | +--rw retries? uint8 | +--rw retries-interval? uint16 - +--rw itr-rlocs - | +--rw itr-rloc* [id] - | +--rw id string - | +--rw address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type - | +--rw (address)? - | +--:(ipv4) - | | +--rw ipv4? inet:ipv4-address - | +--:(ipv6) - | | +--rw ipv6? inet:ipv6-address - | +--:(mac) - | | +--rw mac? yang:mac-address - | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? - | +--:(null-address) - | | +--rw null-address - | | +--rw address? empty - | +--:(afi-list) - | | +--rw afi-list - | | +--rw address-list* simple-address - | +--:(instance-id) - | | +--rw instance-id - | | +--rw instance-id? instance-id-type - | | +--rw mask-length? uint8 - | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number - | | +--rw as? inet:as-number - | | +--rw address? simple-address - | +--:(application-data) - | | +--rw application-data - | | +--rw address? simple-address - | | +--rw protocol? uint8 - | | +--rw ip-tos? int32 - | | +--rw local-port-low? inet:port-number - | | +--rw local-port-high? inet:port-number - | | +--rw remote-port-low? inet:port-number - | | +--rw remote-port-high? inet:port-number - | +--:(geo-coordinates) - | | +--rw geo-coordinates - | | +--rw latitude? bits - | | +--rw latitude-degrees? uint8 - | | +--rw latitude-minutes? uint8 - | | +--rw latitude-seconds? uint8 - | | +--rw longitude? bits - | | +--rw longitude-degrees? uint16 - | | +--rw longitude-minutes? uint8 - | | +--rw longitude-seconds? uint8 - | | +--rw altitude? int32 - | | +--rw address? simple-address - | +--:(nat-traversal) - | | +--rw nat-traversal - | | +--rw ms-udp-port? uint16 - | | +--rw etr-udp-port? uint16 - | | +--rw global-etr-rloc? simple-address - | | +--rw ms-rloc? simple-address - | | +--rw private-etr-rloc? simple-address - | | +--rw rtr-rlocs* simple-address - | +--:(explicit-locator-path) - | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address - | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix - +--rw local-eids - | +--rw local-eid* [id] - | +--rw id lisp:eid-id - | +--rw eid-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type - | +--rw (address)? - | +--:(ipv4) - | | +--rw ipv4? inet:ipv4-address - | +--:(ipv6) - | | +--rw ipv6? inet:ipv6-address - | +--:(mac) - | | +--rw mac? yang:mac-address - | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? - | +--:(null-address) - | | +--rw null-address - | | +--rw address? empty - | +--:(afi-list) - | | +--rw afi-list - | | +--rw address-list* simple-address - | +--:(instance-id) - | | +--rw instance-id - | | +--rw instance-id? instance-id-type - | | +--rw mask-length? uint8 - | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number - | | +--rw as? inet:as-number - | | +--rw address? simple-address - | +--:(application-data) - | | +--rw application-data - | | +--rw address? simple-address - | | +--rw protocol? uint8 - | | +--rw ip-tos? int32 - | | +--rw local-port-low? inet:port-number - | | +--rw local-port-high? inet:port-number - | | +--rw remote-port-low? inet:port-number - | | +--rw remote-port-high? inet:port-number - | +--:(geo-coordinates) - | | +--rw geo-coordinates - | | +--rw latitude? bits - | | +--rw latitude-degrees? uint8 - | | +--rw latitude-minutes? uint8 - | | +--rw latitude-seconds? uint8 - | | +--rw longitude? bits - | | +--rw longitude-degrees? uint16 - | | +--rw longitude-minutes? uint8 - | | +--rw longitude-seconds? uint8 - | | +--rw altitude? int32 - | | +--rw address? simple-address - | +--:(nat-traversal) - | | +--rw nat-traversal - | | +--rw ms-udp-port? uint16 - | | +--rw etr-udp-port? uint16 - | | +--rw global-etr-rloc? simple-address - | | +--rw ms-rloc? simple-address - | | +--rw private-etr-rloc? simple-address - | | +--rw rtr-rlocs* simple-address - | +--:(explicit-locator-path) - | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address - | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix + +--rw itr-rlocs? -> /lisp:lisp/locator-sets/locator-set/locator-set-name +--rw map-resolvers | +--rw map-resolver* [id] | +--rw id lisp:eid-id | +--rw eid-address - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty | | +--:(ipv4) | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix | | +--:(ipv6) | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix | | +--:(mac) | | | +--rw mac? yang:mac-address | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? + | | | +--rw distinguished-name? distinguished-name-type + | | +--:(as-number) + | | | +--rw as-number? inet:as-number | | +--:(null-address) | | | +--rw null-address | | | +--rw address? empty | | +--:(afi-list) | | | +--rw afi-list | | | +--rw address-list* simple-address | | +--:(instance-id) | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type + | | | +--rw iid? instance-id-type | | | +--rw mask-length? uint8 | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf | | | +--rw as? inet:as-number | | | +--rw address? simple-address | | +--:(application-data) | | | +--rw application-data | | | +--rw address? simple-address | | | +--rw protocol? uint8 | | | +--rw ip-tos? int32 | | | +--rw local-port-low? inet:port-number | | | +--rw local-port-high? inet:port-number | | | +--rw remote-port-low? inet:port-number @@ -612,60 +691,73 @@ | | +--:(nat-traversal) | | | +--rw nat-traversal | | | +--rw ms-udp-port? uint16 | | | +--rw etr-udp-port? uint16 | | | +--rw global-etr-rloc? simple-address | | | +--rw ms-rloc? simple-address | | | +--rw private-etr-rloc? simple-address | | | +--rw rtr-rlocs* simple-address | | +--:(explicit-locator-path) | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string + | | | +--rw address? simple-address | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 | +--rw map-resolver-address* inet:ip-address +--rw proxy-etrs | +--rw proxy-etr* [id] | +--rw id lisp:eid-id | +--rw eid-address - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty | | +--:(ipv4) | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix | | +--:(ipv6) | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix | | +--:(mac) | | | +--rw mac? yang:mac-address | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? + | | | +--rw distinguished-name? distinguished-name-type + | | +--:(as-number) + | | | +--rw as-number? inet:as-number | | +--:(null-address) | | | +--rw null-address | | | +--rw address? empty | | +--:(afi-list) | | | +--rw afi-list | | | +--rw address-list* simple-address | | +--:(instance-id) | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type + | | | +--rw iid? instance-id-type | | | +--rw mask-length? uint8 | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf | | | +--rw as? inet:as-number | | | +--rw address? simple-address | | +--:(application-data) | | | +--rw application-data | | | +--rw address? simple-address | | | +--rw protocol? uint8 | | | +--rw ip-tos? int32 | | | +--rw local-port-low? inet:port-number | | | +--rw local-port-high? inet:port-number | | | +--rw remote-port-low? inet:port-number @@ -685,220 +777,341 @@ | | +--:(nat-traversal) | | | +--rw nat-traversal | | | +--rw ms-udp-port? uint16 | | | +--rw etr-udp-port? uint16 | | | +--rw global-etr-rloc? simple-address | | | +--rw ms-rloc? simple-address | | | +--rw private-etr-rloc? simple-address | | | +--rw rtr-rlocs* simple-address | | +--:(explicit-locator-path) | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string + | | | +--rw address? simple-address | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 | +--rw proxy-etr-address* inet:ip-address - +--rw static-mappings - +--rw mapping* [id] - +--rw id eid-id - +--rw eid - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type - | +--rw (address)? - | +--:(ipv4) - | | +--rw ipv4? inet:ipv4-address - | +--:(ipv6) - | | +--rw ipv6? inet:ipv6-address - | +--:(mac) - | | +--rw mac? yang:mac-address - | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? - | +--:(null-address) - | | +--rw null-address - | | +--rw address? empty - | +--:(afi-list) - | | +--rw afi-list - | | +--rw address-list* simple-address - | +--:(instance-id) - | | +--rw instance-id - | | +--rw instance-id? instance-id-type - | | +--rw mask-length? uint8 - | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number - | | +--rw as? inet:as-number - | | +--rw address? simple-address - | +--:(application-data) - | | +--rw application-data - | | +--rw address? simple-address - | | +--rw protocol? uint8 - | | +--rw ip-tos? int32 - | | +--rw local-port-low? inet:port-number - | | +--rw local-port-high? inet:port-number - | | +--rw remote-port-low? inet:port-number - | | +--rw remote-port-high? inet:port-number - | +--:(geo-coordinates) - | | +--rw geo-coordinates - | | +--rw latitude? bits - | | +--rw latitude-degrees? uint8 - | | +--rw latitude-minutes? uint8 - | | +--rw latitude-seconds? uint8 - | | +--rw longitude? bits - | | +--rw longitude-degrees? uint16 - | | +--rw longitude-minutes? uint8 - | | +--rw longitude-seconds? uint8 - | | +--rw altitude? int32 - | | +--rw address? simple-address - | +--:(nat-traversal) - | | +--rw nat-traversal - | | +--rw ms-udp-port? uint16 - | | +--rw etr-udp-port? uint16 - | | +--rw global-etr-rloc? simple-address - | | +--rw ms-rloc? simple-address - | | +--rw private-etr-rloc? simple-address - | | +--rw rtr-rlocs* simple-address - | +--:(explicit-locator-path) - | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address - | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix - +--rw ttl? uint32 - +--rw authoritative? bits - +--rw (locator-list)? - +--:(negative-mapping) - | +--rw map-reply-action? map-reply-action - +--:(positive-mapping) - +--rw rlocs - +--rw rloc* [id] - +--rw id string - +--rw (address-type)? - | +--:(interface-name) - | | +--rw interface? if:interface-state-ref - | +--:(address) + +--rw map-cache + | +--rw mapping* [id] + | +--rw id eid-id + | +--rw eid + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type + | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty + | | +--:(ipv4) + | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix + | | +--:(ipv6) + | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix + | | +--:(mac) + | | | +--rw mac? yang:mac-address + | | +--:(distinguished-name) + | | | +--rw distinguished-name? distinguished-name-type + | | +--:(as-number) + | | | +--rw as-number? inet:as-number + | | +--:(null-address) + | | | +--rw null-address + | | | +--rw address? empty + | | +--:(afi-list) + | | | +--rw afi-list + | | | +--rw address-list* simple-address + | | +--:(instance-id) + | | | +--rw instance-id + | | | +--rw iid? instance-id-type + | | | +--rw mask-length? uint8 + | | | +--rw address? simple-address + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf + | | | +--rw as? inet:as-number + | | | +--rw address? simple-address + | | +--:(application-data) + | | | +--rw application-data + | | | +--rw address? simple-address + | | | +--rw protocol? uint8 + | | | +--rw ip-tos? int32 + | | | +--rw local-port-low? inet:port-number + | | | +--rw local-port-high? inet:port-number + | | | +--rw remote-port-low? inet:port-number + | | | +--rw remote-port-high? inet:port-number + | | +--:(geo-coordinates) + | | | +--rw geo-coordinates + | | | +--rw latitude? bits + | | | +--rw latitude-degrees? uint8 + | | | +--rw latitude-minutes? uint8 + | | | +--rw latitude-seconds? uint8 + | | | +--rw longitude? bits + | | | +--rw longitude-degrees? uint16 + | | | +--rw longitude-minutes? uint8 + | | | +--rw longitude-seconds? uint8 + | | | +--rw altitude? int32 + | | | +--rw address? simple-address + | | +--:(nat-traversal) + | | | +--rw nat-traversal + | | | +--rw ms-udp-port? uint16 + | | | +--rw etr-udp-port? uint16 + | | | +--rw global-etr-rloc? simple-address + | | | +--rw ms-rloc? simple-address + | | | +--rw private-etr-rloc? simple-address + | | | +--rw rtr-rlocs* simple-address + | | +--:(explicit-locator-path) + | | | +--rw explicit-locator-path + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string + | | | +--rw address? simple-address + | | | +--rw lrs-bits? bits + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 + | +--rw ttl? uint32 + | +--rw authoritative? bits + | +--rw static? boolean + | +--rw (locator-list)? + | +--:(negative-mapping) + | | +--rw map-reply-action? map-reply-action + | +--:(positive-mapping) + | +--rw rlocs + | +--rw locator* [id] + | +--rw id string | +--rw locator-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type - | +--rw (address)? - | +--:(ipv4) - | | +--rw ipv4? inet:ipv4-address - | +--:(ipv6) - | | +--rw ipv6? inet:ipv6-address - | +--:(mac) - | | +--rw mac? yang:mac-address - | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? - | +--:(null-address) - | | +--rw null-address - | | +--rw address? empty - | +--:(afi-list) - | | +--rw afi-list - | | +--rw address-list* simple-address - | +--:(instance-id) - | | +--rw instance-id - | | +--rw instance-id? instance-id-type - | | +--rw mask-length? uint8 - | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number - | | +--rw as? inet:as-number - | | +--rw address? simple-address - | +--:(application-data) - | | +--rw application-data - | | +--rw address? simple-address - | | +--rw protocol? uint8 - | | +--rw ip-tos? int32 - | | +--rw local-port-low? inet:port-number - | | +--rw local-port-high? inet:port-number - | | +--rw remote-port-low? inet:port-number - | | +--rw remote-port-high? inet:port-number - | +--:(geo-coordinates) - | | +--rw geo-coordinates - | | +--rw latitude? bits - | | +--rw latitude-degrees? uint8 - | | +--rw latitude-minutes? uint8 - | | +--rw latitude-seconds? uint8 - | | +--rw longitude? bits - | | +--rw longitude-degrees? uint16 - | | +--rw longitude-minutes? uint8 - | | +--rw longitude-seconds? uint8 - | | +--rw altitude? int32 - | | +--rw address? simple-address - | +--:(nat-traversal) - | | +--rw nat-traversal - | | +--rw ms-udp-port? uint16 - | | +--rw etr-udp-port? uint16 - | | +--rw global-etr-rloc? simple-address - | | +--rw ms-rloc? simple-address - | | +--rw private-etr-rloc? simple-address - | | +--rw rtr-rlocs* simple-address - | +--:(explicit-locator-path) - | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address - | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix - +--rw priority? uint8 - +--rw weight? uint8 - +--rw multicast-priority? uint8 - +--rw multicast-weight? uint8 -augment /lisp:lisp-state/lisp:devices/lisp:device: + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type + | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty + | | +--:(ipv4) + | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix + | | +--:(ipv6) + | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix + | | +--:(mac) + | | | +--rw mac? yang:mac-address + | | +--:(distinguished-name) + | | | +--rw distinguished-name? distinguished-name-type + | | +--:(as-number) + | | | +--rw as-number? inet:as-number + | | +--:(null-address) + | | | +--rw null-address + | | | +--rw address? empty + | | +--:(afi-list) + | | | +--rw afi-list + | | | +--rw address-list* simple-address + | | +--:(instance-id) + | | | +--rw instance-id + | | | +--rw iid? instance-id-type + | | | +--rw mask-length? uint8 + | | | +--rw address? simple-address + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf + | | | +--rw as? inet:as-number + | | | +--rw address? simple-address + | | +--:(application-data) + | | | +--rw application-data + | | | +--rw address? simple-address + | | | +--rw protocol? uint8 + | | | +--rw ip-tos? int32 + | | | +--rw local-port-low? inet:port-number + | | | +--rw local-port-high? inet:port-number + | | | +--rw remote-port-low? inet:port-number + | | | +--rw remote-port-high? inet:port-number + | | +--:(geo-coordinates) + | | | +--rw geo-coordinates + | | | +--rw latitude? bits + | | | +--rw latitude-degrees? uint8 + | | | +--rw latitude-minutes? uint8 + | | | +--rw latitude-seconds? uint8 + | | | +--rw longitude? bits + | | | +--rw longitude-degrees? uint16 + | | | +--rw longitude-minutes? uint8 + | | | +--rw longitude-seconds? uint8 + | | | +--rw altitude? int32 + | | | +--rw address? simple-address + | | +--:(nat-traversal) + | | | +--rw nat-traversal + | | | +--rw ms-udp-port? uint16 + | | | +--rw etr-udp-port? uint16 + | | | +--rw global-etr-rloc? simple-address + | | | +--rw ms-rloc? simple-address + | | | +--rw private-etr-rloc? simple-address + | | | +--rw rtr-rlocs* simple-address + | | +--:(explicit-locator-path) + | | | +--rw explicit-locator-path + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string + | | | +--rw address? simple-address + | | | +--rw lrs-bits? bits + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 + | +--rw priority? uint8 + | +--rw weight? uint8 + | +--rw multicast-priority? uint8 + | +--rw multicast-weight? uint8 + +--rw servicing-eids + +--rw servicing-eid* [id] + +--rw id lisp:eid-id + +--rw eid-address + +--rw address-type lisp-address-family-ref + +--rw virtual-network-id? instance-id-type + +--rw (address)? + +--:(no-address) + | +--rw no-address? empty + +--:(ipv4) + | +--rw ipv4? inet:ipv4-address + +--:(ipv4-prefix) + | +--rw ipv4-prefix? inet:ipv4-prefix + +--:(ipv6) + | +--rw ipv6? inet:ipv6-address + +--:(ipv6-prefix) + | +--rw ipv6-prefix? inet:ipv6-prefix + +--:(mac) + | +--rw mac? yang:mac-address + +--:(distinguished-name) + | +--rw distinguished-name? distinguished-name-type + +--:(as-number) + | +--rw as-number? inet:as-number + +--:(null-address) + | +--rw null-address + | +--rw address? empty + +--:(afi-list) + | +--rw afi-list + | +--rw address-list* simple-address + +--:(instance-id) + | +--rw instance-id + | +--rw iid? instance-id-type + | +--rw mask-length? uint8 + | +--rw address? simple-address + +--:(as-number-lcaf) + | +--rw as-number-lcaf + | +--rw as? inet:as-number + | +--rw address? simple-address + +--:(application-data) + | +--rw application-data + | +--rw address? simple-address + | +--rw protocol? uint8 + | +--rw ip-tos? int32 + | +--rw local-port-low? inet:port-number + | +--rw local-port-high? inet:port-number + | +--rw remote-port-low? inet:port-number + | +--rw remote-port-high? inet:port-number + +--:(geo-coordinates) + | +--rw geo-coordinates + | +--rw latitude? bits + | +--rw latitude-degrees? uint8 + | +--rw latitude-minutes? uint8 + | +--rw latitude-seconds? uint8 + | +--rw longitude? bits + | +--rw longitude-degrees? uint16 + | +--rw longitude-minutes? uint8 + | +--rw longitude-seconds? uint8 + | +--rw altitude? int32 + | +--rw address? simple-address + +--:(nat-traversal) + | +--rw nat-traversal + | +--rw ms-udp-port? uint16 + | +--rw etr-udp-port? uint16 + | +--rw global-etr-rloc? simple-address + | +--rw ms-rloc? simple-address + | +--rw private-etr-rloc? simple-address + | +--rw rtr-rlocs* simple-address + +--:(explicit-locator-path) + | +--rw explicit-locator-path + | +--rw hop* [hop-id] + | +--rw hop-id string + | +--rw address? simple-address + | +--rw lrs-bits? bits + +--:(source-dest-key) + | +--rw source-dest-key + | +--rw source? simple-address + | +--rw dest? simple-address + +--:(key-value-address) + | +--rw key-value-address + | +--rw key? simple-address + | +--rw value? simple-address + +--:(service-path) + +--rw service-path + +--rw service-path-id? service-path-id-type + +--rw service-index? uint8 +augment /lisp:lisp-state/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--ro itr-state - +--ro learned-mappings + +--ro map-cache +--ro mapping* [id] +--ro id eid-id +--ro eid - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -918,69 +1131,79 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--ro ttl? uint32 +--ro authoritative? bits + +--ro static? boolean +--ro (locator-list)? +--:(negative-mapping) | +--ro map-reply-action? map-reply-action +--:(positive-mapping) +--ro rlocs - +--ro rloc* [id] + +--ro locator* [id] +--ro id string - +--ro (address-type)? - | +--:(interface-name) - | | +--ro interface? if:interface-state-ref - | +--:(address) - | +--ro locator-address - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + +--ro locator-address + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -1000,37 +1223,46 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--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" + file "ietf-lisp-itr@2016-06-30.yang" module ietf-lisp-itr { - namespace "urn:ietf:params:xml:ns:yang:lisp-itr"; + namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-itr"; prefix lisp-itr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -1050,35 +1282,36 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6830"; } identity itr { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP ITR."; } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-itr:itr'" { + augment "/lisp:lisp/lisp:lisp-router-instances/" + + "lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-type = 'lisp-itr:itr'" { description - "Augment is valid when LISP device type is ITR."; + "Augment is valid when LISP role type is ITR."; } description "This augments LISP devices list with ITR specific parameters."; container itr-cfg { presence "LISP ITR operation enabled"; description "ITR configuration"; container rloc-probing { presence "RLOC probing active"; @@ -1095,58 +1328,29 @@ description "Number of retries"; } leaf retries-interval { type uint16; units "seconds"; description "Interval in seconds between retries"; } } - container itr-rlocs { - description - "List of RLOCs of the ITR included in Map-Requests"; - list itr-rloc { - key "id"; - description - "ITR's list of RLOCs."; - leaf id { - type string; - description - "Unique RLOC id."; - } - container address { - uses lcaf:lisp-address; - description - "RLOC address in generic LISP address format."; - } - } - } - container local-eids { - description - "Container for an ITR's local list of EIDs"; - list local-eid { - key "id"; - min-elements 1; - description - "List of EIDs from which the ITR forwards traffic."; - leaf id { - type lisp:eid-id; - description - "Unique EID ID"; + leaf itr-rlocs { + type leafref { + path "/lisp:lisp/lisp:locator-sets/lisp:locator-set/" + + "lisp:locator-set-name"; + } - container eid-address { - uses lcaf:lisp-address; description - "Addres in generic LISP address format"; - } - } + "Refrence to a locator set that the ITR includes in + Map-Requests"; } container map-resolvers { description "The Map-Resolvers configured for the ITR."; list map-resolver { key "id"; min-elements 1; description "List of Map-Resolvers configured for the ITR."; leaf id { @@ -1184,91 +1388,98 @@ description "EID for which the PETR is configured."; } leaf-list proxy-etr-address{ type inet:ip-address; description "PETR RLOC address."; } } } - container static-mappings { + container map-cache{ uses lisp:mappings; description "EID to RLOCs mappings cache."; } + uses lisp:servicing-eids-grouping; + } } - augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-itr:itr'" { + augment "/lisp:lisp-state/lisp:lisp-router-instances/" + + "lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-type = 'lisp-itr:itr'" { description - "Augment is valid when LISP device type is ITR."; + "Augment is valid when LISP role type is ITR."; } description "This augments LISP devices list state with ITR specific parameters."; container itr-state { config false; description "ITR state."; - container learned-mappings { + container map-cache{ uses lisp:mappings; description "EID to RLOCs mappings cache."; } } } } 4. LISP ETR Module This module captures the configuration data model of a LISP ETR. The model also captures some operational data elements. 4.1. Module Structure module: ietf-lisp-etr -augment /lisp:lisp/lisp:devices/lisp:device: +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--rw etr-cfg! +--rw local-eids +--rw local-eid* [id] +--rw id lisp:eid-id +--rw eid-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type + | +--rw address-type lisp-address-family-ref + | +--rw virtual-network-id? instance-id-type | +--rw (address)? + | +--:(no-address) + | | +--rw no-address? empty | +--:(ipv4) | | +--rw ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--rw ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--rw ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--rw ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--rw mac? yang:mac-address | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? + | | +--rw distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--rw as-number? inet:as-number | +--:(null-address) | | +--rw null-address | | +--rw address? empty | +--:(afi-list) | | +--rw afi-list | | +--rw address-list* simple-address | +--:(instance-id) | | +--rw instance-id - | | +--rw instance-id? instance-id-type + | | +--rw iid? instance-id-type | | +--rw mask-length? uint8 | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number + | +--:(as-number-lcaf) + | | +--rw as-number-lcaf | | +--rw as? inet:as-number | | +--rw address? simple-address | +--:(application-data) | | +--rw application-data | | +--rw address? simple-address | | +--rw protocol? uint8 | | +--rw ip-tos? int32 | | +--rw local-port-low? inet:port-number | | +--rw local-port-high? inet:port-number | | +--rw remote-port-low? inet:port-number @@ -1288,122 +1499,52 @@ | +--:(nat-traversal) | | +--rw nat-traversal | | +--rw ms-udp-port? uint16 | | +--rw etr-udp-port? uint16 | | +--rw global-etr-rloc? simple-address | | +--rw ms-rloc? simple-address | | +--rw private-etr-rloc? simple-address | | +--rw rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address + | | +--rw hop* [hop-id] + | | +--rw hop-id string + | | +--rw address? simple-address | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--rw source-dest-key + | | +--rw source? simple-address + | | +--rw dest? simple-address + | +--:(key-value-address) + | | +--rw key-value-address + | | +--rw key? simple-address + | | +--rw value? simple-address + | +--:(service-path) + | +--rw service-path + | +--rw service-path-id? service-path-id-type + | +--rw service-index? uint8 +--rw map-servers | +--rw map-server* [address] | +--rw address inet:ip-address | +--rw auth-key? string | +--rw auth-key-type? lisp:auth-key-type - +--rw rlocs - | +--rw rloc* [id] - | +--rw id string - | +--rw (address-type)? - | | +--:(interface-name) - | | | +--rw interface? if:interface-state-ref - | | +--:(address) - | | +--rw locator-address - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type - | | +--rw (address)? - | | +--:(ipv4) - | | | +--rw ipv4? inet:ipv4-address - | | +--:(ipv6) - | | | +--rw ipv6? inet:ipv6-address - | | +--:(mac) - | | | +--rw mac? yang:mac-address - | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? - | | +--:(null-address) - | | | +--rw null-address - | | | +--rw address? empty - | | +--:(afi-list) - | | | +--rw afi-list - | | | +--rw address-list* simple-address - | | +--:(instance-id) - | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type - | | | +--rw mask-length? uint8 - | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number - | | | +--rw as? inet:as-number - | | | +--rw address? simple-address - | | +--:(application-data) - | | | +--rw application-data - | | | +--rw address? simple-address - | | | +--rw protocol? uint8 - | | | +--rw ip-tos? int32 - | | | +--rw local-port-low? inet:port-number - | | | +--rw local-port-high? inet:port-number - | | | +--rw remote-port-low? inet:port-number - | | | +--rw remote-port-high? inet:port-number - | | +--:(geo-coordinates) - | | | +--rw geo-coordinates - | | | +--rw latitude? bits - | | | +--rw latitude-degrees? uint8 - | | | +--rw latitude-minutes? uint8 - | | | +--rw latitude-seconds? uint8 - | | | +--rw longitude? bits - | | | +--rw longitude-degrees? uint16 - | | | +--rw longitude-minutes? uint8 - | | | +--rw longitude-seconds? uint8 - | | | +--rw altitude? int32 - | | | +--rw address? simple-address - | | +--:(nat-traversal) - | | | +--rw nat-traversal - | | | +--rw ms-udp-port? uint16 - | | | +--rw etr-udp-port? uint16 - | | | +--rw global-etr-rloc? simple-address - | | | +--rw ms-rloc? simple-address - | | | +--rw private-etr-rloc? simple-address - | | | +--rw rtr-rlocs* simple-address - | | +--:(explicit-locator-path) - | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address - | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix - | +--rw priority? uint8 - | +--rw weight? uint8 - | +--rw multicast-priority? uint8 - | +--rw multicast-weight? uint8 + +--rw rlocs? -> /lisp:lisp/locator-sets/locator-set/locator-set-name +--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" + file "ietf-lisp-etr@2016-06-30.yang" module ietf-lisp-etr { - namespace "urn:ietf:params:xml:ns:yang:lisp-etr"; + namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-etr"; prefix lisp-etr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -1423,34 +1564,35 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6830"; + } identity etr { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP ETR."; - } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-etr:etr'" { + augment "/lisp:lisp/lisp:lisp-router-instances/" + + "lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; @@ -1489,39 +1632,44 @@ description "Map-Server authentication key."; } leaf auth-key-type { type lisp:auth-key-type; description "Map-Server authentication type."; } } } - container rlocs { - uses lisp:locators; + leaf rlocs { + type leafref { + path "/lisp:lisp/lisp:locator-sets/lisp:locator-set/" + + "lisp:locator-set-name"; + } description - "Locators mapped to local EID."; + "Locator set mapped to this local EID."; } leaf record-ttl { type uint32; description "Validity period of the EID to RLOCs mapping provided in Map-Replies."; } leaf want-map-notify { type boolean; + default "true"; description "Flag which if set in a Map-Register requests that a Map-Notify be sent in response."; } leaf proxy-reply { type boolean; + default "false"; description "Flag which if set in a Map-Register requests that the Map-Server proxy Map-Replies for the ETR."; } leaf registration-interval { type uint16; units "seconds"; default "60"; description "Interval between consecutive Map-Register messages."; @@ -1519,153 +1667,81 @@ "Flag which if set in a Map-Register requests that the Map-Server proxy Map-Replies for the ETR."; } leaf registration-interval { type uint16; units "seconds"; default "60"; description "Interval between consecutive Map-Register messages."; } + } } - } - } - } + }//etr-cfg + }//augment + }// lisp-etr 5. LISP Map Server Module This module captures the configuration data model of a LISP Map Server [RFC6833]. The model also captures some operational data elements. 5.1. Module Structure module: ietf-lisp-mapserver -augment /lisp:lisp/lisp:devices/lisp:device: - +--rw map-server-cfg! +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: + +--rw map-server-cfg +--rw sites | +--rw site* [site-id] | +--rw site-id uint64 - | +--rw devices - | +--rw device* [device-id] - | +--rw device-id uint64 | +--rw auth-key | | +--rw auth-key-value? string | | +--rw auth-key-type? lisp:auth-key-type | +--rw eids | +--rw eid* [id] | +--rw id lisp:eid-id | +--rw eid-address - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty | | +--:(ipv4) | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix | | +--:(ipv6) | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix | | +--:(mac) | | | +--rw mac? yang:mac-address | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? - | | +--:(null-address) - | | | +--rw null-address - | | | +--rw address? empty - | | +--:(afi-list) - | | | +--rw afi-list - | | | +--rw address-list* simple-address - | | +--:(instance-id) - | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type - | | | +--rw mask-length? uint8 - | | | +--rw address? simple-address + | | | +--rw distinguished-name? distinguished-name-type | | +--:(as-number) - | | | +--rw as-number - | | | +--rw as? inet:as-number - | | | +--rw address? simple-address - | | +--:(application-data) - | | | +--rw application-data - | | | +--rw address? simple-address - | | | +--rw protocol? uint8 - | | | +--rw ip-tos? int32 - | | | +--rw local-port-low? inet:port-number - | | | +--rw local-port-high? inet:port-number - | | | +--rw remote-port-low? inet:port-number - | | | +--rw remote-port-high? inet:port-number - | | +--:(geo-coordinates) - | | | +--rw geo-coordinates - | | | +--rw latitude? bits - | | | +--rw latitude-degrees? uint8 - | | | +--rw latitude-minutes? uint8 - | | | +--rw latitude-seconds? uint8 - | | | +--rw longitude? bits - | | | +--rw longitude-degrees? uint16 - | | | +--rw longitude-minutes? uint8 - | | | +--rw longitude-seconds? uint8 - | | | +--rw altitude? int32 - | | | +--rw address? simple-address - | | +--:(nat-traversal) - | | | +--rw nat-traversal - | | | +--rw ms-udp-port? uint16 - | | | +--rw etr-udp-port? uint16 - | | | +--rw global-etr-rloc? simple-address - | | | +--rw ms-rloc? simple-address - | | | +--rw private-etr-rloc? simple-address - | | | +--rw rtr-rlocs* simple-address - | | +--:(explicit-locator-path) - | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address - | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix - | +--rw more-specifics-accepted? boolean - | +--rw mapping-expiration-timeout? int16 - +--rw static-mappings - | +--rw mapping* [id] - | +--rw id eid-id - | +--rw eid - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type - | | +--rw (address)? - | | +--:(ipv4) - | | | +--rw ipv4? inet:ipv4-address - | | +--:(ipv6) - | | | +--rw ipv6? inet:ipv6-address - | | +--:(mac) - | | | +--rw mac? yang:mac-address - | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? + | | | +--rw as-number? inet:as-number | | +--:(null-address) | | | +--rw null-address | | | +--rw address? empty | | +--:(afi-list) | | | +--rw afi-list | | | +--rw address-list* simple-address | | +--:(instance-id) | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type + | | | +--rw iid? instance-id-type | | | +--rw mask-length? uint8 | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf | | | +--rw as? inet:as-number | | | +--rw address? simple-address | | +--:(application-data) | | | +--rw application-data | | | +--rw address? simple-address | | | +--rw protocol? uint8 | | | +--rw ip-tos? int32 | | | +--rw local-port-low? inet:port-number | | | +--rw local-port-high? inet:port-number | | | +--rw remote-port-low? inet:port-number @@ -1685,225 +1761,77 @@ | | +--:(nat-traversal) | | | +--rw nat-traversal | | | +--rw ms-udp-port? uint16 | | | +--rw etr-udp-port? uint16 | | | +--rw global-etr-rloc? simple-address | | | +--rw ms-rloc? simple-address | | | +--rw private-etr-rloc? simple-address | | | +--rw rtr-rlocs* simple-address | | +--:(explicit-locator-path) | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address - | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix - | +--rw ttl? uint32 - | +--rw authoritative? bits - | +--rw (locator-list)? - | +--:(negative-mapping) - | | +--rw map-reply-action? map-reply-action - | +--:(positive-mapping) - | +--rw rlocs - | +--rw rloc* [id] - | +--rw id string - | +--rw (address-type)? - | | +--:(interface-name) - | | | +--rw interface? if:interface-state-ref - | | +--:(address) - | | +--rw locator-address - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type - | | +--rw (address)? - | | +--:(ipv4) - | | | +--rw ipv4? inet:ipv4-address - | | +--:(ipv6) - | | | +--rw ipv6? inet:ipv6-address - | | +--:(mac) - | | | +--rw mac? yang:mac-address - | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? - | | +--:(null-address) - | | | +--rw null-address - | | | +--rw address? empty - | | +--:(afi-list) - | | | +--rw afi-list - | | | +--rw address-list* simple-address - | | +--:(instance-id) - | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type - | | | +--rw mask-length? uint8 - | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number - | | | +--rw as? inet:as-number - | | | +--rw address? simple-address - | | +--:(application-data) - | | | +--rw application-data - | | | +--rw address? simple-address - | | | +--rw protocol? uint8 - | | | +--rw ip-tos? int32 - | | | +--rw local-port-low? inet:port-number - | | | +--rw local-port-high? inet:port-number - | | | +--rw remote-port-low? inet:port-number - | | | +--rw remote-port-high? inet:port-number - | | +--:(geo-coordinates) - | | | +--rw geo-coordinates - | | | +--rw latitude? bits - | | | +--rw latitude-degrees? uint8 - | | | +--rw latitude-minutes? uint8 - | | | +--rw latitude-seconds? uint8 - | | | +--rw longitude? bits - | | | +--rw longitude-degrees? uint16 - | | | +--rw longitude-minutes? uint8 - | | | +--rw longitude-seconds? uint8 - | | | +--rw altitude? int32 + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string | | | +--rw address? simple-address - | | +--:(nat-traversal) - | | | +--rw nat-traversal - | | | +--rw ms-udp-port? uint16 - | | | +--rw etr-udp-port? uint16 - | | | +--rw global-etr-rloc? simple-address - | | | +--rw ms-rloc? simple-address - | | | +--rw private-etr-rloc? simple-address - | | | +--rw rtr-rlocs* simple-address - | | +--:(explicit-locator-path) - | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix - | +--rw priority? uint8 - | +--rw weight? uint8 - | +--rw multicast-priority? uint8 - | +--rw multicast-weight? uint8 - +--rw (mapping-system) - +--:(ddt-mapping-system) - | +--rw ddt-mapping-system! - | +--rw ddt-root* inet:ip-address - | +--rw authoritative-eids - | +--rw authoritative-eid* [id] - | +--rw id lisp:eid-id - | +--rw eid-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type - | +--rw (address)? - | +--:(ipv4) - | | +--rw ipv4? inet:ipv4-address - | +--:(ipv6) - | | +--rw ipv6? inet:ipv6-address - | +--:(mac) - | | +--rw mac? yang:mac-address - | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? - | +--:(null-address) - | | +--rw null-address - | | +--rw address? empty - | +--:(afi-list) - | | +--rw afi-list - | | +--rw address-list* simple-address - | +--:(instance-id) - | | +--rw instance-id - | | +--rw instance-id? instance-id-type - | | +--rw mask-length? uint8 - | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number - | | +--rw as? inet:as-number - | | +--rw address? simple-address - | +--:(application-data) - | | +--rw application-data - | | +--rw address? simple-address - | | +--rw protocol? uint8 - | | +--rw ip-tos? int32 - | | +--rw local-port-low? inet:port-number - | | +--rw local-port-high? inet:port-number - | | +--rw remote-port-low? inet:port-number - | | +--rw remote-port-high? inet:port-number - | +--:(geo-coordinates) - | | +--rw geo-coordinates - | | +--rw latitude? bits - | | +--rw latitude-degrees? uint8 - | | +--rw latitude-minutes? uint8 - | | +--rw latitude-seconds? uint8 - | | +--rw longitude? bits - | | +--rw longitude-degrees? uint16 - | | +--rw longitude-minutes? uint8 - | | +--rw longitude-seconds? uint8 - | | +--rw altitude? int32 - | | +--rw address? simple-address - | +--:(nat-traversal) - | | +--rw nat-traversal - | | +--rw ms-udp-port? uint16 - | | +--rw etr-udp-port? uint16 - | | +--rw global-etr-rloc? simple-address - | | +--rw ms-rloc? simple-address - | | +--rw private-etr-rloc? simple-address - | | +--rw rtr-rlocs* simple-address - | +--:(explicit-locator-path) - | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address - | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix - +--:(alt-mapping-system) - +--rw alt-mapping-system! -augment /lisp:lisp-state/lisp:devices/lisp:device: + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 + | +--rw more-specifics-accepted? boolean + | +--rw mapping-expiration-timeout? int16 + +--rw mapping-system-type? lisp:mapping-system-ref +augment /lisp:lisp-state/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--ro ms-state +--ro registered-mappings +--ro mapping* [id] +--ro id eid-id +--ro eid - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -1923,69 +1851,79 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--ro ttl? uint32 +--ro authoritative? bits + +--ro static? boolean +--ro (locator-list)? +--:(negative-mapping) | +--ro map-reply-action? map-reply-action +--:(positive-mapping) +--ro rlocs - +--ro rloc* [id] + +--ro locator* [id] +--ro id string - +--ro (address-type)? - | +--:(interface-name) - | | +--ro interface? if:interface-state-ref - | +--:(address) - | +--ro locator-address - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + +--ro locator-address + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -2005,47 +1943,53 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--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-map-server { - namespace "urn:ietf:params:xml:ns:yang:lisp-ms"; + file "ietf-lisp-mapserver@2016-06-30.yang" + module ietf-lisp-mapserver { + namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-mapserver"; prefix lisp-ms; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } - import ietf-inet-types { - prefix inet; - } organization "IETF LISP (Locator/ID Separation Protocol) Working Group"; contact "lisp@ietf.org"; description "This YANG module defines the generic configuration data for a LISP Map-Server. The module can be extended by vendors to define vendor-specific configuration parameters and policies. @@ -2054,83 +1998,63 @@ 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 6338; see the RFC itself for full legal notices. - "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6833"; } identity ms { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP Map-Server."; } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-ms:ms'" { + augment "/lisp:lisp/lisp:lisp-router-instances" + + "/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; container sites { description "Sites for which the Map-Server accepts registrations."; list site { key "site-id"; description "List of sites for which the Map-Server acceptes registrations."; leaf site-id { type uint64; description "Site identifier."; } - // 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."; - } container auth-key { description - "Device authentication key."; + "Site authentication key."; leaf auth-key-value { type string; description "Clear text authentication key"; } leaf auth-key-type { type lisp:auth-key-type; description "Authentication key type."; } @@ -2149,24 +2072,24 @@ "Id of the EID registered."; } container eid-address { uses lcaf:lisp-address; description "EID in generic LISP address format registered with the Map-Server."; } leaf more-specifics-accepted { type boolean; + default "false"; 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."; } // This model can be augmented to have below for per-eid auth-key @@ -2171,71 +2094,32 @@ } // This model can be augmented to have below for per-eid auth-key // leaf auth-key { // description "clear text authentication key"; // type string; // } } } } } - } - } - container static-mappings { - uses lisp:mappings; - description - "Datastore of statically registred mappings."; - } - choice mapping-system { - mandatory true; - description - "Interface to Mapping System."; - container ddt-mapping-system { - presence "DDT Mapping System in use"; - description - "DDT Mapping System interface."; - leaf-list ddt-root { - type inet:ip-address; - description - "List of DDT root address."; - } - container authoritative-eids { - description - "Authoritative EIDs"; - list authoritative-eid { - key "id"; - description - "List of authoritative EIDs."; - leaf id { - type lisp:eid-id; - description - "EID id."; - } - container eid-address { - uses lcaf:lisp-address; - description - "EID in generic LISP address format."; - } - } - } - } - container alt-mapping-system { - presence "ALT Mapping System in use"; + leaf mapping-system-type { + type lisp:mapping-system-ref; description - "ALT Mapping System interface."; - // TBD - } + "A reference to the mapping system"; } } + } - augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-ms:ms'" { + + augment "/lisp:lisp-state/lisp:lisp-router-instances" + + "/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; @@ -2251,41 +2135,38 @@ 6. LISP Map Resolver Module This module captures the configuration data model of a LISP Map Resolver [RFC6833]. The model also captures some operational data elements. 6.1. Module Structure module: ietf-lisp-mapresolver - augment /lisp:lisp/lisp:devices/lisp:device: - +--rw map-resolver-cfg! - +--rw (mapping-system) - +--:(ddt-mapping-system) - | +--rw ddt-mapping-system! - | +--rw ddt-root* inet:ip-address - +--:(alt-mapping-system) - +--rw alt-mapping-system! +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: + +--rw map-resolver-cfg + +--rw mapping-system-type? lisp:mapping-system-ref + +--rw ms-address? inet:ip-address 6.2. Module Definition - file "ietf-lisp-mapresolver@2015-07-02.yang" - module ietf-lisp-map-resolver { - namespace "urn:ietf:params:xml:ns:yang:lisp-mr"; + file "ietf-lisp-mapresolver@2016-06-30.yang" +module ietf-lisp-mapresolver { + namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-mapresolver"; prefix lisp-mr; import ietf-lisp { prefix lisp; } import ietf-inet-types { prefix inet; } + organization "IETF LISP (Locator/ID Separation Protocol) Working Group"; contact "lisp@ietf.org"; description "This YANG module defines the generic configuration data for a LISP Map-Resolver. The module can be extended by vendors to define vendor-specific configuration parameters and policies. @@ -2295,112 +2176,114 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6833"; } identity mr { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP Map-Resolver."; } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-mr:mr'" { + augment "/lisp:lisp/lisp:lisp-router-instances" + +"/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; - choice mapping-system { - mandatory true; - description - "Mapping system interface."; - container ddt-mapping-system { - presence "DDT Mapping System in use"; - description - "DDT mapping system interface."; - leaf-list ddt-root { - type inet:ip-address; + leaf mapping-system-type { + type lisp:mapping-system-ref; description - "List of DDT root addresses."; - } + "A reference to the mapping system"; } - container alt-mapping-system{ - presence "ALT Mapping System in use"; + leaf ms-address { + when "../mapping-system-type = 'lisp-mr:single-node-mapping-system'"; + + type inet:ip-address; description - "ALT mapping system interface."; - // TBD - } - } - } + "address to reach the Map Server when " + + "lisp-mr:single-node-mapping-system is being used."; } + }//map-resolver-cfg + }//aug + + // TBD Operational model/container + // container cached-mappings { + // config false; + // uses mappings; + // } } 7. LISP Proxy ITR Module This module captures the configuration data model of a LISP Proxy ITR [RFC6832]. The model may also capture some operational data elements. 7.1. Module Structure module: ietf-lisp-pitr -augment /lisp:lisp/lisp:devices/lisp:device: +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--rw proxy-itr-cfg! +--rw servicing-eids - | +--rw eid* [id] + | +--rw servicing-eid* [id] | +--rw id lisp:eid-id | +--rw eid-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type + | +--rw address-type lisp-address-family-ref + | +--rw virtual-network-id? instance-id-type | +--rw (address)? + | +--:(no-address) + | | +--rw no-address? empty | +--:(ipv4) | | +--rw ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--rw ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--rw ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--rw ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--rw mac? yang:mac-address | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? + | | +--rw distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--rw as-number? inet:as-number | +--:(null-address) | | +--rw null-address | | +--rw address? empty | +--:(afi-list) | | +--rw afi-list | | +--rw address-list* simple-address | +--:(instance-id) | | +--rw instance-id - | | +--rw instance-id? instance-id-type + | | +--rw iid? instance-id-type | | +--rw mask-length? uint8 | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number + | +--:(as-number-lcaf) + | | +--rw as-number-lcaf | | +--rw as? inet:as-number | | +--rw address? simple-address | +--:(application-data) | | +--rw application-data | | +--rw address? simple-address | | +--rw protocol? uint8 | | +--rw ip-tos? int32 | | +--rw local-port-low? inet:port-number | | +--rw local-port-high? inet:port-number | | +--rw remote-port-low? inet:port-number @@ -2420,59 +2303,72 @@ | +--:(nat-traversal) | | +--rw nat-traversal | | +--rw ms-udp-port? uint16 | | +--rw etr-udp-port? uint16 | | +--rw global-etr-rloc? simple-address | | +--rw ms-rloc? simple-address | | +--rw private-etr-rloc? simple-address | | +--rw rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address + | | +--rw hop* [hop-id] + | | +--rw hop-id string + | | +--rw address? simple-address | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--rw source-dest-key + | | +--rw source? simple-address + | | +--rw dest? simple-address + | +--:(key-value-address) + | | +--rw key-value-address + | | +--rw key? simple-address + | | +--rw value? simple-address + | +--:(service-path) + | +--rw service-path + | +--rw service-path-id? service-path-id-type + | +--rw service-index? uint8 +--rw map-resolvers | +--rw map-resolver* [id] | +--rw id lisp:eid-id | +--rw eid - | | +--rw afi lisp-address-family-ref - | | +--rw instance-id? instance-id-type + | | +--rw address-type lisp-address-family-ref + | | +--rw virtual-network-id? instance-id-type | | +--rw (address)? + | | +--:(no-address) + | | | +--rw no-address? empty | | +--:(ipv4) | | | +--rw ipv4? inet:ipv4-address + | | +--:(ipv4-prefix) + | | | +--rw ipv4-prefix? inet:ipv4-prefix | | +--:(ipv6) | | | +--rw ipv6? inet:ipv6-address + | | +--:(ipv6-prefix) + | | | +--rw ipv6-prefix? inet:ipv6-prefix | | +--:(mac) | | | +--rw mac? yang:mac-address | | +--:(distinguished-name) - | | | +--rw distinguished-name? distinguished-name - | | +--:(lcaf) - | | +--rw lcaf - | | +--rw lcaf-type lcaf-ref - | | +--rw (address)? + | | | +--rw distinguished-name? distinguished-name-type + | | +--:(as-number) + | | | +--rw as-number? inet:as-number | | +--:(null-address) | | | +--rw null-address | | | +--rw address? empty | | +--:(afi-list) | | | +--rw afi-list | | | +--rw address-list* simple-address | | +--:(instance-id) | | | +--rw instance-id - | | | +--rw instance-id? instance-id-type + | | | +--rw iid? instance-id-type | | | +--rw mask-length? uint8 | | | +--rw address? simple-address - | | +--:(as-number) - | | | +--rw as-number + | | +--:(as-number-lcaf) + | | | +--rw as-number-lcaf | | | +--rw as? inet:as-number | | | +--rw address? simple-address | | +--:(application-data) | | | +--rw application-data | | | +--rw address? simple-address | | | +--rw protocol? uint8 | | | +--rw ip-tos? int32 | | | +--rw local-port-low? inet:port-number | | | +--rw local-port-high? inet:port-number | | | +--rw remote-port-low? inet:port-number @@ -2492,60 +2388,74 @@ | | +--:(nat-traversal) | | | +--rw nat-traversal | | | +--rw ms-udp-port? uint16 | | | +--rw etr-udp-port? uint16 | | | +--rw global-etr-rloc? simple-address | | | +--rw ms-rloc? simple-address | | | +--rw private-etr-rloc? simple-address | | | +--rw rtr-rlocs* simple-address | | +--:(explicit-locator-path) | | | +--rw explicit-locator-path - | | | +--rw hop* [address] - | | | +--rw address simple-address + | | | +--rw hop* [hop-id] + | | | +--rw hop-id string + | | | +--rw address? simple-address | | | +--rw lrs-bits? bits - | | +--:(sourc-dest-key) - | | +--rw sourc-dest-key - | | +--rw source? inet:ip-prefix - | | +--rw dest? inet:ip-prefix + | | +--:(source-dest-key) + | | | +--rw source-dest-key + | | | +--rw source? simple-address + | | | +--rw dest? simple-address + | | +--:(key-value-address) + | | | +--rw key-value-address + | | | +--rw key? simple-address + | | | +--rw value? simple-address + | | +--:(service-path) + | | +--rw service-path + | | +--rw service-path-id? service-path-id-type + | | +--rw service-index? uint8 | +--rw address* inet:ip-address - +--rw static-mappings + +--rw itr-rlocs? -> /lisp:lisp/locator-sets/locator-set/locator-set-name + +--rw map-cache +--rw mapping* [id] +--rw id eid-id +--rw eid - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type + | +--rw address-type lisp-address-family-ref + | +--rw virtual-network-id? instance-id-type | +--rw (address)? + | +--:(no-address) + | | +--rw no-address? empty | +--:(ipv4) | | +--rw ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--rw ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--rw ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--rw ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--rw mac? yang:mac-address | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? + | | +--rw distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--rw as-number? inet:as-number | +--:(null-address) | | +--rw null-address | | +--rw address? empty | +--:(afi-list) | | +--rw afi-list | | +--rw address-list* simple-address | +--:(instance-id) | | +--rw instance-id - | | +--rw instance-id? instance-id-type + | | +--rw iid? instance-id-type | | +--rw mask-length? uint8 | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number + | +--:(as-number-lcaf) + | | +--rw as-number-lcaf | | +--rw as? inet:as-number | | +--rw address? simple-address | +--:(application-data) | | +--rw application-data | | +--rw address? simple-address | | +--rw protocol? uint8 | | +--rw ip-tos? int32 | | +--rw local-port-low? inet:port-number | | +--rw local-port-high? inet:port-number | | +--rw remote-port-low? inet:port-number @@ -2565,69 +2475,79 @@ | +--:(nat-traversal) | | +--rw nat-traversal | | +--rw ms-udp-port? uint16 | | +--rw etr-udp-port? uint16 | | +--rw global-etr-rloc? simple-address | | +--rw ms-rloc? simple-address | | +--rw private-etr-rloc? simple-address | | +--rw rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address + | | +--rw hop* [hop-id] + | | +--rw hop-id string + | | +--rw address? simple-address | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--rw source-dest-key + | | +--rw source? simple-address + | | +--rw dest? simple-address + | +--:(key-value-address) + | | +--rw key-value-address + | | +--rw key? simple-address + | | +--rw value? simple-address + | +--:(service-path) + | +--rw service-path + | +--rw service-path-id? service-path-id-type + | +--rw service-index? uint8 +--rw ttl? uint32 +--rw authoritative? bits + +--rw static? boolean +--rw (locator-list)? +--:(negative-mapping) | +--rw map-reply-action? map-reply-action +--:(positive-mapping) +--rw rlocs - +--rw rloc* [id] + +--rw locator* [id] +--rw id string - +--rw (address-type)? - | +--:(interface-name) - | | +--rw interface? if:interface-state-ref - | +--:(address) - | +--rw locator-address - | +--rw afi lisp-address-family-ref - | +--rw instance-id? instance-id-type + +--rw locator-address + | +--rw address-type lisp-address-family-ref + | +--rw virtual-network-id? instance-id-type | +--rw (address)? + | +--:(no-address) + | | +--rw no-address? empty | +--:(ipv4) | | +--rw ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--rw ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--rw ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--rw ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--rw mac? yang:mac-address | +--:(distinguished-name) - | | +--rw distinguished-name? distinguished-name - | +--:(lcaf) - | +--rw lcaf - | +--rw lcaf-type lcaf-ref - | +--rw (address)? + | | +--rw distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--rw as-number? inet:as-number | +--:(null-address) | | +--rw null-address | | +--rw address? empty | +--:(afi-list) | | +--rw afi-list | | +--rw address-list* simple-address | +--:(instance-id) | | +--rw instance-id - | | +--rw instance-id? instance-id-type + | | +--rw iid? instance-id-type | | +--rw mask-length? uint8 | | +--rw address? simple-address - | +--:(as-number) - | | +--rw as-number + | +--:(as-number-lcaf) + | | +--rw as-number-lcaf | | +--rw as? inet:as-number | | +--rw address? simple-address | +--:(application-data) | | +--rw application-data | | +--rw address? simple-address | | +--rw protocol? uint8 | | +--rw ip-tos? int32 | | +--rw local-port-low? inet:port-number | | +--rw local-port-high? inet:port-number | | +--rw remote-port-low? inet:port-number @@ -2647,65 +2567,78 @@ | +--:(nat-traversal) | | +--rw nat-traversal | | +--rw ms-udp-port? uint16 | | +--rw etr-udp-port? uint16 | | +--rw global-etr-rloc? simple-address | | +--rw ms-rloc? simple-address | | +--rw private-etr-rloc? simple-address | | +--rw rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--rw explicit-locator-path - | | +--rw hop* [address] - | | +--rw address simple-address + | | +--rw hop* [hop-id] + | | +--rw hop-id string + | | +--rw address? simple-address | | +--rw lrs-bits? bits - | +--:(sourc-dest-key) - | +--rw sourc-dest-key - | +--rw source? inet:ip-prefix - | +--rw dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--rw source-dest-key + | | +--rw source? simple-address + | | +--rw dest? simple-address + | +--:(key-value-address) + | | +--rw key-value-address + | | +--rw key? simple-address + | | +--rw value? simple-address + | +--:(service-path) + | +--rw service-path + | +--rw service-path-id? service-path-id-type + | +--rw service-index? uint8 +--rw priority? uint8 +--rw weight? uint8 +--rw multicast-priority? uint8 +--rw multicast-weight? uint8 -augment /lisp:lisp-state/lisp:devices/lisp:device: +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--ro pitr-state - +--ro learned-mappings + +--ro map-cache +--ro mapping* [id] +--ro id eid-id +--ro eid - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -2725,69 +2658,79 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--ro ttl? uint32 +--ro authoritative? bits + +--ro static? boolean +--ro (locator-list)? +--:(negative-mapping) | +--ro map-reply-action? map-reply-action +--:(positive-mapping) +--ro rlocs - +--ro rloc* [id] + +--ro locator* [id] +--ro id string - +--ro (address-type)? - | +--:(interface-name) - | | +--ro interface? if:interface-state-ref - | +--:(address) - | +--ro locator-address - | +--ro afi lisp-address-family-ref - | +--ro instance-id? instance-id-type + +--ro locator-address + | +--ro address-type lisp-address-family-ref + | +--ro virtual-network-id? instance-id-type | +--ro (address)? + | +--:(no-address) + | | +--ro no-address? empty | +--:(ipv4) | | +--ro ipv4? inet:ipv4-address + | +--:(ipv4-prefix) + | | +--ro ipv4-prefix? inet:ipv4-prefix | +--:(ipv6) | | +--ro ipv6? inet:ipv6-address + | +--:(ipv6-prefix) + | | +--ro ipv6-prefix? inet:ipv6-prefix | +--:(mac) | | +--ro mac? yang:mac-address | +--:(distinguished-name) - | | +--ro distinguished-name? distinguished-name - | +--:(lcaf) - | +--ro lcaf - | +--ro lcaf-type lcaf-ref - | +--ro (address)? + | | +--ro distinguished-name? distinguished-name-type + | +--:(as-number) + | | +--ro as-number? inet:as-number | +--:(null-address) | | +--ro null-address | | +--ro address? empty | +--:(afi-list) | | +--ro afi-list | | +--ro address-list* simple-address | +--:(instance-id) | | +--ro instance-id - | | +--ro instance-id? instance-id-type + | | +--ro iid? instance-id-type | | +--ro mask-length? uint8 | | +--ro address? simple-address - | +--:(as-number) - | | +--ro as-number + | +--:(as-number-lcaf) + | | +--ro as-number-lcaf | | +--ro as? inet:as-number | | +--ro address? simple-address | +--:(application-data) | | +--ro application-data | | +--ro address? simple-address | | +--ro protocol? uint8 | | +--ro ip-tos? int32 | | +--ro local-port-low? inet:port-number | | +--ro local-port-high? inet:port-number | | +--ro remote-port-low? inet:port-number @@ -2807,37 +2750,46 @@ | +--:(nat-traversal) | | +--ro nat-traversal | | +--ro ms-udp-port? uint16 | | +--ro etr-udp-port? uint16 | | +--ro global-etr-rloc? simple-address | | +--ro ms-rloc? simple-address | | +--ro private-etr-rloc? simple-address | | +--ro rtr-rlocs* simple-address | +--:(explicit-locator-path) | | +--ro explicit-locator-path - | | +--ro hop* [address] - | | +--ro address simple-address + | | +--ro hop* [hop-id] + | | +--ro hop-id string + | | +--ro address? simple-address | | +--ro lrs-bits? bits - | +--:(sourc-dest-key) - | +--ro sourc-dest-key - | +--ro source? inet:ip-prefix - | +--ro dest? inet:ip-prefix + | +--:(source-dest-key) + | | +--ro source-dest-key + | | +--ro source? simple-address + | | +--ro dest? simple-address + | +--:(key-value-address) + | | +--ro key-value-address + | | +--ro key? simple-address + | | +--ro value? simple-address + | +--:(service-path) + | +--ro service-path + | +--ro service-path-id? service-path-id-type + | +--ro service-index? uint8 +--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" + file "ietf-lisp-pitr@2016-06-30.yang" module ietf-lisp-pitr { - namespace "urn:ietf:params:xml:ns:yang:lisp-pitr"; + namespace "urn:ietf:params:xml:ns:yang:ietf-lisp-pitr"; prefix lisp-pitr; import ietf-lisp { prefix lisp; } import ietf-lisp-address-types { prefix lcaf; } import ietf-inet-types { prefix inet; } @@ -2857,63 +2809,47 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6832"; } identity pitr { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP PITR."; + } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-pitr:pitr'" { + augment "/lisp:lisp/lisp:lisp-router-instances" + + "/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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 "Proxy-ITR configuration parameters."; - container servicing-eids { - description - "EIDs serviced by the PITR."; - list eid { - key "id"; - description - "List of EIDs serviced by the PITR."; - leaf id { - type lisp:eid-id; - description - "Id of serviced EID."; - } - container eid-address { - uses lcaf:lisp-address; - description - "Serviced EID address in generic LISP address format."; - } - } - } + + uses lisp:servicing-eids-grouping; container map-resolvers { description "Map-Resolvers configured for PITR."; list map-resolver { key "id"; description "List of Map-Resolvers configured for PITR."; leaf id { type lisp:eid-id; @@ -2926,92 +2862,106 @@ "EID for which the Map-Resolver is used."; } leaf-list address { type inet:ip-address; min-elements 1; description "List of Map-Resolver's addresses."; } } } - container static-mappings{ + leaf itr-rlocs { + type leafref { + path "/lisp:lisp/lisp:locator-sets/lisp:locator-set/" + + "lisp:locator-set-name"; + } + description + "Refrence to a locator set that the PITR includes in + Map-Requests"; + } + container map-cache{ uses lisp:mappings; description "EID to RLOCs mappings cache."; } } } - augment "/lisp:lisp-state/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-pitr:pitr'" { + augment "/lisp:lisp/lisp:lisp-router-instances" + + "/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; - container learned-mappings { + container map-cache { uses lisp:mappings; description "EID to RLOCs mappings cache."; } } } } 8. LISP Proxy ETR Module This module captures the configuration data model of a LISP Proxy ETR [RFC6832]. The model may also capture some operational data elements. 8.1. Module Structure module: ietf-lisp-petr -augment /lisp:lisp/lisp:devices/lisp:device: +augment /lisp:lisp/lisp:lisp-router-instances/lisp:lisp-router-instance/lisp:lisp-role: +--rw proxy-etr-cfg! +--rw servicing-eids - +--rw eid* [id] + +--rw servicing-eid* [id] +--rw id lisp:eid-id +--rw eid-address - +--rw afi lisp-address-family-ref - +--rw instance-id? instance-id-type + +--rw address-type lisp-address-family-ref + +--rw virtual-network-id? instance-id-type +--rw (address)? + +--:(no-address) + | +--rw no-address? empty +--:(ipv4) | +--rw ipv4? inet:ipv4-address + +--:(ipv4-prefix) + | +--rw ipv4-prefix? inet:ipv4-prefix +--:(ipv6) | +--rw ipv6? inet:ipv6-address + +--:(ipv6-prefix) + | +--rw ipv6-prefix? inet:ipv6-prefix +--:(mac) | +--rw mac? yang:mac-address +--:(distinguished-name) - | +--rw distinguished-name? distinguished-name - +--:(lcaf) - +--rw lcaf - +--rw lcaf-type lcaf-ref - +--rw (address)? + | +--rw distinguished-name? distinguished-name-type + +--:(as-number) + | +--rw as-number? inet:as-number +--:(null-address) | +--rw null-address | +--rw address? empty +--:(afi-list) | +--rw afi-list | +--rw address-list* simple-address +--:(instance-id) | +--rw instance-id - | +--rw instance-id? instance-id-type + | +--rw iid? instance-id-type | +--rw mask-length? uint8 | +--rw address? simple-address - +--:(as-number) - | +--rw as-number + +--:(as-number-lcaf) + | +--rw as-number-lcaf | +--rw as? inet:as-number | +--rw address? simple-address +--:(application-data) | +--rw application-data | +--rw address? simple-address | +--rw protocol? uint8 | +--rw ip-tos? int32 | +--rw local-port-low? inet:port-number | +--rw local-port-high? inet:port-number | +--rw remote-port-low? inet:port-number @@ -3031,40 +2981,46 @@ +--:(nat-traversal) | +--rw nat-traversal | +--rw ms-udp-port? uint16 | +--rw etr-udp-port? uint16 | +--rw global-etr-rloc? simple-address | +--rw ms-rloc? simple-address | +--rw private-etr-rloc? simple-address | +--rw rtr-rlocs* simple-address +--:(explicit-locator-path) | +--rw explicit-locator-path - | +--rw hop* [address] - | +--rw address simple-address + | +--rw hop* [hop-id] + | +--rw hop-id string + | +--rw address? simple-address | +--rw lrs-bits? bits - +--:(sourc-dest-key) - +--rw sourc-dest-key - +--rw source? inet:ip-prefix - +--rw dest? inet:ip-prefix + +--:(source-dest-key) + | +--rw source-dest-key + | +--rw source? simple-address + | +--rw dest? simple-address + +--:(key-value-address) + | +--rw key-value-address + | +--rw key? simple-address + | +--rw value? simple-address + +--:(service-path) + +--rw service-path + +--rw service-path-id? service-path-id-type + +--rw service-index? uint8 8.2. Module Definition - file "ietf-lisp-petr@2015-07-02.yang" + file "ietf-lisp-petr@2016-06-30.yang" module ietf-lisp-petr { - namespace "urn:ietf:params:xml:ns:yang:lisp-petr"; + namespace "urn:ietf:params:xml:ns:yang:ietf-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 "lisp@ietf.org"; description "This YANG module defines the generic configuration data for a LISP PETR. The module can be extended by vendors to define vendor-specific configuration parameters and policies. Copyright (c) 2015 IETF Trust and the persons identified as @@ -3073,64 +3029,47 @@ 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 6338; see the RFC itself for full legal notices. "; - revision 2015-07-02 { + revision 2016-06-30 { description "Initial revision."; reference "https://tools.ietf.org/html/rfc6832"; } identity petr { - base lisp:lisp-device; + base lisp:lisp-role; description "LISP PETR."; } - augment "/lisp:lisp/lisp:devices/lisp:device" { - when "lisp:type = 'lisp-petr:petr'" { + augment "/lisp:lisp/lisp:lisp-router-instances" + + "/lisp:lisp-router-instance/lisp:lisp-role" { + when "lisp:lisp-role-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."; - container servicing-eids { - description - "EIDs serviced by the PETR."; - list eid { - key "id"; - description - "List of EIDs serviced by the PETR."; - leaf id { - type lisp:eid-id; - description - "Id of serviced EID."; - } - container eid-address { - uses lcaf:lisp-address; - description - "Serviced EID in generic LISP address format."; - } - } - } - } + uses lisp:servicing-eids-grouping; + }//proxy-etr-cfg } } 9. LISP Address Types This module captures the various LISP address types, and is an essential building block used in other LISP modules. 9.1. Module Definition @@ -3451,50 +3389,50 @@ leaf as-number { 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 = 'laddr: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 = 'laddr: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 = 'laddr: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; @@ -3506,42 +3444,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 = 'laddr: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 = 'laddr: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; @@ -3573,21 +3512,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 = 'laddr: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 { @@ -3656,21 +3595,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 = 'laddr: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; @@ -3697,36 +3636,38 @@ 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 = 'laddr: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"; ordered-by user; description "List of locator hops forming the explicit path."; leaf hop-id { - type string; + type string { + length "1..64"; + } description "Unique identifier for the hop."; } leaf address { type simple-address; description "AFI address."; } leaf lrs-bits { type bits{ @@ -3740,26 +3681,26 @@ } bit strict { description "Strict bit."; } } description "Flag bits per hop."; } } - } container source-dest-key { - when "../address-type = 'source-dest-key-lcaf'" { + when "../address-type = 'laddr: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."; @@ -3764,46 +3705,45 @@ 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 = 'laddr: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 = 'laddr: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; description "Service path identifier for the path for NSH header"; } leaf service-index {