Add RTR tests (6over4 and 6over6)

Change-Id: I4b2b05193209a3054f0a1177be9412e79de73349
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

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/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/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_rtr_single_iface_4o4.sh b/tests/data_plane/vpp_lite_topo/test_rtr_single_iface_4o4.sh
index 2729c7e..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
@@ -17,4 +17,4 @@ 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_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