diff options
| author |   Jan Srnicek <jsrnicek@cisco.com> | 2017-08-04 08:49:05 +0200 |
|---|---|---|
| committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-08-07 10:34:01 +0200 |
| commit | 941edc8b15e5f3fed701b5585ce7ad421991b16d (patch) | |
| tree | 55a73bd261f181cd890da517f25aeed519033af9 /lisp/api | |
| parent | 1eac992e90839c99337a80db4ff6b880787a3056 (diff) | |
HC2VPP-162 - use composite key for locator pair
Removes need for custom mapping for locator pairs and their ids
Change-Id: Idaa6ee5ec74d8bf57a72bea95c0c0d408e6e940e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/api')
| -rw-r--r-- | lisp/api/src/main/yang/gpe-locator-pair-identification-context@2017-05-17.yang | 70 | ||||
| -rw-r--r-- | lisp/api/src/main/yang/gpe@2017-08-01.yang (renamed from lisp/api/src/main/yang/gpe@2017-05-18.yang) | 19 |
2 files changed, 9 insertions, 80 deletions
diff --git a/lisp/api/src/main/yang/gpe-locator-pair-identification-context@2017-05-17.yang b/lisp/api/src/main/yang/gpe-locator-pair-identification-context@2017-05-17.yang deleted file mode 100644 index 776dbc927..000000000 --- a/lisp/api/src/main/yang/gpe-locator-pair-identification-context@2017-05-17.yang +++ /dev/null @@ -1,70 +0,0 @@ -module gpe-locator-pair-identification-context { - yang-version 1; - namespace "urn:honeycomb:params:xml:ns:yang:gpe:locator:pair:identification:context"; - prefix "gpe-locator-pair-identification-context"; - - description - "This module contains mappings between gpe entry identificator and locator pair in vpp"; - - revision "2017-05-17" { - description - "Initial revision."; - } - - import lisp {prefix "lisp";} - import ietf-inet-types {prefix "inet";} - import yang-ext {prefix "ext";} - import naming-context { prefix "nc";} - - grouping gpe-locator-pair-identification-context-attributes{ - - container gpe-locator-pair-identification-contexts { - - list gpe-locator-pair-identification { - - key "name"; - - leaf name { - type string; - } - - container mappings{ - list mapping { - - key "id"; - - leaf id { - type string; - description "Id that uniquely identifies gpe entry"; - } - - list locator-pair-mapping { - key "id"; - - leaf id { - type string; - description "Id that uniquely identifies locator pair"; - } - - container pair { - leaf local-address{ - type inet:ip-address; - description "Local locator address"; - } - leaf remote-address { - type inet:ip-address; - description "Remote locator address"; - } - } - } - } - } - } - } - } - - augment /nc:contexts { - ext:augment-identifier "gpe-locator-pair-identification-ctx-augmentation"; - uses gpe-locator-pair-identification-context-attributes; - } -}
\ No newline at end of file diff --git a/lisp/api/src/main/yang/gpe@2017-05-18.yang b/lisp/api/src/main/yang/gpe@2017-08-01.yang index c99d5f26a..e327e9bd8 100644 --- a/lisp/api/src/main/yang/gpe@2017-05-18.yang +++ b/lisp/api/src/main/yang/gpe@2017-08-01.yang @@ -19,13 +19,19 @@ module gpe { prefix "lisp-types"; } + revision 2017-08-01 { + description + "Locator pair composite key support"; + } + revision 2017-05-18 { description "Add support for defining lisp gpe forward entries"; } - grouping locator-pair { - container locator-pair { + grouping locator-pairs-grouping { + list locator-pair { + key "local-locator remote-locator"; leaf local-locator { type inet:ip-address; description "Local locator address"; @@ -70,18 +76,11 @@ module gpe { uses lisp-types:lisp-address; description "Remote EID"; } - list locator-pairs { - key id; - leaf id { - type string; - description "Locator Pair ID"; - } - uses locator-pair; - } leaf action { type lisp:map-reply-action; description "Forwarding action for negative entries"; } + uses locator-pairs-grouping; } } } |