Merge "Tests for SMR + RTR with disjoint locators"

diff --git a/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer1.json b/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer1.json
new file mode 100644 (file)
index 0000000..9d92c8f
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "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.1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer2.json b/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer2.json
new file mode 100644 (file)
index 0000000..c185b2f
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o4/vpp1_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "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.1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer1.json b/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer1.json
new file mode 100644 (file)
index 0000000..743906f
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "6.0.4.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"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer2.json b/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer2.json
new file mode 100644 (file)
index 0000000..d9d139a
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o4/vpp2_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "6.0.4.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"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer1.json b/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer1.json
new file mode 100644 (file)
index 0000000..b444eaf
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "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:ipv6-afi",
+                        "ipv6": "6:0:3::1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer2.json b/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer2.json
new file mode 100644 (file)
index 0000000..e5aee5b
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o6/vpp1_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "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:ipv6-afi",
+                        "ipv6": "6:0:3::1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer1.json b/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer1.json
new file mode 100644 (file)
index 0000000..7cd8c5f
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "6.0.4.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:ipv6-afi",
+                        "ipv6": "6:0:3::2"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer2.json b/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer2.json
new file mode 100644 (file)
index 0000000..da16002
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/4o6/vpp2_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "6.0.4.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:ipv6-afi",
+                        "ipv6": "6:0:3::2"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer1.json b/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer1.json
new file mode 100644 (file)
index 0000000..ad188c8
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "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:ipv4-afi",
+                        "ipv4": "6.0.3.1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer2.json b/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer2.json
new file mode 100644 (file)
index 0000000..1f57b72
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o4/vpp1_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "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:ipv4-afi",
+                        "ipv4": "6.0.3.1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer1.json b/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer1.json
new file mode 100644 (file)
index 0000000..fb0949c
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::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.2"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer2.json b/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer2.json
new file mode 100644 (file)
index 0000000..fe16e0c
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o4/vpp2_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::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.2"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer1.json b/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer1.json
new file mode 100644 (file)
index 0000000..4363d64
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "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::1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer2.json b/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer2.json
new file mode 100644 (file)
index 0000000..4e0fb62
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o6/vpp1_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "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::1"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer1.json b/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer1.json
new file mode 100644 (file)
index 0000000..003d50e
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer1.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 100,
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::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"
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer2.json b/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer2.json
new file mode 100644 (file)
index 0000000..16e1459
--- /dev/null
+++ b/tests/data_plane/configs/odl/eid_virt/6o6/vpp2_customer2.json
@@ -0,0 +1,30 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "virtual-network-id": 200,
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::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"
+                    }
+                }
+            ]
+        }
+    }
+}

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
new file mode 100644 (file)
index 0000000..3928aa7
--- /dev/null
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp1.json
@@ -0,0 +1,42 @@
+{
+    "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": "ELP",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": false,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf",
+                        "explicit-locator-path": {
+                            "hop": [
+                                {
+                                    "hop-id": "Hop 1",
+                                    "address": "6.0.3.3",
+                                    "lrs-bits": "lookup rloc-probe strict"
+                                },
+                                {
+                                    "hop-id": "Hop 2",
+                                    "address": "6.0.3.1",
+                                    "lrs-bits": "lookup strict"
+                                }
+                            ]
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

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
new file mode 100644 (file)
index 0000000..0a0b213
--- /dev/null
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o4/elp2.json
@@ -0,0 +1,42 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::0/64"
+            },
+            "LocatorRecord": [
+                {
+                    "locator-id": "ELP",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": false,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf",
+                        "explicit-locator-path": {
+                            "hop": [
+                                {
+                                    "hop-id": "Hop 1",
+                                    "address": "6.0.3.3",
+                                    "lrs-bits": "lookup rloc-probe strict"
+                                },
+                                {
+                                    "hop-id": "Hop 2",
+                                    "address": "6.0.3.2",
+                                    "lrs-bits": "lookup strict"
+                                }
+                            ]
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

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
new file mode 100644 (file)
index 0000000..4c10f0e
--- /dev/null
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp1.json
@@ -0,0 +1,42 @@
+{
+    "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": "ELP",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": false,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf",
+                        "explicit-locator-path": {
+                            "hop": [
+                                {
+                                    "hop-id": "Hop 1",
+                                    "address": "6:0:3::3",
+                                    "lrs-bits": "lookup rloc-probe strict"
+                                },
+                                {
+                                    "hop-id": "Hop 2",
+                                    "address": "6:0:3::1",
+                                    "lrs-bits": "lookup strict"
+                                }
+                            ]
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

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
new file mode 100644 (file)
index 0000000..dc83b42
--- /dev/null
+++ b/tests/data_plane/configs/odl/rtr_single_iface/6o6/elp2.json
@@ -0,0 +1,42 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:4::0/64"
+            },
+            "LocatorRecord": [
+                {
+                    "locator-id": "ELP",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": false,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf",
+                        "explicit-locator-path": {
+                            "hop": [
+                                {
+                                    "hop-id": "Hop 1",
+                                    "address": "6:0:3::3",
+                                    "lrs-bits": "lookup rloc-probe strict"
+                                },
+                                {
+                                    "hop-id": "Hop 2",
+                                    "address": "6:0:3::2",
+                                    "lrs-bits": "lookup strict"
+                                }
+                            ]
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config
new file mode 100644 (file)
index 0000000..c40a9c1
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.config
@@ -0,0 +1,24 @@
+create host-interface name vpp1_cus1
+set int state host-vpp1_cus1 up
+set interface ip table host-vpp1_cus1 100
+set int ip address host-vpp1_cus1 6.0.2.1/24
+
+create host-interface name vpp1_cus2
+set int state host-vpp1_cus2 up
+set interface ip table host-vpp1_cus2 200
+set int ip address host-vpp1_cus2 6.0.2.1/24
+
+create host-interface name intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6.0.3.1/24
+
+lisp enable
+lisp map-resolver add 6.0.3.100
+
+lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6.0.2.0/24 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6.0.2.0/24 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config
new file mode 100644 (file)
index 0000000..8cc9e3a
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.config
@@ -0,0 +1,24 @@
+create host-interface name vpp2_cus1
+set int state host-vpp2_cus1 up
+set interface ip table host-vpp2_cus1 100
+set int ip address host-vpp2_cus1 6.0.4.1/24
+
+create host-interface name vpp2_cus2
+set int state host-vpp2_cus2 up
+set interface ip table host-vpp2_cus2 200
+set int ip address host-vpp2_cus2 6.0.4.1/24
+
+create host-interface name intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6.0.3.2/24
+
+lisp enable
+lisp map-resolver add 6.0.3.100
+
+lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6.0.4.0/24 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6.0.4.0/24 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config
new file mode 100644 (file)
index 0000000..bb7eb14
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp1.config
@@ -0,0 +1,24 @@
+create host-interface name vpp1_cus1
+set int state host-vpp1_cus1 up
+set interface ip table host-vpp1_cus1 100
+set int ip address host-vpp1_cus1 6.0.2.1/24
+
+create host-interface name vpp1_cus2
+set int state host-vpp1_cus2 up
+set interface ip table host-vpp1_cus2 200
+set int ip address host-vpp1_cus2 6.0.2.1/24
+
+create host-interface name intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6:0:3::1/64
+
+lisp enable
+lisp map-resolver add 6:0:3::100
+
+lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6.0.2.0/24 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6.0.2.0/24 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config
new file mode 100644 (file)
index 0000000..d16f315
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o6/vpp2.config
@@ -0,0 +1,24 @@
+create host-interface name vpp2_cus1
+set int state host-vpp2_cus1 up
+set interface ip table host-vpp2_cus1 100
+set int ip address host-vpp2_cus1 6.0.4.1/24
+
+create host-interface name vpp2_cus2
+set int state host-vpp2_cus2 up
+set interface ip table host-vpp2_cus2 200
+set int ip address host-vpp2_cus2 6.0.4.1/24
+
+create host-interface name intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6:0:3::2/64
+
+lisp enable
+lisp map-resolver add 6:0:3::100
+
+lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6.0.4.0/24 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6.0.4.0/24 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config
new file mode 100644 (file)
index 0000000..ca24e79
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp1.config
@@ -0,0 +1,24 @@
+create host-interface name vpp1_cus1
+set int state host-vpp1_cus1 up
+set interface ip6 table host-vpp1_cus1 100
+set int ip address host-vpp1_cus1 6:0:2::1/64
+
+create host-interface name vpp1_cus2
+set int state host-vpp1_cus2 up
+set interface ip6 table host-vpp1_cus2 200
+set int ip address host-vpp1_cus2 6:0:2::1/64
+
+create host-interface name intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6.0.3.1/24
+
+lisp enable
+lisp map-resolver add 6.0.3.100
+
+lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6:0:2::0/64 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6:0:2::0/64 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config
new file mode 100644 (file)
index 0000000..6e41a83
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o4/vpp2.config
@@ -0,0 +1,24 @@
+create host-interface name vpp2_cus1
+set int state host-vpp2_cus1 up
+set interface ip6 table host-vpp2_cus1 100
+set int ip address host-vpp2_cus1 6:0:4::1/64
+
+create host-interface name vpp2_cus2
+set int state host-vpp2_cus2 up
+set interface ip6 table host-vpp2_cus2 200
+set int ip address host-vpp2_cus2 6:0:4::1/64
+
+create host-interface name intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6.0.3.2/24
+
+lisp enable
+lisp map-resolver add 6.0.3.100
+
+lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6:0:4::0/64 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6:0:4::0/64 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config
new file mode 100644 (file)
index 0000000..4154dc2
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp1.config
@@ -0,0 +1,24 @@
+create host-interface name vpp1_cus1
+set int state host-vpp1_cus1 up
+set interface ip6 table host-vpp1_cus1 100
+set int ip address host-vpp1_cus1 6:0:2::1/64
+
+create host-interface name vpp1_cus2
+set int state host-vpp1_cus2 up
+set interface ip6 table host-vpp1_cus2 200
+set int ip address host-vpp1_cus2 6:0:2::1/64
+
+create host-interface name intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6:0:3::1/64
+
+lisp enable
+lisp map-resolver add 6:0:3::100
+
+lisp locator-set add ls1 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6:0:2::0/64 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp1 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6:0:2::0/64 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config
new file mode 100644 (file)
index 0000000..0e633c5
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/eid_virt/6o6/vpp2.config
@@ -0,0 +1,24 @@
+create host-interface name vpp2_cus1
+set int state host-vpp2_cus1 up
+set interface ip6 table host-vpp2_cus1 100
+set int ip address host-vpp2_cus1 6:0:4::1/64
+
+create host-interface name vpp2_cus2
+set int state host-vpp2_cus2 up
+set interface ip6 table host-vpp2_cus2 200
+set int ip address host-vpp2_cus2 6:0:4::1/64
+
+create host-interface name intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6:0:3::2/64
+
+lisp enable
+lisp map-resolver add 6:0:3::100
+
+lisp locator-set add ls1 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 100 vrf 100
+lisp eid-table add vni 100 eid 6:0:4::0/64 locator-set ls1
+
+lisp locator-set add ls2 iface host-intervpp2 p 1 w 1
+lisp eid-table map vni 200 vrf 200
+lisp eid-table add vni 200 eid 6:0:4::0/64 locator-set ls2

diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
new file mode 100644 (file)
index 0000000..3dcac84
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
@@ -0,0 +1,9 @@
+create host-interface name xtr_rtr2
+set int state host-xtr_rtr2 up
+set int ip address host-xtr_rtr2 6.0.3.3/24
+
+lisp enable
+lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
+lisp pitr ls ls1
+lisp remote-mapping deid 6:0:0::0/64 action send-map-request
+lisp map-resolver add 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
new file mode 100644 (file)
index 0000000..d689c7c
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
@@ -0,0 +1,13 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6:0:2::1/64
+
+create host-interface name xtr_rtr1
+set int state host-xtr_rtr1 up
+set int ip address host-xtr_rtr1 6.0.3.1/24
+
+lisp enable
+
+lisp map-resolver add 6.0.3.100
+lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1
+lisp eid-table add eid 6:0:2::0/64 locator-set ls1

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
new file mode 100644 (file)
index 0000000..0f3e4ab
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
@@ -0,0 +1,13 @@
+create host-interface name vpp2
+set int state host-vpp2 up
+set int ip address host-vpp2 6:0:4::1/64
+
+create host-interface name xtr_rtr3
+set int state host-xtr_rtr3 up
+set int ip address host-xtr_rtr3 6.0.3.2/24
+
+lisp enable
+
+lisp map-resolver add 6.0.3.100
+lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1
+lisp eid-table add eid 6:0:4::0/64 locator-set ls1

diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config
new file mode 100644 (file)
index 0000000..cb9bfa0
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/rtr.config
@@ -0,0 +1,9 @@
+create host-interface name xtr_rtr2
+set int state host-xtr_rtr2 up
+set int ip address host-xtr_rtr2 6:0:3::3/64
+
+lisp enable
+lisp locator-set add ls1 iface host-xtr_rtr2 p 1 w 1
+lisp pitr ls ls1
+lisp remote-mapping deid 6:0:0::0/64 action send-map-request
+lisp map-resolver add 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
new file mode 100644 (file)
index 0000000..915c49b
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp1.config
@@ -0,0 +1,13 @@
+create host-interface name vpp1
+set int state host-vpp1 up
+set int ip address host-vpp1 6:0:2::1/64
+
+create host-interface name xtr_rtr1
+set int state host-xtr_rtr1 up
+set int ip address host-xtr_rtr1 6:0:3::1/64
+
+lisp enable
+
+lisp map-resolver add 6:0:3::100
+lisp locator-set add ls1 iface host-xtr_rtr1 p 1 w 1
+lisp eid-table add eid 6:0:2::0/64 locator-set ls1

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
new file mode 100644 (file)
index 0000000..9def44c
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o6/vpp2.config
@@ -0,0 +1,13 @@
+create host-interface name vpp2
+set int state host-vpp2 up
+set int ip address host-vpp2 6:0:4::1/64
+
+create host-interface name xtr_rtr3
+set int state host-xtr_rtr3 up
+set int ip address host-xtr_rtr3 6:0:3::2/64
+
+lisp enable
+
+lisp map-resolver add 6:0:3::100
+lisp locator-set add ls1 iface host-xtr_rtr3 p 1 w 1
+lisp eid-table add eid 6:0:4::0/64 locator-set ls1

diff --git a/tests/data_plane/vpp_lite_topo/odl_utils.sh b/tests/data_plane/vpp_lite_topo/odl_utils.sh
index f3edc28..8a2b8bc 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/odl_utils.sh
+++ b/tests/data_plane/vpp_lite_topo/odl_utils.sh
@@ -2,7 +2,7 @@
 function post_curl {
   echo "Sending mapping from ${2} to ODL; operation: ${1}"
   until [ "`curl -X POST "http://${ODL_IP}:${ODL_PORT}/restconf/operations/odl-mappingservice:${1}" \
-     -H "Content-Type: application/json" --data-binary "@${ODL_CONFIG_DIR}${2}" \
+     -H "Content-Type: application/json" --data-binary "@${ODL_CONFIG_DIR}/${2}" \
      -u ${ODL_USER}:${ODL_PASSWD} -s -o /dev/null -w "%{http_code}"`" == "200" ]
   do
     echo "Updating failed; trying again.."

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh b/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
index 6331ab5..f51e0af 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/test_driver/rtr_single_iface.sh
@@ -22,7 +22,7 @@ function test_rtr_single_iface {
 
   test_result=1
 
-  ip netns exec vpp-ns1 ping -w 15 -c 1 "${1}"
+  ip netns exec vpp-ns1 "${1}" -w 15 -c 1 "${2}"
   rc=$?
 
   rtr_single_iface_clean

diff --git a/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh
new file mode 100644 (file)
index 0000000..79349b6
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_driver/two_customers_topo.sh
@@ -0,0 +1,54 @@
+source config.sh
+source odl_utils.sh
+source topologies/two_customers_topo.sh
+
+ODL_CONFIG_FILE1="vpp1_customer1.json"
+ODL_CONFIG_FILE2="vpp2_customer1.json"
+ODL_CONFIG_FILE3="vpp1_customer2.json"
+ODL_CONFIG_FILE4="vpp2_customer2.json"
+
+if [ "$1" == "clean" ] ; then
+  two_customers_topo_clean
+  exit 0
+fi
+
+if [[ $(id -u) != 0 ]]; then
+  echo "Error: run this as a root."
+  exit 1
+fi
+
+function test_eid_virtualization {
+  two_customers_topo_clean
+  sleep 1
+  two_customers_topo_setup
+
+  # init to test failed
+  test_result=1
+
+  #read -p  "press any key to continue .." -n1
+
+  ip netns exec vpp1-cus1-ns "${1}" -w 20 -c 1 "${2}"
+  rc=$?
+  if [ $rc -ne 0 ] ; then
+    echo "Error: customer 1 did not reveive any response!"
+  fi
+
+  #read -p  "press any key to continue .." -n1
+
+  ip netns exec vpp1-cus2-ns "${1}" -w 20 -c 1 "${2}"
+  rc=$?
+  if [ $rc -ne 0 ] ; then
+    echo "Error: customer 2 did not reveive any response!"
+  fi
+
+#  two_customers_topo_clean
+
+  if [ $rc -ne 0 ] ; then
+    echo "Test failed!";
+  else
+    echo "Test passed."
+    test_result=0
+  fi
+
+  exit $test_result
+}

diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o4.sh b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o4.sh
new file mode 100755 (executable)
index 0000000..2038fd2
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o4.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Test EID virualization (4over4)
+#
+# This test configures two LISP XTRs with two customers. Both customers
+# have two client nodes (EID) as depict here:
+#
+#     eid1    ______     _______    eid2
+#  customer1 -|     |    |     |- customer1
+#             | xTR |----| xTR |
+#  customer2 -|_____| |  |_____|- customer2
+#     eid3            |             eid4
+#                    ODL
+#
+# In this scenario both eid1 and eid3 are equal.
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/eid_virt/4o4"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/eid_virt/4o4"
+
+source test_driver/two_customers_topo.sh
+
+test_eid_virtualization ping "6.0.4.4"

diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o6.sh b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o6.sh
new file mode 100755 (executable)
index 0000000..391da92
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_4o6.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Test EID virualization (4over6)
+#
+# This test configures two LISP XTRs with two customers. Both customers
+# have two client nodes (EID) as depict here:
+#
+#     eid1    ______     _______    eid2
+#  customer1 -|     |    |     |- customer1
+#             | xTR |----| xTR |
+#  customer2 -|_____| |  |_____|- customer2
+#     eid3            |             eid4
+#                    ODL
+#
+# In this scenario both eid1 and eid3 are equal.
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/eid_virt/4o6"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/eid_virt/4o6"
+
+source test_driver/two_customers_topo.sh
+
+test_eid_virtualization ping "6.0.4.4"

diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o4.sh b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o4.sh
new file mode 100755 (executable)
index 0000000..5d7f975
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o4.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Test EID virualization (6over4)
+#
+# This test configures two LISP XTRs with two customers. Both customers
+# have two client nodes (EID) as depict here:
+#
+#     eid1    ______     _______    eid2
+#  customer1 -|     |    |     |- customer1
+#             | xTR |----| xTR |
+#  customer2 -|_____| |  |_____|- customer2
+#     eid3            |             eid4
+#                    ODL
+#
+# In this scenario both eid1 and eid3 are equal.
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/eid_virt/6o4"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/eid_virt/6o4"
+
+source test_driver/two_customers_topo.sh
+
+test_eid_virtualization ping6 "6:0:4::4"

diff --git a/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o6.sh b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o6.sh
new file mode 100755 (executable)
index 0000000..2b6d463
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_eid_virtualization_6o6.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# Test EID virualization (6over6)
+#
+# This test configures two LISP XTRs with two customers. Both customers
+# have two client nodes (EID) as depict here:
+#
+#     eid1    ______     _______    eid2
+#  customer1 -|     |    |     |- customer1
+#             | xTR |----| xTR |
+#  customer2 -|_____| |  |_____|- customer2
+#     eid3            |             eid4
+#                    ODL
+#
+# In this scenario both eid1 and eid3 are equal.
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/eid_virt/6o6"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/eid_virt/6o6"
+
+source test_driver/two_customers_topo.sh
+
+test_eid_virtualization ping6 "6:0:4::4"

diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh
index f2e1a60..465a014 100755 (executable)
--- a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh
+++ b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh
@@ -13,8 +13,8 @@
 #
 
 VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/rtr_single_iface/4o4"
-ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/4o4/"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/4o4"
 
 source test_driver/rtr_single_iface.sh
 
-test_rtr_single_iface "6.0.4.4"
+test_rtr_single_iface ping "6.0.4.4"

diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh
index 59c75d1..fe1e3da 100755 (executable)
--- a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh
+++ b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o6.sh
@@ -13,7 +13,7 @@
 #
 
 VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/rtr_single_iface/4o6/"
-ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/4o6/"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/4o6"
 
 source test_driver/rtr_single_iface.sh
 

diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o4.sh b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o4.sh
new file mode 100755 (executable)
index 0000000..ced8729
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o4.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+#
+# Test for VPP LISP RTR functionality (6over4).
+#
+# IMPORTANT: This test needs to have ODL running with following config
+# line in etc/custom.properties:
+#   lisp.elpPolicy = replace
+#
+# This test configures a topology of two XTRs and RTR. An ICMP request is
+# sent from host1 behind first TR to the host2 behind the second TR.
+#
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/rtr_single_iface/6o4/"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/6o4"
+
+source test_driver/rtr_single_iface.sh
+
+test_rtr_single_iface ping6 "6:0:4::4"

diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o6.sh b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o6.sh
new file mode 100755 (executable)
index 0000000..184c4ac
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_6o6.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+#
+# Test for VPP LISP RTR functionality (6over6).
+#
+# IMPORTANT: This test needs to have ODL running with following config
+# line in etc/custom.properties:
+#   lisp.elpPolicy = replace
+#
+# This test configures a topology of two XTRs and RTR. An ICMP request is
+# sent from host1 behind first TR to the host2 behind the second TR.
+# Both underlying and overlying networks are IPv6
+#
+
+VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/rtr_single_iface/6o6/"
+ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_single_iface/6o6"
+
+source test_driver/rtr_single_iface.sh
+
+test_rtr_single_iface ping6 "6:0:4::4"

diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
index 2be2e8c..b6530e7 100644 (file)
--- a/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
+++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_single_iface.sh
@@ -3,7 +3,7 @@
 function rtr_single_iface_clean {
   echo "Clearing all VPP instances.."
   pkill vpp --signal 9
-  
+
   rm /dev/shm/*
 
   echo "Cleaning RTR topology.."
@@ -57,7 +57,9 @@ function rtr_single_iface_setup {
     bash -c "
       ip link set dev lo up
       ip addr add 6.0.2.2/24 dev veth_vpp1
+      ip addr add 6:0:2::2/64 dev veth_vpp1
       ip route add 6.0.4.0/24 via 6.0.2.1
+      ip route add 6:0:4::0/64 via 6:0:2::1
   "
 
   ip link add veth_vpp2 type veth peer name vpp2
@@ -68,7 +70,9 @@ function rtr_single_iface_setup {
     bash -c "
       ip link set dev lo up
       ip addr add 6.0.4.4/24 dev veth_vpp2
+      ip addr add 6:0:4::4/64 dev veth_vpp2
       ip route add 6.0.2.0/24 via 6.0.4.1
+      ip route add 6:0:2::0/64 via 6:0:4::1
   "
 
   ip addr add 6.0.3.100/24 dev odl

diff --git a/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh
new file mode 100644 (file)
index 0000000..2f62913
--- /dev/null
+++ b/tests/data_plane/vpp_lite_topo/topologies/two_customers_topo.sh
@@ -0,0 +1,128 @@
+#!/usr/bin/env bash
+
+function two_customers_topo_clean {
+  echo "Clearing all VPP instances.."
+  pkill vpp --signal 9
+  rm /dev/shm/*
+
+  echo "Cleaning topology.."
+  ip netns exec intervpp-ns ifconfig vppbr1 down
+  ip netns exec intervpp-ns brctl delbr vppbr1
+  ip link del dev vpp1_cus1 &> /dev/null
+  ip link del dev vpp2_cus1 &> /dev/null
+  ip link del dev vpp1_cus2 &> /dev/null
+  ip link del dev vpp2_cus2 &> /dev/null
+  ip link del dev intervpp1 &> /dev/null
+  ip link del dev intervpp2 &> /dev/null
+  ip link del dev odl &> /dev/null
+
+  ip netns del vpp1-cus1-ns &> /dev/null
+  ip netns del vpp1-cus2-ns &> /dev/null
+  ip netns del vpp2-cus1-ns &> /dev/null
+  ip netns del vpp2-cus2-ns &> /dev/null
+  ip netns del intervpp-ns &> /dev/null
+
+  odl_clear_all
+}
+
+function two_customers_topo_setup {
+  echo "Configuring topology..."
+  ip netns add vpp1-cus1-ns
+  ip netns add vpp1-cus2-ns
+  ip netns add vpp2-cus1-ns
+  ip netns add vpp2-cus2-ns
+  ip netns add intervpp-ns
+
+  ip link add veth_intervpp1 type veth peer name intervpp1
+  ip link add veth_intervpp2 type veth peer name intervpp2
+  ip link add veth_odl type veth peer name odl
+  ip link set dev intervpp1 up
+  ip link set dev intervpp2 up
+  ip link set dev odl up
+  ip link set dev veth_intervpp1 up netns intervpp-ns
+  ip link set dev veth_intervpp2 up netns intervpp-ns
+  ip link set dev veth_odl up netns intervpp-ns
+
+  ip netns exec intervpp-ns brctl addbr vppbr1
+  ip netns exec intervpp-ns brctl addif vppbr1 veth_intervpp1
+  ip netns exec intervpp-ns brctl addif vppbr1 veth_intervpp2
+  ip netns exec intervpp-ns brctl addif vppbr1 veth_odl
+  ip netns exec intervpp-ns ifconfig vppbr1 up
+
+  # customer1 configuration on vpp1
+  ip link add veth_vpp1_cus1 type veth peer name vpp1_cus1
+  ip link set dev vpp1_cus1 up
+  ip link set dev veth_vpp1_cus1 up netns vpp1-cus1-ns
+
+  ip netns exec vpp1-cus1-ns \
+    bash -c "
+      ip link set dev lo up
+      ip addr add 6.0.2.2/24 dev veth_vpp1_cus1
+      ip addr add 6:0:2::2/64 dev veth_vpp1_cus1
+      ip route add 6.0.4.0/24 via 6.0.2.1
+      ip route add 6:0:4::0/64 via 6:0:2::1
+  "
+
+  # customer2 configuration on vpp1
+  ip link add veth_vpp1_cus2 type veth peer name vpp1_cus2
+  ip link set dev vpp1_cus2 up
+  ip link set dev veth_vpp1_cus2 up netns vpp1-cus2-ns
+
+  ip netns exec vpp1-cus2-ns \
+    bash -c "
+      ip link set dev lo up
+      ip addr add 6.0.2.2/24 dev veth_vpp1_cus2
+      ip addr add 6:0:2::2/64 dev veth_vpp1_cus2
+      ip route add 6.0.4.0/24 via 6.0.2.1
+      ip route add 6:0:4::0/64 via 6:0:2::1
+  "
+
+  # customer1 configuration on vpp2
+  ip link add veth_vpp2_cus1 type veth peer name vpp2_cus1
+  ip link set dev vpp2_cus1 up
+  ip link set dev veth_vpp2_cus1 up netns vpp2-cus1-ns
+
+  ip netns exec vpp2-cus1-ns \
+    bash -c "
+      ip link set dev lo up
+      ip addr add 6.0.4.4/24 dev veth_vpp2_cus1
+      ip addr add 6:0:4::4/64 dev veth_vpp2_cus1
+      ip route add 6.0.2.0/24 via 6.0.4.1
+      ip route add 6:0:2::0/64 via 6:0:4::1
+  "
+
+  # customer2 configuration on vpp2
+  ip link add veth_vpp2_cus2 type veth peer name vpp2_cus2
+  ip link set dev vpp2_cus2 up
+  ip link set dev veth_vpp2_cus2 up netns vpp2-cus2-ns
+
+  ip netns exec vpp2-cus2-ns \
+    bash -c "
+      ip link set dev lo up
+      ip addr add 6.0.4.4/24 dev veth_vpp2_cus2
+      ip addr add 6:0:4::4/64 dev veth_vpp2_cus2
+      ip route add 6.0.2.0/24 via 6.0.4.1
+      ip route add 6:0:2::0/64 via 6:0:4::1
+  "
+
+  ip addr add 6.0.3.100/24 dev odl
+  ip addr add 6:0:3::100/64 dev odl
+  ethtool --offload  odl rx off tx off
+
+  ${VPP_LITE_BIN} \
+    unix { log /tmp/vpp1.log cli-listen \
+           localhost:5002 full-coredump \
+           exec ${VPP_LITE_CONF}/vpp1.config } \
+    api-trace { on } api-segment { prefix xtr1 }
+
+  ${VPP_LITE_BIN} \
+    unix { log /tmp/vpp2.log cli-listen \
+           localhost:5003 full-coredump \
+           exec ${VPP_LITE_CONF}/vpp2.config } \
+    api-trace { on } api-segment { prefix xtr2 }
+
+  post_curl "add-mapping" ${ODL_CONFIG_FILE1}
+  post_curl "add-mapping" ${ODL_CONFIG_FILE2}
+  post_curl "add-mapping" ${ODL_CONFIG_FILE3}
+  post_curl "add-mapping" ${ODL_CONFIG_FILE4}
+}