summaryrefslogtreecommitdiffstats
path: root/tests/data_plane/configs
diff options
context:
space:
mode:
Diffstat (limited to 'tests/data_plane/configs')
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/4o4/elp1.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/4o4/elp2.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/4o6/elp1.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/4o6/elp2.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json2
-rw-r--r--tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json2
-rw-r--r--tests/data_plane/configs/odl/sd/4o4/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/4o4/map2.json33
-rw-r--r--tests/data_plane/configs/odl/sd/4o4/map3.json29
-rw-r--r--tests/data_plane/configs/odl/sd/4o4/map4.json29
-rw-r--r--tests/data_plane/configs/odl/sd/6o6/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/6o6/map2.json33
-rw-r--r--tests/data_plane/configs/odl/sd/6o6/map3.json29
-rw-r--r--tests/data_plane/configs/odl/sd/6o6/map4.json29
-rw-r--r--tests/data_plane/configs/odl/sd/l2o4/map1.json33
-rw-r--r--tests/data_plane/configs/odl/sd/l2o4/map2.json34
-rw-r--r--tests/data_plane/configs/odl/sd/l2o4/map3.json30
-rw-r--r--tests/data_plane/configs/odl/sd/l2o4/map4.json30
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/4o4/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/4o4/map2.json30
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/4o4/replace1.json16
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/4o4/replace2.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/6o4/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/6o4/map2.json30
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/6o4/replace1.json16
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite/6o4/replace2.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map2.json30
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace1.json16
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace2.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map1.json32
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map2.json30
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace1.json16
-rw-r--r--tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace2.json32
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config4
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config4
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config4
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config4
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp1.config10
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp2.config7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp3.config7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp1.config10
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp2.config7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp3.config7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp1.config16
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp2.config9
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp3.config9
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp2.config7
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp1.config8
-rw-r--r--tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp2.config7
61 files changed, 973 insertions, 48 deletions
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp1.json b/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp1.json
index a6275ca..2823cfc 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp1.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp1.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
- "ipv4-prefix": "6.0.2.0/24"
+ "ipv4-prefix": "6.0.1.0/24"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp2.json b/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp2.json
index d63f6b6..0c1a842 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp2.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/4o4/elp2.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
- "ipv4-prefix": "6.0.4.0/24"
+ "ipv4-prefix": "6.0.2.0/24"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp1.json b/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp1.json
index 211dce4..0f920a9 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp1.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp1.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
- "ipv4-prefix": "6.0.2.0/24"
+ "ipv4-prefix": "6.0.1.0/24"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp2.json b/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp2.json
index 94268e9..dbc408f 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp2.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/4o6/elp2.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
- "ipv4-prefix": "6.0.4.0/24"
+ "ipv4-prefix": "6.0.2.0/24"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json
index 3928aa7..e52094a 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
- "ipv6-prefix": "6:0:2::0/64"
+ "ipv6-prefix": "6:0:1::0/64"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json
index 0a0b213..f525c2f 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
- "ipv6-prefix": "6:0:4::0/64"
+ "ipv6-prefix": "6:0:2::0/64"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json
index 4c10f0e..d7c5b69 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
- "ipv6-prefix": "6:0:2::0/64"
+ "ipv6-prefix": "6:0:1::0/64"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json
index dc83b42..6945c6a 100644
--- a/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json
@@ -6,7 +6,7 @@
"authoritative": true,
"eid": {
"address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
- "ipv6-prefix": "6:0:4::0/64"
+ "ipv6-prefix": "6:0:2::0/64"
},
"LocatorRecord": [
{
diff --git a/tests/data_plane/configs/odl/sd/4o4/map1.json b/tests/data_plane/configs/odl/sd/4o4/map1.json
new file mode 100644
index 0000000..b11bf47
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/4o4/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.1.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/4o4/map2.json b/tests/data_plane/configs/odl/sd/4o4/map2.json
new file mode 100644
index 0000000..fcdae72
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/4o4/map2.json
@@ -0,0 +1,33 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.5.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.3"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/4o4/map3.json b/tests/data_plane/configs/odl/sd/4o4/map3.json
new file mode 100644
index 0000000..7544187
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/4o4/map3.json
@@ -0,0 +1,29 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+ "ipv4-prefix": "6.0.1.0/24"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/4o4/map4.json b/tests/data_plane/configs/odl/sd/4o4/map4.json
new file mode 100644
index 0000000..4492f65
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/4o4/map4.json
@@ -0,0 +1,29 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+ "ipv4-prefix": "6.0.5.0/24"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/6o6/map1.json b/tests/data_plane/configs/odl/sd/6o6/map1.json
new file mode 100644
index 0000000..0a29dd3
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/6o6/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv6-afi",
+ "ipv6": "6:0:3::2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/6o6/map2.json b/tests/data_plane/configs/odl/sd/6o6/map2.json
new file mode 100644
index 0000000..3794a36
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/6o6/map2.json
@@ -0,0 +1,33 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:5::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv6-afi",
+ "ipv6": "6:0:3::3"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/6o6/map3.json b/tests/data_plane/configs/odl/sd/6o6/map3.json
new file mode 100644
index 0000000..3af329b
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/6o6/map3.json
@@ -0,0 +1,29 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+ "ipv6-prefix": "6:0:1::0/64"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv6-afi",
+ "ipv6": "6:0:3::1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/6o6/map4.json b/tests/data_plane/configs/odl/sd/6o6/map4.json
new file mode 100644
index 0000000..7f3bbc9
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/6o6/map4.json
@@ -0,0 +1,29 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+ "ipv6-prefix": "6:0:5::0/64"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv6-afi",
+ "ipv6": "6:0:3::1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/l2o4/map1.json b/tests/data_plane/configs/odl/sd/l2o4/map1.json
new file mode 100644
index 0000000..05fc102
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/l2o4/map1.json
@@ -0,0 +1,33 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "virtual-network-id": 10,
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "08:55:55:55:55:55",
+ "dest": "08:22:22:22:22:22"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/l2o4/map2.json b/tests/data_plane/configs/odl/sd/l2o4/map2.json
new file mode 100644
index 0000000..eb3c27e
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/l2o4/map2.json
@@ -0,0 +1,34 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "virtual-network-id": 20,
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "08:11:11:11:11:11",
+ "dest": "08:22:22:22:22:22"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.3"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/l2o4/map3.json b/tests/data_plane/configs/odl/sd/l2o4/map3.json
new file mode 100644
index 0000000..3daeaa6
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/l2o4/map3.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "virtual-network-id": 20,
+ "address-type": "ietf-lisp-address-types:mac-afi",
+ "mac": "08:11:11:11:11:11"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/l2o4/map4.json b/tests/data_plane/configs/odl/sd/l2o4/map4.json
new file mode 100644
index 0000000..2219bf6
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/l2o4/map4.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "virtual-network-id": 10,
+ "address-type": "ietf-lisp-address-types:mac-afi",
+ "mac": "08:55:55:55:55:55"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/4o4/map1.json b/tests/data_plane/configs/odl/sd/overwrite/4o4/map1.json
new file mode 100644
index 0000000..b11bf47
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/4o4/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.1.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/4o4/map2.json b/tests/data_plane/configs/odl/sd/overwrite/4o4/map2.json
new file mode 100644
index 0000000..77e9891
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/4o4/map2.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+ "ipv4-prefix": "6.0.1.0/24"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/overwrite/4o4/replace1.json b/tests/data_plane/configs/odl/sd/overwrite/4o4/replace1.json
new file mode 100644
index 0000000..2671d11
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/4o4/replace1.json
@@ -0,0 +1,16 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.1.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ }
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/4o4/replace2.json b/tests/data_plane/configs/odl/sd/overwrite/4o4/replace2.json
new file mode 100644
index 0000000..b11bf47
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/4o4/replace2.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.1.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/6o4/map1.json b/tests/data_plane/configs/odl/sd/overwrite/6o4/map1.json
new file mode 100644
index 0000000..d89db51
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/6o4/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/6o4/map2.json b/tests/data_plane/configs/odl/sd/overwrite/6o4/map2.json
new file mode 100644
index 0000000..379a183
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/6o4/map2.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+ "ipv6-prefix": "6:0:1::0/64"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/overwrite/6o4/replace1.json b/tests/data_plane/configs/odl/sd/overwrite/6o4/replace1.json
new file mode 100644
index 0000000..d039ce3
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/6o4/replace1.json
@@ -0,0 +1,16 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ }
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite/6o4/replace2.json b/tests/data_plane/configs/odl/sd/overwrite/6o4/replace2.json
new file mode 100644
index 0000000..a2d92bc
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite/6o4/replace2.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map1.json b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map1.json
new file mode 100644
index 0000000..b11bf47
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.1.0/24",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map2.json b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map2.json
new file mode 100644
index 0000000..77e9891
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/map2.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+ "ipv4-prefix": "6.0.1.0/24"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace1.json b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace1.json
new file mode 100644
index 0000000..7b2d931
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace1.json
@@ -0,0 +1,16 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.0.0/16",
+ "dest": "6.0.2.0/24"
+ }
+ }
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace2.json b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace2.json
new file mode 100644
index 0000000..4662671
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/4o4/replace2.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6.0.0.0/8",
+ "dest": "6.0.2.0/24"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map1.json b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map1.json
new file mode 100644
index 0000000..d89db51
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map1.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map2.json b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map2.json
new file mode 100644
index 0000000..379a183
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/map2.json
@@ -0,0 +1,30 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+ "ipv6-prefix": "6:0:1::0/64"
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": true,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.1"
+ }
+ }
+ ]
+ }
+ }
+}
+
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace1.json b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace1.json
new file mode 100644
index 0000000..d039ce3
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace1.json
@@ -0,0 +1,16 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ }
+ }
+ }
+}
diff --git a/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace2.json b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace2.json
new file mode 100644
index 0000000..a2d92bc
--- /dev/null
+++ b/tests/data_plane/configs/odl/sd/overwrite_superset/6o4/replace2.json
@@ -0,0 +1,32 @@
+{
+ "input": {
+ "mapping-record": {
+ "recordTtl": 1440,
+ "action": "NoAction",
+ "authoritative": true,
+ "eid": {
+ "address-type": "ietf-lisp-address-types:source-dest-key-lcaf",
+ "source-dest-key": {
+ "source": "6:0:1::0/64",
+ "dest": "6:0:2::0/64"
+ }
+ },
+ "LocatorRecord": [
+ {
+ "locator-id": "ISP1",
+ "priority": 1,
+ "weight": 1,
+ "multicastPriority": 255,
+ "multicastWeight": 0,
+ "localLocator": true,
+ "rlocProbed": false,
+ "routed": false,
+ "rloc": {
+ "address-type": "ietf-lisp-address-types:ipv4-afi",
+ "ipv4": "6.0.3.2"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config
index c7c062c..cf74251 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp1.config
@@ -1,7 +1,7 @@
-create_host_iface vpp1 6.0.2.1/24
-create_host_iface xtr_rtr1 6.0.3.1/24
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface xtr1 6.0.3.1/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
-lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config
index 7a086e4..8ab5453 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp2.config
@@ -1,7 +1,7 @@
-create_host_iface vpp2 6.0.4.1/24
-create_host_iface xtr_rtr3 6.0.3.2/24
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface xtr2 6.0.3.2/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
-lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config
index 62f823c..cf1c628 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o4/vpp3.config
@@ -1,7 +1,7 @@
-create_host_iface xtr_rtr2 6.0.3.3/24
+create_host_iface xtr3 6.0.3.3/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
lisp_pitr ls1
lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config
index 6d2871c..0de274e 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp1.config
@@ -1,7 +1,7 @@
-create_host_iface vpp1 6.0.2.1/24
-create_host_iface xtr_rtr1 6:0:3::1/64
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface xtr1 6:0:3::1/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
-lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config
index 3705d92..1522d9e 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp2.config
@@ -1,7 +1,7 @@
-create_host_iface vpp2 6.0.4.1/24
-create_host_iface xtr_rtr3 6:0:3::2/64
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface xtr2 6:0:3::2/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
-lisp_local_eid eid 6.0.4.0/24 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config
index 57401c7..07955f3 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/4o6/vpp3.config
@@ -1,7 +1,7 @@
-create_host_iface xtr_rtr2 6:0:3::3/64
+create_host_iface xtr3 6:0:3::3/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
lisp_pitr ls1
lisp_remote_mapping eid 6.0.0.0/16 action send-map-request
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
index 46a3c98..5e7f6c3 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
@@ -1,7 +1,7 @@
-create_host_iface vpp1 6:0:2::1/64
-create_host_iface xtr_rtr1 6.0.3.1/24
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface xtr1 6.0.3.1/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
-lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
index 240993a..426c4fc 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
@@ -1,7 +1,7 @@
-create_host_iface vpp2 6:0:4::1/64
-create_host_iface xtr_rtr3 6.0.3.2/24
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface xtr2 6.0.3.2/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
-lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config
index 48c6ecb..e771f16 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config
@@ -1,7 +1,7 @@
-create_host_iface xtr_rtr2 6.0.3.3/24
+create_host_iface xtr3 6.0.3.3/24
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
lisp_pitr ls1
lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config
index 450528e..6639c91 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config
@@ -1,7 +1,7 @@
-create_host_iface vpp1 6:0:2::1/64
-create_host_iface xtr_rtr1 6:0:3::1/64
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface xtr1 6:0:3::1/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr1 1 1
-lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config
index 5aa0973..b6f9fca 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config
@@ -1,7 +1,7 @@
-create_host_iface vpp2 6:0:4::1/64
-create_host_iface xtr_rtr3 6:0:3::2/64
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface xtr2 6:0:3::2/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 1
-lisp_local_eid eid 6:0:4::0/64 locator-set ls1
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config
index 89cbe7e..bebd27f 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp3.config
@@ -1,7 +1,7 @@
-create_host_iface xtr_rtr2 6:0:3::3/64
+create_host_iface xtr3 6:0:3::3/64
lisp_state enable
-lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 1
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
lisp_pitr ls1
lisp_remote_mapping eid 6:0:0::0/32 action send-map-request
lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp1.config
new file mode 100644
index 0000000..5279dfc
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp1.config
@@ -0,0 +1,10 @@
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface vpp3 6.0.5.1/24
+create_host_iface xtr1 6.0.3.1/24
+
+lisp_state enable
+lisp_map_request_mode src-dst
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_local_eid eid 6.0.5.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp2.config
new file mode 100644
index 0000000..8ab5453
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp2.config
@@ -0,0 +1,7 @@
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface xtr2 6.0.3.2/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp3.config b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp3.config
new file mode 100644
index 0000000..b9af7d5
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/4o4/vpp3.config
@@ -0,0 +1,7 @@
+create_host_iface vpp4 6.0.2.1/24
+create_host_iface xtr3 6.0.3.3/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp1.config
new file mode 100644
index 0000000..2c05e80
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp1.config
@@ -0,0 +1,10 @@
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface vpp3 6:0:5::1/64
+create_host_iface xtr1 6:0:3::1/64
+
+lisp_state enable
+lisp_map_request_mode src-dst
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_local_eid eid 6:0:5::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp2.config
new file mode 100644
index 0000000..b6f9fca
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp2.config
@@ -0,0 +1,7 @@
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface xtr2 6:0:3::2/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp3.config b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp3.config
new file mode 100644
index 0000000..249d859
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/6o6/vpp3.config
@@ -0,0 +1,7 @@
+create_host_iface vpp4 6:0:2::1/64
+create_host_iface xtr3 6:0:3::3/64
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp1.config
new file mode 100644
index 0000000..1fee115
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp1.config
@@ -0,0 +1,16 @@
+create_host_iface vpp5 6.0.10.11/24
+set_if_l2_bridge host-vpp5 20
+
+create_host_iface vpp8 6.0.10.15/24
+set_if_l2_bridge host-vpp8 10
+
+create_host_iface xtr1 6.0.3.1/24
+
+lisp_state enable
+lisp_map_request_mode src-dst
+lisp_locator_set_with_locator ls1 host-xtr1 1 1
+lisp_eid_map_bd 10 10
+lisp_eid_map_bd 20 20
+lisp_local_eid vni 10 eid 08:55:55:55:55:55 locator-set ls1
+lisp_local_eid vni 20 eid 08:11:11:11:11:11 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp2.config
new file mode 100644
index 0000000..71fb31e
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp2.config
@@ -0,0 +1,9 @@
+create_host_iface vpp7 6.0.10.12/24
+set_if_l2_bridge host-vpp7 10
+create_host_iface xtr2 6.0.3.2/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr2 1 1
+lisp_eid_map_bd 10 10
+lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp3.config b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp3.config
new file mode 100644
index 0000000..c542453
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/l2o4/vpp3.config
@@ -0,0 +1,9 @@
+create_host_iface vpp6 6.0.10.12/24
+set_if_l2_bridge host-vpp6 20
+create_host_iface xtr3 6.0.3.3/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr3 1 1
+lisp_eid_map_bd 20 20
+lisp_local_eid vni 20 eid 08:22:22:22:22:22 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp1.config
new file mode 100644
index 0000000..ee55b68
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp1.config
@@ -0,0 +1,8 @@
+create_host_iface vpp1 6.0.1.1/24
+create_host_iface intervpp1 6.0.3.1/24
+
+lisp_state enable
+lisp_map_request_mode src-dst
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6.0.1.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp2.config
new file mode 100644
index 0000000..c2edf63
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/4o4/vpp2.config
@@ -0,0 +1,7 @@
+create_host_iface vpp2 6.0.2.1/24
+create_host_iface intervpp2 6.0.3.2/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6.0.2.0/24 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp1.config
new file mode 100644
index 0000000..8362486
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp1.config
@@ -0,0 +1,8 @@
+create_host_iface vpp1 6:0:1::1/64
+create_host_iface intervpp1 6.0.3.1/24
+
+lisp_state enable
+lisp_map_request_mode src-dst
+lisp_locator_set_with_locator ls1 host-intervpp1 1 1
+lisp_local_eid eid 6:0:1::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp2.config
new file mode 100644
index 0000000..bb1d78d
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/sd/overwrite/6o4/vpp2.config
@@ -0,0 +1,7 @@
+create_host_iface vpp2 6:0:2::1/64
+create_host_iface intervpp2 6.0.3.2/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-intervpp2 1 1
+lisp_local_eid eid 6:0:2::0/64 locator-set ls1
+lisp_map_resolver 6.0.3.100