Add multihoming tests

Change-Id: Ifc6d1ea02bc72b13ecca9a7e1ede0cd873687daf
Signed-off-by: Florin Coras <fcoras@cisco.com>

18 files changed, 460 insertions, 4 deletions

diff --git a/tests/data_plane/configs/odl/multihoming/4o4/update_vpp2.json b/tests/data_plane/configs/odl/multihoming/4o4/update_vpp2.json
new file mode 100644
index 0000000..089516b
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/4o4/update_vpp2.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.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.20"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/4o4/vpp1.json b/tests/data_plane/configs/odl/multihoming/4o4/vpp1.json
new file mode 100644
index 0000000..4bd3b6e
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/4o4/vpp1.json
@@ -0,0 +1,43 @@
+{
+    "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"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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.4.1"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/4o4/vpp2.json b/tests/data_plane/configs/odl/multihoming/4o4/vpp2.json
new file mode 100644
index 0000000..097b264
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/4o4/vpp2.json
@@ -0,0 +1,43 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "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.2"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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.4.2"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/6o6/update_vpp2.json b/tests/data_plane/configs/odl/multihoming/6o6/update_vpp2.json
new file mode 100644
index 0000000..6cd17a8
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/6o6/update_vpp2.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: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::20"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/6o6/vpp1.json b/tests/data_plane/configs/odl/multihoming/6o6/vpp1.json
new file mode 100644
index 0000000..b47dd5f
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/6o6/vpp1.json
@@ -0,0 +1,43 @@
+{
+    "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"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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:4::1"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/6o6/vpp2.json b/tests/data_plane/configs/odl/multihoming/6o6/vpp2.json
new file mode 100644
index 0000000..9915e58
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/6o6/vpp2.json
@@ -0,0 +1,43 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "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::2"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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:4::2"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/l2o4/update_vpp2.json b/tests/data_plane/configs/odl/multihoming/l2o4/update_vpp2.json
new file mode 100644
index 0000000..c95ddbc
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/l2o4/update_vpp2.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: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.20"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/l2o4/vpp1.json b/tests/data_plane/configs/odl/multihoming/l2o4/vpp1.json
new file mode 100644
index 0000000..210b372
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/l2o4/vpp1.json
@@ -0,0 +1,44 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 10,
+                "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": false,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:ipv4-afi",
+                        "ipv4": "6.0.3.1"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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.4.1"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/multihoming/l2o4/vpp2.json b/tests/data_plane/configs/odl/multihoming/l2o4/vpp2.json
new file mode 100644
index 0000000..19e173c
--- /dev/null
+++ b/tests/data_plane/configs/odl/multihoming/l2o4/vpp2.json
@@ -0,0 +1,44 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 10,
+                "address-type": "ietf-lisp-address-types:mac-afi",
+                "mac": "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"
+                    }
+                },
+                {
+                    "locator-id": "ISP2",
+                    "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.4.2"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config
new file mode 100644
index 0000000..83d360b
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp1.config
@@ -0,0 +1,17 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6.0.1.1/24
+
+create host-interface name intervpp11
+set int state host-intervpp11 up
+set int ip address host-intervpp11 6.0.3.1/24
+
+create host-interface name intervpp21
+set int state host-intervpp21 up
+set int ip address host-intervpp21 6.0.4.1/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp eid-table add eid 6.0.1.0/24 locator-set ls1
+lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config
new file mode 100644
index 0000000..facd252
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/4o4/vpp2.config
@@ -0,0 +1,17 @@
+create host-interface name vpp2
+set int state host-vpp2 up
+set int ip address host-vpp2 6.0.2.1/24
+
+create host-interface name intervpp12
+set int state host-intervpp12 up
+set int ip address host-intervpp12 6.0.3.2/24
+
+create host-interface name intervpp22
+set int state host-intervpp22 up
+set int ip address host-intervpp22 6.0.4.2/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp eid-table add eid 6.0.2.0/24 locator-set ls1
+lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config
new file mode 100644
index 0000000..1db0fa6
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp1.config
@@ -0,0 +1,17 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6:0:1::1/64
+
+create host-interface name intervpp11
+set int state host-intervpp11 up
+set int ip address host-intervpp11 6:0:3::1/64
+
+create host-interface name intervpp21
+set int state host-intervpp21 up
+set int ip address host-intervpp21 6:0:4::1/64
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp eid-table add eid 6:0:1::0/64 locator-set ls1
+lisp map-resolver add 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config
new file mode 100644
index 0000000..1c3ae51
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/6o6/vpp2.config
@@ -0,0 +1,17 @@
+create host-interface name vpp2
+set int state host-vpp2 up
+set int ip address host-vpp2 6:0:2::1/64
+
+create host-interface name intervpp12
+set int state host-intervpp12 up
+set int ip address host-intervpp12 6:0:3::2/64
+
+create host-interface name intervpp22
+set int state host-intervpp22 up
+set int ip address host-intervpp22 6:0:4::2/64
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp eid-table add eid 6:0:2::0/64 locator-set ls1
+lisp map-resolver add 6:0:3::100
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config
new file mode 100644
index 0000000..0b7e28f
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config
@@ -0,0 +1,20 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6.0.1.1/24
+
+create host-interface name intervpp11
+set int state host-intervpp11 up
+set int ip address host-intervpp11 6.0.3.1/24
+
+create host-interface name intervpp21
+set int state host-intervpp21 up
+set int ip address host-intervpp21 6.0.4.1/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1
+lisp map-resolver add 6.0.3.100
+
+lisp eid-table map vni 10 bd 10
+set interface l2 bridge host-vpp1 10
+lisp eid-table add vni 10 eid 08:11:11:11:11:11 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config
new file mode 100644
index 0000000..ab51c13
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config
@@ -0,0 +1,20 @@
+create host-interface name vpp2
+set int state host-vpp2 up
+set int ip address host-vpp2 6.0.1.2/24
+
+create host-interface name intervpp12
+set int state host-intervpp12 up
+set int ip address host-intervpp12 6.0.3.2/24
+
+create host-interface name intervpp22
+set int state host-intervpp22 up
+set int ip address host-intervpp22 6.0.4.2/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1
+lisp map-resolver add 6.0.3.100
+
+lisp eid-table map vni 10 bd 10
+set interface l2 bridge host-vpp2 10
+lisp eid-table add vni 10 eid 08:22:22:22:22:22 locator-set ls1 
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config
index 02953d0..df53d93 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config
@@ -11,5 +11,5 @@ lisp enable
 lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
 lisp pitr ls ls1
 comment { lisp pitr disable }
-lisp remote-mapping deid 6:0:0::0/32 action send-map-request
+lisp remote-mapping eid 6:0:0::0/32 action send-map-request
 lisp map-resolver add 6.0.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config
index 24a5eb8..3e795f7 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config
@@ -14,5 +14,5 @@ lisp locator-set add ls1 iface host-rtr_vpp1 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
 lisp pitr ls ls1
 lisp eid-table map vni 100 vrf 100
 lisp eid-table map vni 200 vrf 200
-lisp remote-mapping vni 100 deid 6:0:0::0/32 action send-map-request
-lisp remote-mapping vni 200 deid 6:0:0::0/32 action send-map-request
+lisp remote-mapping vni 100 eid 6:0:0::0/32 action send-map-request
+lisp remote-mapping vni 200 eid 6:0:0::0/32 action send-map-request
diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config
index bb4bcb7..59259e4 100644
--- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config
+++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config
@@ -11,5 +11,5 @@ lisp enable
 lisp locator-set add ls1 iface host-rtr_wan4 p 1 w 1 iface host-rtr_vpp2 p 1 w 1
 lisp pitr ls ls1
 comment { lisp pitr disable }
-lisp remote-mapping deid 6:0:0::0/32 action send-map-request
+lisp remote-mapping eid 6:0:0::0/32 action send-map-request
 lisp map-resolver add 6.0.3.100