Migrate Postman collections to IETF YANG model 10/30510/1
authorLorand Jakab <lojakab@cisco.com>
Wed, 2 Dec 2015 21:36:48 +0000 (23:36 +0200)
committerLorand Jakab <lojakab@cisco.com>
Wed, 2 Dec 2015 21:36:48 +0000 (23:36 +0200)
Change-Id: I4b7689c650fd6d9a9133e2ebcfc0e61e80a59d76
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
mappingservice/implementation/src/main/resources/lfm_RESTCONF.json.postman_collection
mappingservice/implementation/src/main/resources/lfm_RPCs.json.postman_collection

index 15faf491ff92f16cf36e0e4ae57681715abbf591..861db3c11c152d577e9fef9fe557f595f499f2c6 100644 (file)
@@ -1,61 +1,54 @@
 {
-       "id": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+       "id": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
        "name": "lfm RESTCONF",
        "description": "",
        "order": [
-               "85ba8251-4998-532a-4c4b-611b30974599",
-               "dbcd9153-6022-c297-0154-bfa15d8b6872",
-               "9342710c-03ab-7494-909a-5e3e9a6cfc55",
-               "a3fc8671-d7ab-9276-6e09-e62939e330dc",
-               "af40d48c-cc5e-bedd-a92f-c0b433e3928e",
-               "fe7ae219-42c0-6cb4-ffb5-7badb8af5738",
-               "be974822-7f0b-ac92-35af-1aac8cadc7ac",
-               "d43cc55e-bcc7-bdce-1673-4ba2d1c92f2c",
-               "f317f5ca-1bac-2f87-5d9f-c165d127bdf6",
-               "2c1b7cac-a60a-3698-32fe-6c29bda5b8a7",
-               "135e122f-af86-1494-7fe2-c4c58dd41f3a",
-               "e4f03542-2d58-9a77-f59b-1518e3e2bce9",
-               "a38cd195-f904-5160-7bc2-4fbfa01e16d4",
-               "fb4658dc-9ba9-3110-9fb3-9e69f30d292a",
-               "a3d74340-9293-3faa-ff5f-c655bcc7be12",
-               "8d19a093-57fb-9c07-0d36-9c211fd0b654"
+               "93da2d0a-3ef9-3162-156f-9d484ad590cb",
+               "5b2c521f-dc67-f4d9-c7e0-659c8805ec1a",
+               "b49723d6-1ba3-7be6-286e-955ad3cbac50",
+               "757b59fd-f908-4a31-8b91-b2b7fb07f82c",
+               "26dc0c81-b01f-2ac2-9bd0-df239de740a5",
+               "1057e12b-86f8-0c82-10fe-c4953ab21a91",
+               "2074b127-d1af-23ee-bdf4-60baa02e8260",
+               "e2c42a4c-330b-fc5d-ec00-ad6d93c3ff80",
+               "7151faac-dd14-bb8e-a7d6-d58d7ec2be1c",
+               "7ae72d8f-cf42-26e4-46fd-b96974a56fe8",
+               "a5c7c44b-07d5-d187-f429-5942a98820fe",
+               "cfc80103-7a74-561f-9d02-1a8d21c83b3e",
+               "71ef5efe-647c-2f6a-7731-aa190d882f3c",
+               "b7812c6c-d0e4-2630-c218-00d1b5341491",
+               "7df82412-8e64-90e4-c124-fd54073a3c9e",
+               "f08d3024-c9a6-1692-d636-d569a40cffde"
        ],
        "folders": [],
-       "timestamp": 1429906322387,
+       "timestamp": 1443706163343,
        "owner": 0,
        "remoteLink": "",
        "public": false,
-       "createdAt": null,
-       "updatedAt": null,
-       "synced": false,
        "requests": [
                {
-                       "id": "135e122f-af86-1494-7fe2-c4c58dd41f3a",
+                       "id": "1057e12b-86f8-0c82-10fe-c4953ab21a91",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/mac:00:11:22:33:44:55/",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/instance-id/0/authentication-key/ipv4:192.0.2.1%2f32/",
                        "preRequestScript": "",
-                       "method": "PUT",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "pathVariables": {},
+                       "method": "DELETE",
                        "data": [],
-                       "dataMode": "raw",
-                       "name": "Add/update MAC key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1432818580435,
+                       "dataMode": "params",
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"mac:00:11:22:33:44:55\",\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "time": 1449087312238,
+                       "name": "Delete IPv4 key",
+                       "description": "",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "2c1b7cac-a60a-3698-32fe-6c29bda5b8a7",
+                       "id": "2074b127-d1af-23ee-bdf4-60baa02e8260",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/ipv6:2001:db8::1%2f128/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "PUT",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432818542796,
-                       "name": "Add/update IPv6 key",
+                       "time": 1449088020426,
+                       "name": "Add/update IPv4 mapping",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"ipv6:2001:db8::1/128\",\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "rawModeData": "{\n    \"mapping\": {\n        \"eid-uri\": \"ipv4:192.0.2.1/32\",\n        \"origin\": \"northbound\",\n        \"site-id\": [\n            \"AAAAAAAAAAA=\"\n        ],\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "85ba8251-4998-532a-4c4b-611b30974599",
+                       "id": "26dc0c81-b01f-2ac2-9bd0-df239de740a5",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/ipv4:192.0.2.1%2f32/",
                        "preRequestScript": "",
                        "pathVariables": {},
-                       "method": "PUT",
+                       "method": "GET",
                        "data": [],
-                       "dataMode": "raw",
+                       "dataMode": "params",
                        "version": 2,
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432815035076,
-                       "name": "Add/update multiple keys/mappings",
-                       "description": "Overwrites everything",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
-                       "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"mapping-database\": {\n        \"instance-id\": [{\n            \"iid\":\"0\",\n            \"authentication-key\": {\n                \"eid\":\"ipv4:192.0.2.1/32\",\n                \"authkey\":\"password\",\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\":1,\n                        \"Ipv4Address\":\"192.0.2.1\"\n                    }\n                },\n                \"key-type\":1,\n                \"mask-length\":32\n            },\n            \"mapping\": {\n                \"eid\": \"ipv4:192.0.2.1/32\",\n                \"origin\": \"northbound\",\n                \"recordTtl\": 1440,\n                \"maskLength\": 32,\n                \"authoritative\": true,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"192.0.2.1\"\n                    }\n                },\n                \"LocatorRecord\": [\n                    {\n                        \"name\": \"ISP1\",\n                        \"priority\": 1,\n                        \"weight\": 1,\n                        \"multicastPriority\": 255,\n                        \"multicastWeight\": 0,\n                        \"localLocator\": true,\n                        \"rlocProbed\": false,\n                        \"routed\": false,\n                        \"LispAddressContainer\": {\n                            \"Ipv4Address\": {\n                                \"afi\": 1,\n                                \"Ipv4Address\": \"10.10.10.10\"\n                            }\n                        }\n                    }\n                ]\n            }\n        },\n        {\n            \"iid\":\"1\",\n            \"authentication-key\": {\n                \"eid\":\"ipv4:192.0.2.2/32\",\n                \"authkey\":\"password-iid1\",\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\":1,\n                        \"Ipv4Address\":\"192.0.2.2\"\n                    }\n                },\n                \"key-type\":1,\n                \"mask-length\":32\n            }\n        }]\n    }\n}"
+                       "time": 1447808649431,
+                       "name": "Get IPv4 key",
+                       "description": "",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "8d19a093-57fb-9c07-0d36-9c211fd0b654",
+                       "id": "5b2c521f-dc67-f4d9-c7e0-659c8805ec1a",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/1/authentication-key/kv:192.0.2.1=>192.0.2.2/",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/",
                        "preRequestScript": "",
-                       "method": "PUT",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "pathVariables": {},
+                       "method": "GET",
                        "data": [],
-                       "dataMode": "raw",
-                       "name": "Add/update Key/Value Address key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1432837342648,
+                       "dataMode": "params",
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"kv:192.0.2.1=>192.0.2.2\",\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "time": 1447808572958,
+                       "name": "Get ALL database content",
+                       "description": "",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "9342710c-03ab-7494-909a-5e3e9a6cfc55",
+                       "id": "7151faac-dd14-bb8e-a7d6-d58d7ec2be1c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
                        "preRequestScript": "",
-                       "method": "DELETE",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "pathVariables": {},
+                       "method": "GET",
                        "data": [],
                        "dataMode": "params",
-                       "name": "Delete ALL database content",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1430169139026,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false
+                       "time": 1449087983777,
+                       "name": "Get IPv4 mapping",
+                       "description": "",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "a38cd195-f904-5160-7bc2-4fbfa01e16d4",
+                       "id": "71ef5efe-647c-2f6a-7731-aa190d882f3c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/as:AS64500/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/dn:stringAsIs/",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "PUT",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432820339686,
-                       "name": "Add/update AS Number key",
+                       "time": 1449088234109,
+                       "name": "Add/update DistinguishedName key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"as:AS64500\",\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"dn:stringAsIs\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "a3d74340-9293-3faa-ff5f-c655bcc7be12",
+                       "id": "757b59fd-f908-4a31-8b91-b2b7fb07f82c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/1/authentication-key/srcdst:192.0.2.1%2f32|192.0.2.2%2f32/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/ipv4:192.0.2.1%2f32/",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "PUT",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432837355011,
-                       "name": "Add/update Source/Dest key",
+                       "time": 1449087258462,
+                       "name": "Add/update IPv4 key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"srcdst:192.0.2.1/32|192.0.2.2/32\",\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"ipv4:192.0.2.1/32\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "a3fc8671-d7ab-9276-6e09-e62939e330dc",
+                       "id": "7ae72d8f-cf42-26e4-46fd-b96974a56fe8",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/ipv4:192.0.2.1%2f32/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
                        "preRequestScript": "",
                        "pathVariables": {},
-                       "method": "PUT",
+                       "method": "DELETE",
                        "data": [],
-                       "dataMode": "raw",
+                       "dataMode": "params",
                        "version": 2,
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814786689,
-                       "name": "Add/update IPv4 key",
+                       "time": 1449088077591,
+                       "name": "Delete IPv4 mapping",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
-                       "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"ipv4:192.0.2.1/32\",\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "af40d48c-cc5e-bedd-a92f-c0b433e3928e",
+                       "id": "7df82412-8e64-90e4-c124-fd54073a3c9e",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/ipv4:192.0.2.1%2f32/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/srcdst:192.0.2.1%2f32|192.0.2.2%2f32/",
                        "preRequestScript": "",
                        "pathVariables": {},
-                       "method": "GET",
+                       "method": "PUT",
                        "data": [],
-                       "dataMode": "params",
+                       "dataMode": "raw",
                        "version": 2,
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814805965,
-                       "name": "Get IPv4 key",
+                       "time": 1449088811218,
+                       "name": "Add/update Source/Dest key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"srcdst:192.0.2.1/32|192.0.2.2/32\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "be974822-7f0b-ac92-35af-1aac8cadc7ac",
+                       "id": "93da2d0a-3ef9-3162-156f-9d484ad590cb",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
-                       "preRequestScript": "",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/",
                        "pathVariables": {},
+                       "preRequestScript": "",
                        "method": "PUT",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "data": [],
                        "dataMode": "raw",
+                       "name": "Add/update multiple keys/mappings",
+                       "description": "Overwrites everything",
+                       "descriptionFormat": "html",
+                       "time": 1449088664456,
                        "version": 2,
+                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814875712,
-                       "name": "Add/update IPv4 mapping",
-                       "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
-                       "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"mapping\": {\n        \"eid\": \"ipv4:192.0.2.1/32\",\n        \"origin\": \"northbound\",\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n        ]\n   }\n}"
+                       "rawModeData": "{\n  \"mapping-database\": {\n    \"virtual-network-identifier\": [\n      {\n        \"vni\": \"0\",\n        \"authentication-key\": [\n          {\n            \"eid-uri\": \"srcdst:192.0.2.1/32|192.0.2.2/32\",\n            \"mapping-authkey\": {\n              \"key-type\": 1,\n              \"key-string\": \"password\"\n            },\n            \"eid\": {\n              \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n              \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n              }\n            }\n          },\n          {\n            \"eid-uri\": \"ipv4:192.0.2.1/32\",\n            \"mapping-authkey\": {\n              \"key-type\": 1,\n              \"key-string\": \"password\"\n            },\n            \"eid\": {\n              \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n              \"ipv4-prefix\": \"192.0.2.1/32\"\n            }\n          }\n        ],\n        \"mapping\": [\n          {\n            \"origin\": \"northbound\",\n            \"eid-uri\": \"ipv4:192.0.2.1/32\",\n            \"mapping-record\": {\n              \"recordTtl\": 1440,\n              \"action\": \"NoAction\",\n              \"LocatorRecord\": [\n                {\n                  \"locator-id\": \"ISP1\",\n                  \"multicastPriority\": 255,\n                  \"routed\": false,\n                  \"localLocator\": true,\n                  \"weight\": 1,\n                  \"priority\": 1,\n                  \"multicastWeight\": 0,\n                  \"rloc\": {\n                    \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                    \"ipv4\": \"10.10.10.10\"\n                  },\n                  \"rlocProbed\": false\n                }\n              ],\n              \"authoritative\": true,\n              \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n              }\n            },\n            \"site-id\": [\n              \"AAAAAAAAAAA=\"\n            ]\n          }\n        ]\n      },\n      {\n        \"vni\": \"1\",\n        \"mapping\": [\n          {\n            \"origin\": \"northbound\",\n            \"eid-uri\": \"ipv4:192.0.2.1/32\",\n            \"mapping-record\": {\n              \"recordTtl\": 1440,\n              \"action\": \"NoAction\",\n              \"LocatorRecord\": [\n                {\n                  \"locator-id\": \"ISP1\",\n                  \"multicastPriority\": 255,\n                  \"routed\": false,\n                  \"localLocator\": true,\n                  \"weight\": 1,\n                  \"priority\": 1,\n                  \"multicastWeight\": 0,\n                  \"rloc\": {\n                    \"address-type\": \"ietf-lisp-address-types:explicit-locator-path-lcaf\",\n                    \"explicit-locator-path\": {\n                      \"hop\": [\n                        {\n                          \"hop-id\": \"Hop 1\",\n                          \"address\": \"192.0.2.1\",\n                          \"lrs-bits\": \"lookup rloc-probe strict\"\n                        },\n                        {\n                          \"hop-id\": \"Hop 2\",\n                          \"address\": \"192.0.2.2\",\n                          \"lrs-bits\": \"rloc-probe strict\"\n                        },\n                        {\n                          \"hop-id\": \"Hop 3\",\n                          \"address\": \"192.0.2.3\",\n                          \"lrs-bits\": \"rloc-probe\"\n                        }\n                      ]\n                    }\n                  },\n                  \"rlocProbed\": false\n                }\n              ],\n              \"authoritative\": true,\n              \"eid\": {\n                \"virtual-network-id\": 1,\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n              }\n            },\n            \"site-id\": [\n              \"AAAAAAAAAAA=\"\n            ]\n          }\n        ]\n      }\n    ]\n  }\n}"
                },
                {
-                       "id": "d43cc55e-bcc7-bdce-1673-4ba2d1c92f2c",
+                       "id": "a5c7c44b-07d5-d187-f429-5942a98820fe",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/ipv6:2001:db8::1%2f128/",
                        "preRequestScript": "",
                        "pathVariables": {},
-                       "method": "GET",
+                       "method": "PUT",
                        "data": [],
-                       "dataMode": "params",
+                       "dataMode": "raw",
                        "version": 2,
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814926784,
-                       "name": "Get IPv4 mapping",
+                       "time": 1449088151414,
+                       "name": "Add/update IPv6 key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"ipv6:2001:db8::1/128\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "dbcd9153-6022-c297-0154-bfa15d8b6872",
+                       "id": "b49723d6-1ba3-7be6-286e-955ad3cbac50",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/",
                        "preRequestScript": "",
-                       "method": "GET",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "pathVariables": {},
+                       "method": "DELETE",
                        "data": [],
                        "dataMode": "params",
-                       "name": "Get ALL database content",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1430168653088,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false
+                       "time": 1447808584202,
+                       "name": "Delete ALL database content",
+                       "description": "",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
+                       "responses": []
                },
                {
-                       "id": "e4f03542-2d58-9a77-f59b-1518e3e2bce9",
+                       "id": "b7812c6c-d0e4-2630-c218-00d1b5341491",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/dn:stringAsIs/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/as:AS64500/",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "PUT",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432820169790,
-                       "name": "Add/update DistinguishedName key",
+                       "time": 1449088276098,
+                       "name": "Add/update AS Number key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"dn:stringAsIs\",\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"as:AS64500\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "f317f5ca-1bac-2f87-5d9f-c165d127bdf6",
+                       "id": "cfc80103-7a74-561f-9d02-1a8d21c83b3e",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/mapping/ipv4:192.0.2.1%2f32/northbound/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/mac:00:11:22:33:44:55/",
                        "preRequestScript": "",
                        "pathVariables": {},
-                       "method": "DELETE",
+                       "method": "PUT",
                        "data": [],
-                       "dataMode": "params",
+                       "dataMode": "raw",
                        "version": 2,
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814946053,
-                       "name": "Delete IPv4 mapping",
+                       "time": 1449088192036,
+                       "name": "Add/update MAC key",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"mac:00:11:22:33:44:55\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "fb4658dc-9ba9-3110-9fb3-9e69f30d292a",
+                       "id": "e2c42a4c-330b-fc5d-ec00-ad6d93c3ff80",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/1/authentication-key/ipv4:192.0.2.0%2f24/",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/1/mapping/ipv4:192.0.2.1%2f32/northbound/",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "PUT",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432821478184,
-                       "name": "Add/update Instance ID 1 IPv4 key",
+                       "time": 1449087951566,
+                       "name": "Add/update IID 1 IPv4 to ELP mapping",
                        "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid\": \"ipv4:192.0.2.0/24\",\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n    }\n}"
+                       "rawModeData": "{\n    \"mapping\": {\n        \"eid-uri\": \"ipv4:192.0.2.1/32\",\n        \"origin\": \"northbound\",\n        \"site-id\": [\n            \"AAAAAAAAAAA=\"\n        ],\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"virtual-network-id\": 1,\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:explicit-locator-path-lcaf\",\n                        \"explicit-locator-path\": {\n                            \"hop\": [\n                                {\n                                    \"hop-id\": \"Hop 1\",\n                                    \"address\": \"192.0.2.1\",\n                                    \"lrs-bits\": \"lookup rloc-probe strict\"\n                                },\n                                {\n                                    \"hop-id\": \"Hop 2\",\n                                    \"address\": \"192.0.2.2\",\n                                    \"lrs-bits\": \"rloc-probe strict\"\n                                },\n                                {\n                                    \"hop-id\": \"Hop 3\",\n                                    \"address\": \"192.0.2.3\",\n                                    \"lrs-bits\": \"rloc-probe\"\n                                }\n                            ]\n                        }\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "fe7ae219-42c0-6cb4-ffb5-7badb8af5738",
+                       "id": "f08d3024-c9a6-1692-d636-d569a40cffde",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/mappingservice:mapping-database/instance-id/0/authentication-key/ipv4:192.0.2.1%2f32/",
-                       "preRequestScript": "",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/config/odl-mappingservice:mapping-database/virtual-network-identifier/0/authentication-key/kv:192.0.2.1=>192.0.2.2/",
                        "pathVariables": {},
-                       "method": "DELETE",
+                       "preRequestScript": "",
+                       "method": "PUT",
+                       "collectionId": "53174160-6e1c-0a04-8403-8e0b2f0b5fce",
                        "data": [],
-                       "dataMode": "params",
+                       "dataMode": "raw",
+                       "name": "Add/update Key/Value Address key",
+                       "description": "",
+                       "descriptionFormat": "html",
+                       "time": 1449088915132,
                        "version": 2,
+                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1432814822566,
-                       "name": "Delete IPv4 key",
-                       "description": "",
-                       "collectionId": "82344189-c2b0-d9a7-6551-eaafcd1103de",
-                       "responses": [],
-                       "synced": false
+                       "rawModeData": "{\n    \"authentication-key\": {\n        \"eid-uri\": \"kv:192.0.2.1=>192.0.2.2\",\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                }
        ]
-}
+}
\ No newline at end of file
index c9824f5881a6a9775a9174b7fbc0bcf25ac75299..bd133cd3e0ca6c038ccc37bf6df20113c505a091 100644 (file)
 {
-       "id": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+       "id": "4968197b-a90c-f22a-b88d-1d353d8cc231",
        "name": "lfm RPCs",
        "description": "LISP Flow Mapping RPC API examples",
        "order": [
-               "4246d14c-c8e3-9d1e-ee28-706944a32ef7",
-               "70b64110-73e2-a902-4abd-f9b5de550b38",
-               "6b2d8b03-aac6-ab52-3837-60c43baf99d1",
-               "89420a7b-489d-2458-c1ca-8acb5a8ac97b",
-               "add50eac-85bb-9c63-6954-651ec3def935",
-               "ce882c5e-fd36-9d68-5859-778cbe763b97",
-               "85b24eac-fab0-ed44-d02f-8f78aed6cb6c",
-               "e652707b-3637-7494-9e82-c7ee27df52d3",
-               "f81029ff-09d1-695c-703b-785657d4d633",
-               "c0b3e7b2-6f7f-e250-3d0c-c16b6ec5abdc",
-               "5f3161ec-b598-b240-4975-bf50289562a8",
-               "79e37882-7564-ea1f-339d-5bdf8205556c",
-               "e27b1f5d-2645-5847-6309-1c27de01b22c",
-               "d8d8826f-a15a-148e-d568-28575a185169",
-               "101474de-efd0-0b86-d98e-522f660c37c4",
-               "68f0ddb6-2512-16bb-f08d-f0d64221b270",
-               "fcdced1b-892a-ad47-043e-f650b78add0f",
-               "51937e10-a151-997c-07a9-aad87aeb41fa",
-               "47d8f781-b331-a925-fd32-a604b36080ec",
-               "1a0a2f0c-8652-302d-264a-bd0dd41e8ce6",
-               "2fa332e1-6fc9-0c5d-dcb7-e4086828efec",
-               "0acae000-42f7-8dc2-07c8-2ef0cd44d821",
-               "7e8fbbcb-560b-2e64-5ea4-8f3bc763e5f1",
-               "301163a4-b5b1-9377-191e-27763f9d4e51",
-               "46a2e984-8226-9092-2e8a-e3128a893b56",
-               "2f39f538-bb0d-310c-8e9e-8962fb58359b",
-               "047c0854-8d54-b462-74fd-a4564123bc40",
-               "123ac2ca-f3cf-9288-6983-509adb333816",
-               "64a01be8-895f-087f-865d-2c4cf59f1081",
-               "d48a19c6-718d-5fad-8993-697c6121df33",
-               "cc62bee8-afea-c711-5fb3-47ae7b188808",
-               "fb94962b-8db0-2af0-3a1b-656a9f88d856",
-               "a1d77c69-57a4-a2b2-ac98-e612f73782ed",
-               "027528fb-3e87-d348-8a23-272a760d525c",
-               "80af36e1-3e15-7a1f-0466-e96d1c0b4ef2",
-               "0fcb66dc-5ee0-208c-5e42-9550224e3a98",
-               "b635f4f5-7166-e138-3542-2c5285e3a5bb",
-               "56938ae7-f113-ee60-ef92-1e5028494db5",
-               "42204829-49cf-64cc-2bf6-436f5fca7759",
-               "dbf9d7c8-a474-9d35-3804-54f861f9465e",
-               "03a89a0a-ed4d-2f76-e9fd-c5c4d297fd4a",
-               "3594b898-f00d-e65e-f26e-7ea4852ad6e3",
-               "92d71ba6-6dba-0987-2032-841b2e75189e",
-               "444b0b02-59a6-ec5b-89c3-c4d097465a39",
-               "b91b03a2-0e89-b5de-dd63-64925fa40c23",
-               "8474d55a-6d1c-c4ba-81f0-ab3ff2d1aaea",
-               "632e6a4a-0315-2e44-7a11-2608a905089c",
-               "3d96b180-55f1-0463-0c2f-17673b9c4b78",
-               "bce9e800-e3f8-0463-3342-13911c68aa12",
-               "3eea11ed-9325-5cd4-0393-d4b49e53f42e",
-               "a1adf8b9-a1f8-acfd-af45-5d3dee6ea0ea",
-               "3dcb3826-9554-318a-2e61-814f36b4dceb",
-               "40cb8152-0f0f-b606-deb8-3523a45088fe",
-               "a3b76da1-4e38-0a39-1003-b61a5f937543",
-               "b83a0563-9539-b5f9-700b-58ca819f44bf",
-               "aae3ada0-89c3-b38e-20ea-51f26b0ad0d7",
-               "14fc0028-06f6-41bf-7bfc-405e7e806cb5",
-               "176e26c1-7360-dde9-2fdb-af27f9ec1b97",
-               "7f8f23fe-0e3c-8faf-9b1c-758fc81e513b",
-               "b0447c46-ba92-38ec-30bc-6871d3f6746f",
-               "2f60ab4b-2942-f57c-6ea1-d2b7b311d146",
-               "19aa8979-2f0d-eb68-a3a1-95f1809253fc",
-               "332aa91d-a689-3364-9ac9-86813c03c04b",
-               "502b71a6-4f62-0760-8117-c3e907a18314",
-               "0babd386-8ac9-d28f-b9a0-bcad9367b42a",
-               "9c0594ac-14d4-13ff-574d-9696d0788cfd",
-               "67204f8c-9287-f5e4-2847-fc2854441297"
+               "2cc66aa6-43a5-4c3d-82d2-b7355ac38431",
+               "23004cc5-e447-95a0-498d-51c0b4bc2745",
+               "16221156-fd0b-c17e-ddc1-4429bca0df80",
+               "a4ccc6d0-7ab6-b4e6-c096-f638510b1877",
+               "af9bd94b-1089-cca6-57e0-3a8dcec339e5",
+               "90e4d20f-844e-674e-dbea-96f7a4a23324",
+               "164577b8-c730-d78f-f03e-69f1ada61e79",
+               "ef5fdf9f-d22c-946d-cea8-e505ff00d101",
+               "6d5d8b54-f42e-a618-317d-9f68fc4da2f0",
+               "882dd896-39ea-1a22-968b-b8ea99f69e93",
+               "ef07c01a-e8ee-5f1d-0c8b-7fe595d9dc6d",
+               "6079a324-0c02-e1be-f6f1-3fa88e20e343",
+               "d96e9bc7-9553-0685-543b-5525cb124528",
+               "dd5997d7-4547-5848-b1ff-4ddb87120b27",
+               "413af268-aaa1-99de-0055-8cdb683151ce",
+               "df12eb9f-f5b0-f272-9c93-bbdd5209e98d",
+               "c3187793-c8d6-f0d9-0a7e-386769255b6a",
+               "465b5e60-e09b-fe90-ffaa-9d143cee6d7b",
+               "fec3d7db-e830-2002-8cbd-3004e0701d55",
+               "5a95e386-807f-2f2a-e366-a6cdf8a522c9",
+               "a86e9495-c45c-b068-72b5-f84e25121e0c",
+               "e8898db1-8807-83fd-0a22-caecbc317ae1",
+               "7427c04b-422e-38ab-2daf-8ac9a4ef5ee0",
+               "d81deacc-e71c-36a0-7855-018d59b1f07b",
+               "2caadefd-0aff-b0eb-4a00-fcacae43784d",
+               "ad076971-6428-1632-510a-9467048dab6a",
+               "0f8691bd-517b-ccf2-5266-8436a9df1c31",
+               "d3c2336d-2118-d676-73ce-51843e947205",
+               "5dc4ea9a-03f7-7ead-bd6d-55afdf4fa584",
+               "9520e318-4d56-fd6e-0e8a-41055226c237",
+               "df0ebf0a-0fa9-252d-4ba5-a920808f85f9",
+               "3b5b6b5e-e6b8-9099-3737-eb6a32bc758c",
+               "31a02cda-ef53-9400-d9d7-8d19b2acf4b9",
+               "a29c9b1c-7ac4-82e4-b7be-0ba697e1cbe2",
+               "cd5e1bc8-d870-a7c4-e9c3-f1f11bdda986",
+               "e7fccbb4-ff2a-5816-23a7-13fe14f377ea",
+               "c8f98a12-7706-ee90-029e-9586e44c09ca",
+               "833e8747-ae9d-1aad-f460-489677af5b2a",
+               "366e8b74-b2d1-222b-a1ac-894e7ffe98ea",
+               "131bd5cf-7e33-66bc-af80-8543c512be65",
+               "a39d6fd7-0565-0e2b-d9f6-ef9905b4ed43",
+               "ca5c4063-f436-c4ea-dbbb-c2867607d686",
+               "b74880dd-ff62-ab8f-17b4-968bb83f8e7c",
+               "e137e0e1-64a3-0de8-8560-931388dbd890",
+               "07e0bb50-5e8a-8ed4-711a-dc77643f89b9",
+               "ae0f2116-6b57-f27c-36cf-69a865443849",
+               "0d7d1e7f-d848-a753-d32a-66148eb08bb5",
+               "f20c842c-157f-1aef-f29c-ee7056de48fd",
+               "3ce4bf75-5306-8540-d857-e40af3d0e21c",
+               "53f80bc3-76e4-7134-fd0d-68ba218a421c",
+               "86749fa6-2251-10ba-155d-a09063c088ac",
+               "96458914-87ef-e868-7215-02f6a917f2b2",
+               "884f4cef-8e32-daa6-7e72-bd23f9d33eb2",
+               "d5d0c5d2-a70e-d270-3a15-eceb1ef44606",
+               "eea5ec39-5825-3ee3-2fca-d619e1e35c70",
+               "99eb680b-e112-be5b-eb05-8e8495609675",
+               "ff278d02-690e-1ecf-f3d9-25b781b81770",
+               "1fe30410-27a6-6e72-abe4-525a2df61a5c",
+               "4c0672f2-a4e6-de73-34c7-54b5f24bb587",
+               "943b08c8-9eb8-857a-e216-4e2cdd1b791b",
+               "b894d0d2-5903-4abd-e3b3-dd797ea2f28a",
+               "7f8554c6-b429-b6f0-6cb0-05f464bf85b5",
+               "bd9d8594-11c2-d21c-f4ea-7259bb9f37c7",
+               "93864328-f3c6-f58d-53a6-98e2941f4961",
+               "b1caa88d-2b7f-98f1-a985-5f39af216060",
+               "1942f88c-1b1a-058d-f80b-98402fbd5b19",
+               "236e53ff-db51-79e9-5474-23621758218c"
        ],
        "folders": [],
-       "timestamp": 1423487357802,
-       "owner": "",
+       "timestamp": 1449088972837,
+       "owner": 0,
        "remoteLink": "",
        "public": false,
-       "createdAt": null,
-       "updatedAt": null,
-       "synced": false,
        "requests": [
                {
-                       "id": "027528fb-3e87-d348-8a23-272a760d525c",
+                       "id": "07e0bb50-5e8a-8ed4-711a-dc77643f89b9",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249840512,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091003607,
+                       "name": "SrcDst: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "03a89a0a-ed4d-2f76-e9fd-c5c4d297fd4a",
+                       "id": "0d7d1e7f-d848-a753-d32a-66148eb08bb5",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250050094,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449091010753,
+                       "name": "SrcDst: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "047c0854-8d54-b462-74fd-a4564123bc40",
+                       "id": "0f8691bd-517b-ccf2-5266-8436a9df1c31",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249600110,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090102556,
+                       "name": "MAC: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        }\n    }\n}"
                },
                {
-                       "id": "0acae000-42f7-8dc2-07c8-2ef0cd44d821",
+                       "id": "131bd5cf-7e33-66bc-af80-8543c512be65",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249396950,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"MacAddress\": {\n                    \"afi\": 16389,\n                    \"MacAddress\": \"00:11:22:33:44:55\"\n                }\n            },\n            \"mask-length\": 0\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449090906108,
+                       "name": "ASN: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n                \"as-number\": 64500\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "0babd386-8ac9-d28f-b9a0-bcad9367b42a",
+                       "id": "16221156-fd0b-c17e-ddc1-4429bca0df80",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251180030,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089635658,
+                       "name": "IPv4: Add mapping with ELP RLOC",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"IPv4\",\n                    \"priority\": 2,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                },\n                {\n                    \"locator-id\": \"ELP\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:explicit-locator-path-lcaf\",\n                        \"explicit-locator-path\": {\n                            \"hop\": [\n                                {\n                                    \"hop-id\": \"Hop 1\",\n                                    \"address\": \"20.20.20.20\",\n                                    \"lrs-bits\": \"lookup rloc-probe strict\"\n                                },\n                                {\n                                    \"hop-id\": \"Hop 2\",\n                                    \"address\": \"30.30.30.30\",\n                                    \"lrs-bits\": \"lookup strict\"\n                                }\n                            ]\n                        }\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "0fcb66dc-5ee0-208c-5e42-9550224e3a98",
+                       "id": "164577b8-c730-d78f-f03e-69f1ada61e79",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249924914,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449089392325,
+                       "name": "IPv4: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        }\n    }\n}"
                },
                {
-                       "id": "101474de-efd0-0b86-d98e-522f660c37c4",
+                       "id": "1942f88c-1b1a-058d-f80b-98402fbd5b19",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv6: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433193283419,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128\n   }\n}"
+                       "time": 1449091472115,
+                       "name": "Key/Value: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n                \"key-value-address\": {\n                    \"key\": \"192.0.2.1\",\n                    \"value\": \"192.0.2.2\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "123ac2ca-f3cf-9288-6983-509adb333816",
+                       "id": "1fe30410-27a6-6e72-abe4-525a2df61a5c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249687211,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449091777911,
+                       "name": "Instance ID 1 + SrcDst: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"virtual-network-id\": 1,\n                \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n                \"source-dest-key\": {\n                    \"source\": \"192.0.2.1/32\",\n                    \"dest\": \"192.0.2.2/32\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "14fc0028-06f6-41bf-7bfc-405e7e806cb5",
+                       "id": "23004cc5-e447-95a0-498d-51c0b4bc2745",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250896867,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089711385,
+                       "name": "IPv4: Add mapping with Application Data RLOC",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:application-data-lcaf\",\n                        \"application-data\": {\n                            \"address\": \"10.10.10.10\",\n                            \"protocol\": 17,\n                            \"ip-tos\": 128,\n                            \"local-port-low\": 80,\n                            \"local-port-high\": 81,\n                            \"remote-port-low\": 6667,\n                            \"remote-port-high\": 7000\n                        }\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "176e26c1-7360-dde9-2fdb-af27f9ec1b97",
+                       "id": "236e53ff-db51-79e9-5474-23621758218c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250946964,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091396881,
+                       "name": "Key/Value: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "19aa8979-2f0d-eb68-a3a1-95f1809253fc",
+                       "id": "2caadefd-0aff-b0eb-4a00-fcacae43784d",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251091969,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"LcafKeyValueAddressAddr\": {\n                    \"afi\": 16387,\n                    \"lcafType\": 15,\n                    \"key\": {\n                        \"Ipv4Address\": {\n                            \"Ipv4Address\": \"192.0.2.1\",\n                            \"afi\": 1\n                        }\n                    },\n                    \"value\": {\n                        \"Ipv4Address\": {\n                            \"Ipv4Address\": \"192.0.2.2\",\n                            \"afi\": 1\n                        }\n                    }\n                }\n            },\n            \"mask-length\": 0\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449090096935,
+                       "name": "MAC: Get mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        }\n    }\n}"
                },
                {
-                       "id": "1a0a2f0c-8652-302d-264a-bd0dd41e8ce6",
+                       "id": "2cc66aa6-43a5-4c3d-82d2-b7355ac38431",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433193766626,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449089759596,
+                       "name": "IPv4: Add mapping with AFI list RLOC",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:afi-list-lcaf\",\n                        \"afi-list\": {\n                            \"address-list\": [\n                                \"10.10.10.10\",\n                                \"2001:db8::1\"\n                            ]\n                        }\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "2f39f538-bb0d-310c-8e9e-8962fb58359b",
+                       "id": "31a02cda-ef53-9400-d9d7-8d19b2acf4b9",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249527885,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449090608976,
+                       "name": "DN: Get mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        }\n    }\n}"
                },
                {
-                       "id": "2f60ab4b-2942-f57c-6ea1-d2b7b311d146",
+                       "id": "366e8b74-b2d1-222b-a1ac-894e7ffe98ea",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "KeyValue: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251046495,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090812840,
+                       "name": "ASN: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        }\n    }\n}"
                },
                {
-                       "id": "2fa332e1-6fc9-0c5d-dcb7-e4086828efec",
+                       "id": "3b5b6b5e-e6b8-9099-3737-eb6a32bc758c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249249209,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090715624,
+                       "name": "DN: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n                \"distinguished-name\": \"stringAsIs\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "301163a4-b5b1-9377-191e-27763f9d4e51",
+                       "id": "3ce4bf75-5306-8540-d857-e40af3d0e21c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249468869,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091015019,
+                       "name": "SrcDst: Get mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "332aa91d-a689-3364-9ac9-86813c03c04b",
+                       "id": "413af268-aaa1-99de-0055-8cdb683151ce",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251125203,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089850503,
+                       "name": "IPv6: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        }\n    }\n}"
                },
                {
-                       "id": "3594b898-f00d-e65e-f26e-7ea4852ad6e3",
+                       "id": "465b5e60-e09b-fe90-ffaa-9d143cee6d7b",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250074035,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449089944773,
+                       "name": "IPv6: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n                \"ipv6-prefix\": \"2001:db8::1/128\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "3d96b180-55f1-0463-0c2f-17673b9c4b78",
+                       "id": "4c0672f2-a4e6-de73-34c7-54b5f24bb587",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + IPv4: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250523037,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 24,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091769861,
+                       "name": "Instance ID 1 + SrcDst: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "3dcb3826-9554-318a-2e61-814f36b4dceb",
+                       "id": "53f80bc3-76e4-7134-fd0d-68ba218a421c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250749735,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449091302115,
+                       "name": "SrcDst: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n                \"source-dest-key\": {\n                    \"source\": \"192.0.2.1/32\",\n                    \"dest\": \"192.0.2.2/32\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "3eea11ed-9325-5cd4-0393-d4b49e53f42e",
+                       "id": "5a95e386-807f-2f2a-e366-a6cdf8a522c9",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + IPv4: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250634944,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 24,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449090035044,
+                       "name": "MAC: Add key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "40cb8152-0f0f-b606-deb8-3523a45088fe",
+                       "id": "5dc4ea9a-03f7-7ead-bd6d-55afdf4fa584",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250772695,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090599384,
+                       "name": "DN: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        }\n    }\n}"
                },
                {
-                       "id": "42204829-49cf-64cc-2bf6-436f5fca7759",
+                       "id": "6079a324-0c02-e1be-f6f1-3fa88e20e343",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249989186,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089828604,
+                       "name": "IPv6: Add key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "4246d14c-c8e3-9d1e-ee28-706944a32ef7",
+                       "id": "6d5d8b54-f42e-a618-317d-9f68fc4da2f0",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433265449366,
-                       "name": "IPv4: Add mapping with AFI list RLOC",
+                       "time": 1449089452097,
+                       "name": "IPv4: Get mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"List\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"LcafListAddr\": {\n                        \"afi\": 16387,\n                        \"lcafType\": 1,\n                        \"Addresses\": [\n                            {\n                                \"name\": \"IPv4\",\n                                \"Ipv4Address\": {\n                                    \"afi\": 1,\n                                    \"Ipv4Address\": \"10.10.10.10\"\n                                }\n                            },\n                            {\n                                \"name\": \"IPv6\",\n                                \"Ipv6Address\": {\n                                    \"afi\": 2,\n                                    \"Ipv6Address\": \"2001:db8::1\"\n                                }\n                            }\n                        ]\n                    }\n                }\n            }\n        ]\n    }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        }\n    }\n}"
                },
                {
-                       "id": "444b0b02-59a6-ec5b-89c3-c4d097465a39",
+                       "id": "7427c04b-422e-38ab-2daf-8ac9a4ef5ee0",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + IPv4: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250186232,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449090092362,
+                       "name": "MAC: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        }\n    }\n}"
                },
                {
-                       "id": "46a2e984-8226-9092-2e8a-e3128a893b56",
+                       "id": "7f8554c6-b429-b6f0-6cb0-05f464bf85b5",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "MAC: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249493799,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449091434291,
+                       "name": "Key/Value: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "47d8f781-b331-a925-fd32-a604b36080ec",
+                       "id": "833e8747-ae9d-1aad-f460-489677af5b2a",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433193586216,
-                       "name": "IPv6: Remove mapping",
+                       "time": 1449090869848,
+                       "name": "ASN: Update key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "502b71a6-4f62-0760-8117-c3e907a18314",
+                       "id": "86749fa6-2251-10ba-155d-a09063c088ac",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251158360,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091020293,
+                       "name": "SrcDst: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "51937e10-a151-997c-07a9-aad87aeb41fa",
+                       "id": "882dd896-39ea-1a22-968b-b8ea99f69e93",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433193602586,
-                       "name": "IPv6: Update mapping",
+                       "time": 1449089955984,
+                       "name": "IPv4: Update mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 128,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "56938ae7-f113-ee60-ef92-1e5028494db5",
+                       "id": "884f4cef-8e32-daa6-7e72-bd23f9d33eb2",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249964548,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"AS\": {\n                    \"afi\": 18,\n                    \"AS\": 64500\n                }\n            },\n            \"mask-length\": 0\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449091719099,
+                       "name": "Instance ID 1 + SrcDst: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "5f3161ec-b598-b240-4975-bf50289562a8",
+                       "id": "90e4d20f-844e-674e-dbea-96f7a4a23324",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv4: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1429884370433,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32\n   }\n}"
+                       "time": 1449089370194,
+                       "name": "IPv4: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "632e6a4a-0315-2e44-7a11-2608a905089c",
+                       "id": "93864328-f3c6-f58d-53a6-98e2941f4961",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + Ipv4: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250486398,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24\n   }\n}"
+                       "time": 1449091455590,
+                       "name": "Key/Value: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n                \"key-value-address\": {\n                    \"key\": \"192.0.2.1\",\n                    \"value\": \"192.0.2.2\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "64a01be8-895f-087f-865d-2c4cf59f1081",
+                       "id": "943b08c8-9eb8-857a-e216-4e2cdd1b791b",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249708200,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449091419525,
+                       "name": "Key/Value: Add key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "67204f8c-9287-f5e4-2847-fc2854441297",
+                       "id": "9520e318-4d56-fd6e-0e8a-41055226c237",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251241420,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090680070,
+                       "name": "DN: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "68f0ddb6-2512-16bb-f08d-f0d64221b270",
+                       "id": "96458914-87ef-e868-7215-02f6a917f2b2",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433193369708,
-                       "name": "IPv6: Add mapping",
+                       "time": 1449091725728,
+                       "name": "Instance ID 1 + SrcDst: Add key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 128,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "6b2d8b03-aac6-ab52-3837-60c43baf99d1",
+                       "id": "99eb680b-e112-be5b-eb05-8e8495609675",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433252219050,
-                       "name": "IPv4: Add mapping with ELP RLOC",
+                       "time": 1449091748973,
+                       "name": "Instance ID 1 + SrcDst: Add mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"IPv4\",\n                \"priority\": 2,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            },\n            {\n                \"name\": \"ELP\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"LcafTrafficEngineeringAddr\": {\n                        \"afi\": 16387,\n                        \"lcafType\": 10,\n                        \"Hops\": [\n                            {\n                                \"name\": \"Hop 1\",\n                                \"lookup\": false,\n                                \"RLOCProbe\": false,\n                                \"strict\": true,\n                                \"hop\": { \n                                    \"Ipv4Address\": {\n                                        \"afi\": 1,\n                                        \"Ipv4Address\": \"20.20.20.20\"\n                                    }\n                                }\n                            },\n                            {\n                                \"name\": \"Hop 2\",\n                                \"lookup\": false,\n                                \"RLOCProbe\": false,\n                                \"strict\": true,\n                                \"hop\": { \n                                    \"Ipv4Address\": {\n                                        \"afi\": 1,\n                                        \"Ipv4Address\": \"30.30.30.30\"\n                                    }\n                                }\n                            }\n                        ]\n                    }\n                }\n            }\n        ]\n    }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"virtual-network-id\": 1,\n                \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n                \"source-dest-key\": {\n                    \"source\": \"192.0.2.1/32\",\n                    \"dest\": \"192.0.2.2/32\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "70b64110-73e2-a902-4abd-f9b5de550b38",
+                       "id": "a29c9b1c-7ac4-82e4-b7be-0ba697e1cbe2",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv4: Add mapping with Application Data RLOC",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433265077370,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"AppData\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"LcafApplicationDataAddr\": {\n                        \"afi\": 16387,\n                        \"lcafType\": 4,\n                        \"protocol\": 17,\n                        \"ipTos\": 128,\n                        \"localPortLow\": 80,\n                        \"localPortHigh\": 81,\n                        \"remotePortLow\": 6667,\n                        \"remotePortHigh\": 7000,\n                        \"Address\": {\n                            \"Ipv4Address\": {\n                                \"afi\": 1,\n                                \"Ipv4Address\": \"10.10.10.10\"\n                            }\n                        }\n                    }\n                }\n            }\n        ]\n    }\n}"
+                       "time": 1449090727839,
+                       "name": "DN: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n                \"distinguished-name\": \"stringAsIs\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "79e37882-7564-ea1f-339d-5bdf8205556c",
+                       "id": "a39d6fd7-0565-0e2b-d9f6-ef9905b4ed43",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433193080459,
-                       "name": "IPv6: Add key",
+                       "time": 1449090819958,
+                       "name": "ASN: Get mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        }\n    }\n}"
                },
                {
-                       "id": "7e8fbbcb-560b-2e64-5ea4-8f3bc763e5f1",
+                       "id": "a4ccc6d0-7ab6-b4e6-c096-f638510b1877",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433249443304,
-                       "name": "MAC: Remove key",
+                       "time": 1449089288903,
+                       "name": "IPv4: Add key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"MacAddress\": {\n                \"afi\": 16389,\n                \"MacAddress\": \"00:11:22:33:44:55\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "7f8f23fe-0e3c-8faf-9b1c-758fc81e513b",
+                       "id": "a86e9495-c45c-b068-72b5-f84e25121e0c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250986547,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090044749,
+                       "name": "MAC: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        }\n    }\n}"
                },
                {
-                       "id": "80af36e1-3e15-7a1f-0466-e96d1c0b4ef2",
+                       "id": "ad076971-6428-1632-510a-9467048dab6a",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249866648,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090139598,
+                       "name": "MAC: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n                \"mac\": \"00:11:22:33:44:55\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "8474d55a-6d1c-c4ba-81f0-ab3ff2d1aaea",
+                       "id": "ae0f2116-6b57-f27c-36cf-69a865443849",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + IPv4: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250282049,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"LcafSegmentAddr\": {\n                    \"afi\": 16387,\n                    \"lcafType\": 2,\n                    \"instanceId\": 1,\n                    \"iidMaskLength\": 32,\n                    \"Address\": {\n                        \"Ipv4Address\": {\n                            \"Ipv4Address\": \"192.0.2.0\",\n                            \"afi\": 1\n                        }\n                    }\n                }\n            },\n            \"mask-length\": 24\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449091058763,
+                       "name": "SrcDst: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "85b24eac-fab0-ed44-d02f-8f78aed6cb6c",
+                       "id": "af9bd94b-1089-cca6-57e0-3a8dcec339e5",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1429880290410,
-                       "name": "IPv4: Remove key",
+                       "time": 1449089331816,
+                       "name": "IPv4: Get key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        }\n    }\n}"
                },
                {
-                       "id": "89420a7b-489d-2458-c1ca-8acb5a8ac97b",
+                       "id": "b1caa88d-2b7f-98f1-a985-5f39af216060",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1429880231344,
-                       "name": "IPv4: Add key",
+                       "time": 1449091391366,
+                       "name": "Key/Value: Get mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "92d71ba6-6dba-0987-2032-841b2e75189e",
+                       "id": "b74880dd-ff62-ab8f-17b4-968bb83f8e7c",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Remove mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250094492,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090938878,
+                       "name": "ASN: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        }\n    }\n}"
                },
                {
-                       "id": "9c0594ac-14d4-13ff-574d-9696d0788cfd",
+                       "id": "b894d0d2-5903-4abd-e3b3-dd797ea2f28a",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251219054,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091376843,
+                       "name": "KeyValue: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "a1adf8b9-a1f8-acfd-af45-5d3dee6ea0ea",
+                       "id": "bd9d8594-11c2-d21c-f4ea-7259bb9f37c7",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433250706261,
-                       "name": "Instance ID 1 + IPv4: Remove mapping",
+                       "time": 1449091384738,
+                       "name": "Key/Value: Remove key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:key-value-address-lcaf\",\n            \"key-value-address\": {\n                \"key\": \"192.0.2.1\",\n                \"value\": \"192.0.2.2\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "a1d77c69-57a4-a2b2-ac98-e612f73782ed",
+                       "id": "c3187793-c8d6-f0d9-0a7e-386769255b6a",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249817189,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089859061,
+                       "name": "IPv6: Get mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        }\n    }\n}"
                },
                {
-                       "id": "a3b76da1-4e38-0a39-1003-b61a5f937543",
+                       "id": "c8f98a12-7706-ee90-029e-9586e44c09ca",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250814919,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"LcafSourceDestAddr\": {\n                    \"afi\": 16387,\n                    \"lcafType\": 12,\n                    \"srcAddress\": {\n                        \"Ipv4Address\": {\n                            \"Ipv4Address\": \"192.0.2.1\",\n                            \"afi\": 1\n                        }\n                    },\n                    \"srcMaskLength\": 32,\n                    \"dstAddress\": {\n                        \"Ipv4Address\": {\n                            \"Ipv4Address\": \"192.0.2.2\",\n                            \"afi\": 1\n                        }\n                    },\n                    \"dstMaskLength\": 32\n                }\n            },\n            \"mask-length\": 0\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449090806893,
+                       "name": "ASN: Get key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        }\n    }\n}"
                },
                {
-                       "id": "aae3ada0-89c3-b38e-20ea-51f26b0ad0d7",
+                       "id": "ca5c4063-f436-c4ea-dbbb-c2867607d686",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250875176,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449090923593,
+                       "name": "ASN: Update mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n                \"as-number\": 64500\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"20.20.20.20\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "add50eac-85bb-9c63-6954-651ec3def935",
+                       "id": "cd5e1bc8-d870-a7c4-e9c3-f1f11bdda986",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1429880245092,
-                       "name": "IPv4: Get key",
+                       "time": 1449090613835,
+                       "name": "DN: Remove mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        }\n    }\n}"
                },
                {
-                       "id": "b0447c46-ba92-38ec-30bc-6871d3f6746f",
+                       "id": "d3c2336d-2118-d676-73ce-51843e947205",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Key/Value: Add key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433251027737,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafKeyValueAddressAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 15,\n                \"key\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"value\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 0,\n        \"key-type\": 1,\n        \"authkey\": \"password\"\n   }\n}"
+                       "time": 1449090657160,
+                       "name": "DN: Add key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "b635f4f5-7166-e138-3542-2c5285e3a5bb",
+                       "id": "d5d0c5d2-a70e-d270-3a15-eceb1ef44606",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249942757,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449091714971,
+                       "name": "Instance ID 1 + SrcDst: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "b83a0563-9539-b5f9-700b-58ca819f44bf",
+                       "id": "d81deacc-e71c-36a0-7855-018d59b1f07b",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "SrcDst: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250839742,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSourceDestAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 12,\n                \"srcAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.1\",\n                        \"afi\": 1\n                    }\n                },\n                \"srcMaskLength\": 32,\n                \"dstAddress\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.2\",\n                        \"afi\": 1\n                    }\n                },\n                \"dstMaskLength\": 32\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449090126020,
+                       "name": "MAC: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n                \"mac\": \"00:11:22:33:44:55\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "b91b03a2-0e89-b5de-dd63-64925fa40c23",
+                       "id": "d96e9bc7-9553-0685-543b-5525cb124528",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1433250225080,
-                       "name": "Instance ID 1 + IPv4: Get key",
+                       "time": 1449089841299,
+                       "name": "IPv6: Get key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        }\n    }\n}"
                },
                {
-                       "id": "bce9e800-e3f8-0463-3342-13911c68aa12",
+                       "id": "dd5997d7-4547-5848-b1ff-4ddb87120b27",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "Instance ID 1 + IPv4: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250548311,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"LcafSegmentAddr\": {\n                \"afi\": 16387,\n                \"lcafType\": 2,\n                \"instanceId\": 1,\n                \"iidMaskLength\": 32,\n                \"Address\": {\n                    \"Ipv4Address\": {\n                        \"Ipv4Address\": \"192.0.2.0\",\n                        \"afi\": 1\n                    }\n                }\n            }\n        },\n        \"mask-length\": 24\n   }\n}"
+                       "time": 1449089886058,
+                       "name": "IPv6: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "c0b3e7b2-6f7f-e250-3d0c-c16b6ec5abdc",
+                       "id": "df0ebf0a-0fa9-252d-4ba5-a920808f85f9",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv4: Update mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1429893230387,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"20.20.20.20\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449090603802,
+                       "name": "DN: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:distinguished-name-afi\",\n            \"distinguished-name\": \"stringAsIs\"\n        }\n    }\n}"
                },
                {
-                       "id": "cc62bee8-afea-c711-5fb3-47ae7b188808",
+                       "id": "df12eb9f-f5b0-f272-9c93-bbdd5209e98d",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:remove-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Remove key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249772642,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"mask-length\": 0\n   }\n}"
+                       "time": 1449089907872,
+                       "name": "IPv6: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n                \"ipv6-prefix\": \"2001:db8::1/128\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "ce882c5e-fd36-9d68-5859-778cbe763b97",
+                       "id": "e137e0e1-64a3-0de8-8560-931388dbd890",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1429883930418,
-                       "name": "IPv4: Update key",
+                       "time": 1449091040381,
+                       "name": "SrcDst: Add key",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"Ipv4Address\": {\n                    \"afi\": 1,\n                    \"Ipv4Address\": \"192.0.2.1\"\n                }\n            },\n            \"mask-length\": 32\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "d48a19c6-718d-5fad-8993-697c6121df33",
+                       "id": "e7fccbb4-ff2a-5816-23a7-13fe14f377ea",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249742068,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"distinguishedName\": {\n                    \"afi\": 17,\n                    \"distinguishedName\": \"stringAsIs\"\n                }\n            },\n            \"mask-length\": 0\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449090849284,
+                       "name": "ASN: Add key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:as-number-afi\",\n            \"as-number\": 64500\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "d8d8826f-a15a-148e-d568-28575a185169",
+                       "id": "e8898db1-8807-83fd-0a22-caecbc317ae1",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:update-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:update-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv6: Update key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433193211838,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"LispAddressContainer\": {\n                \"Ipv6Address\": {\n                    \"afi\": 2,\n                    \"Ipv6Address\": \"2001:db8::1\"\n                }\n            },\n            \"mask-length\": 128\n        },\n        \"key\": {\n            \"key-type\": 1,\n            \"authkey\": \"updated-password\"\n        }\n   }\n}"
+                       "time": 1449090071768,
+                       "name": "MAC: Update key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:mac-afi\",\n            \"mac\": \"00:11:22:33:44:55\"\n        },\n        \"mapping-authkey\": {\n            \"key-string\": \"updated-password\",\n            \"key-type\": 1\n        }\n    }\n}"
                },
                {
-                       "id": "dbf9d7c8-a474-9d35-3804-54f861f9465e",
+                       "id": "eea5ec39-5825-3ee3-2fca-d619e1e35c70",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-key",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "ASN: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433250010595,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"AS\": {\n                \"afi\": 18,\n                \"AS\": 64500\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449091734285,
+                       "name": "Instance ID 1 + SrcDst: Remove key",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                },
                {
-                       "id": "e27b1f5d-2645-5847-6309-1c27de01b22c",
+                       "id": "ef07c01a-e8ee-5f1d-0c8b-7fe595d9dc6d",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-key",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv6: Get key",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433193156720,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128\n   }\n}"
+                       "time": 1449089491595,
+                       "name": "IPv4: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n            \"ipv4-prefix\": \"192.0.2.1/32\"\n        }\n    }\n}"
                },
                {
-                       "id": "e652707b-3637-7494-9e82-c7ee27df52d3",
+                       "id": "ef5fdf9f-d22c-946d-cea8-e505ff00d101",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
                        "pathVariables": {},
                        "method": "POST",
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "time": 1429880256202,
+                       "time": 1449089436090,
                        "name": "IPv4: Add mapping",
                        "description": "",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
                        "responses": [],
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 32,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:ipv4-prefix-afi\",\n                \"ipv4-prefix\": \"192.0.2.1/32\"\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "f81029ff-09d1-695c-703b-785657d4d633",
+                       "id": "f20c842c-157f-1aef-f29c-ee7056de48fd",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:add-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv4: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1429880732987,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv4Address\": {\n                \"afi\": 1,\n                \"Ipv4Address\": \"192.0.2.1\"\n            }\n        },\n        \"mask-length\": 32\n   }\n}"
+                       "time": 1449091254540,
+                       "name": "SrcDst: Add mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"mapping-record\": {\n            \"recordTtl\": 1440,\n            \"action\": \"NoAction\",\n            \"authoritative\": true,\n            \"eid\": {\n                \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n                \"source-dest-key\": {\n                    \"source\": \"192.0.2.1/32\",\n                    \"dest\": \"192.0.2.2/32\"\n                }\n            },\n            \"LocatorRecord\": [\n                {\n                    \"locator-id\": \"ISP1\",\n                    \"priority\": 1,\n                    \"weight\": 1,\n                    \"multicastPriority\": 255,\n                    \"multicastWeight\": 0,\n                    \"localLocator\": true,\n                    \"rlocProbed\": false,\n                    \"routed\": false,\n                    \"rloc\": {\n                        \"address-type\": \"ietf-lisp-address-types:ipv4-afi\",\n                        \"ipv4\": \"10.10.10.10\"\n                    }\n                }\n            ]\n        }\n    }\n}"
                },
                {
-                       "id": "fb94962b-8db0-2af0-3a1b-656a9f88d856",
+                       "id": "fec3d7db-e830-2002-8cbd-3004e0701d55",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:add-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:remove-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "DN: Add mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433249800543,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"recordTtl\": 1440,\n        \"maskLength\": 0,\n        \"authoritative\": true,\n        \"LispAddressContainer\": {\n            \"distinguishedName\": {\n                \"afi\": 17,\n                \"distinguishedName\": \"stringAsIs\"\n            }\n        },\n        \"LocatorRecord\": [\n            {\n                \"name\": \"ISP1\",\n                \"priority\": 1,\n                \"weight\": 1,\n                \"multicastPriority\": 255,\n                \"multicastWeight\": 0,\n                \"localLocator\": true,\n                \"rlocProbed\": false,\n                \"routed\": false,\n                \"LispAddressContainer\": {\n                    \"Ipv4Address\": {\n                        \"afi\": 1,\n                        \"Ipv4Address\": \"10.10.10.10\"\n                    }\n                }\n            }\n            ]\n    }\n}"
+                       "time": 1449089866688,
+                       "name": "IPv6: Remove mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"address-type\": \"ietf-lisp-address-types:ipv6-prefix-afi\",\n            \"ipv6-prefix\": \"2001:db8::1/128\"\n        }\n    }\n}"
                },
                {
-                       "id": "fcdced1b-892a-ad47-043e-f650b78add0f",
+                       "id": "ff278d02-690e-1ecf-f3d9-25b781b81770",
                        "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n",
-                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/mappingservice:get-mapping",
-                       "pathVariables": {},
+                       "url": "http://{{controllerHost}}:{{restconfPort}}/restconf/operations/odl-mappingservice:get-mapping",
                        "preRequestScript": "",
+                       "pathVariables": {},
                        "method": "POST",
-                       "collectionId": "b15dde10-fbab-2291-c58b-ed3c8e201304",
                        "data": [],
                        "dataMode": "raw",
-                       "name": "IPv6: Get mapping",
-                       "description": "",
-                       "descriptionFormat": "html",
-                       "time": 1433193423286,
                        "version": 2,
-                       "responses": [],
                        "tests": "",
                        "currentHelper": "normal",
                        "helperAttributes": {},
-                       "collectionOwner": 0,
-                       "synced": false,
-                       "rawModeData": "{\n    \"input\": {\n        \"LispAddressContainer\": {\n            \"Ipv6Address\": {\n                \"afi\": 2,\n                \"Ipv6Address\": \"2001:db8::1\"\n            }\n        },\n        \"mask-length\": 128\n   }\n}"
+                       "time": 1449091762828,
+                       "name": "Instance ID 1 + SrcDst: Get mapping",
+                       "description": "",
+                       "collectionId": "4968197b-a90c-f22a-b88d-1d353d8cc231",
+                       "responses": [],
+                       "rawModeData": "{\n    \"input\": {\n        \"eid\": {\n            \"virtual-network-id\": 1,\n            \"address-type\": \"ietf-lisp-address-types:source-dest-key-lcaf\",\n            \"source-dest-key\": {\n                \"source\": \"192.0.2.1/32\",\n                \"dest\": \"192.0.2.2/32\"\n            }\n        }\n    }\n}"
                }
        ]
-}
+}
\ No newline at end of file