Add new test for IP4 over IP6 and IP6 over IP4

Change-Id: Icc411c22f041c447d595cb158102675f4055a7de
Signed-off-by: Andrej Kozemcak <akozemca@cisco.com>

20 files changed, 272 insertions, 4 deletions

diff --git a/tests/data_plane/configs/odl/add_ipv4o6_odl1.txt b/tests/data_plane/configs/odl/add_ipv4o6_odl1.txt
new file mode 100644
index 0000000..69729df
--- /dev/null
+++ b/tests/data_plane/configs/odl/add_ipv4o6_odl1.txt
@@ -0,0 +1,29 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv4-prefix-afi",
+                "ipv4-prefix": "6.0.1.0/24"
+            },
+            "LocatorRecord": [
+                {
+                    "locator-id": "ISP1",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": true,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:ipv6-afi",
+                        "ipv6": "6:0:3::1"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/add_ipv4o6_odl2.txt b/tests/data_plane/configs/odl/add_ipv4o6_odl2.txt
new file mode 100644
index 0000000..3d17a33
--- /dev/null
+++ b/tests/data_plane/configs/odl/add_ipv4o6_odl2.txt
@@ -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:ipv6-afi",
+                        "ipv6": "6:0:3::2"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/add_ipv6_odl1.txt b/tests/data_plane/configs/odl/add_ipv6_odl1.txt
index a367262..3af329b 100644
--- a/tests/data_plane/configs/odl/add_ipv6_odl1.txt
+++ b/tests/data_plane/configs/odl/add_ipv6_odl1.txt
@@ -6,7 +6,7 @@
             "authoritative": true,
             "eid": {
                 "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
-                "ipv6-prefix": "6:0:1::0/48"
+                "ipv6-prefix": "6:0:1::0/64"
             },
             "LocatorRecord": [
                 {
diff --git a/tests/data_plane/configs/odl/add_ipv6_odl2.txt b/tests/data_plane/configs/odl/add_ipv6_odl2.txt
index 3f5afd7..fcc6ecd 100644
--- a/tests/data_plane/configs/odl/add_ipv6_odl2.txt
+++ b/tests/data_plane/configs/odl/add_ipv6_odl2.txt
@@ -6,7 +6,7 @@
             "authoritative": true,
             "eid": {
                 "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
-                "ipv6-prefix": "6:0:2::0/48"
+                "ipv6-prefix": "6:0:2::0/64"
             },
             "LocatorRecord": [
                 {
diff --git a/tests/data_plane/configs/odl/add_ipv6o4_odl1.txt b/tests/data_plane/configs/odl/add_ipv6o4_odl1.txt
new file mode 100644
index 0000000..f4cb476
--- /dev/null
+++ b/tests/data_plane/configs/odl/add_ipv6o4_odl1.txt
@@ -0,0 +1,29 @@
+{
+    "input": {
+        "mapping-record": {
+            "recordTtl": 1440,
+            "action": "NoAction",
+            "authoritative": true,
+            "eid": {
+                "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
+                "ipv6-prefix": "6:0:1::0/64"
+            },
+            "LocatorRecord": [
+                {
+                    "locator-id": "ISP1",
+                    "priority": 1,
+                    "weight": 1,
+                    "multicastPriority": 255,
+                    "multicastWeight": 0,
+                    "localLocator": true,
+                    "rlocProbed": false,
+                    "routed": true,
+                    "rloc": {
+                        "address-type": "ietf-lisp-address-types:ipv4-afi",
+                        "ipv4": "6.0.3.1"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/add_ipv6o4_odl2.txt b/tests/data_plane/configs/odl/add_ipv6o4_odl2.txt
new file mode 100644
index 0000000..52f2125
--- /dev/null
+++ b/tests/data_plane/configs/odl/add_ipv6o4_odl2.txt
@@ -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:ipv4-afi",
+                        "ipv4": "6.0.3.2"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/replace_ipv4o6_odl2.txt b/tests/data_plane/configs/odl/replace_ipv4o6_odl2.txt
new file mode 100644
index 0000000..9b6ba62
--- /dev/null
+++ b/tests/data_plane/configs/odl/replace_ipv4o6_odl2.txt
@@ -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:ipv6-afi",
+                        "ipv6": "6:0:3::20"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/odl/replace_ipv6_odl2.txt b/tests/data_plane/configs/odl/replace_ipv6_odl2.txt
index e61d6fc..6cd17a8 100644
--- a/tests/data_plane/configs/odl/replace_ipv6_odl2.txt
+++ b/tests/data_plane/configs/odl/replace_ipv6_odl2.txt
@@ -6,7 +6,7 @@
             "authoritative": true,
             "eid": {
                 "address-type": "ietf-lisp-address-types:ipv6-prefix-afi",
-                "ipv6-prefix": "6:0:2::0/48"
+                "ipv6-prefix": "6:0:2::0/64"
             },
             "LocatorRecord": [
                 {
diff --git a/tests/data_plane/configs/odl/replace_ipv6o4_odl2.txt b/tests/data_plane/configs/odl/replace_ipv6o4_odl2.txt
new file mode 100644
index 0000000..e8a8cfd
--- /dev/null
+++ b/tests/data_plane/configs/odl/replace_ipv6o4_odl2.txt
@@ -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:ipv4-afi",
+                        "ipv4": "6.0.3.20"
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp1_4o6.conf b/tests/data_plane/configs/vpp_csit_config/vpp1_4o6.conf
new file mode 100644
index 0000000..1592c68
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp1_4o6.conf
@@ -0,0 +1,9 @@
+exec set int ip address GigabitEthernet0/9/0 6.0.1.1/24
+exec set int state GigabitEthernet0/9/0 up
+exec set int ip address GigabitEthernet0/a/0 6:0:3::1/64
+exec set int state GigabitEthernet0/a/0 up
+lisp_gpe_enable_disable enable
+lisp_add_del_map_resolver 6:0:3::100
+lisp_add_del_locator_set locator-set  ls1
+lisp_add_del_locator locator-set  ls1 iface GigabitEthernet0/a/0 p 1 w 2
+lisp_add_del_local_eid eid 6.0.1.0/24 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp1_6.conf b/tests/data_plane/configs/vpp_csit_config/vpp1_6.conf
index d14acc4..0d7dcf3 100644
--- a/tests/data_plane/configs/vpp_csit_config/vpp1_6.conf
+++ b/tests/data_plane/configs/vpp_csit_config/vpp1_6.conf
@@ -7,4 +7,4 @@ lisp_enable_disable enable
 lisp_add_del_map_resolver 6:0:3::100
 lisp_add_del_locator_set locator-set  ls1
 lisp_add_del_locator locator-set  ls1 iface GigabitEthernet0/a/0 p 1 w 2
-lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
\ No newline at end of file
+lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp1_6o4.conf b/tests/data_plane/configs/vpp_csit_config/vpp1_6o4.conf
new file mode 100644
index 0000000..2f411c8
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp1_6o4.conf
@@ -0,0 +1,9 @@
+exec set int ip address GigabitEthernet0/9/0 6:0:1::1/64
+exec set int state GigabitEthernet0/9/0 up
+exec set int ip address GigabitEthernet0/a/0 6.0.3.1/24
+exec set int state GigabitEthernet0/a/0 up
+lisp_gpe_enable_disable enable
+lisp_add_del_map_resolver 6.0.3.100
+lisp_add_del_locator_set locator-set  ls1
+lisp_add_del_locator locator-set  ls1 iface GigabitEthernet0/a/0 p 1 w 2
+lisp_add_del_local_eid eid 6:0:1::0/64 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp2_4o6.conf b/tests/data_plane/configs/vpp_csit_config/vpp2_4o6.conf
new file mode 100644
index 0000000..de94f4b
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp2_4o6.conf
@@ -0,0 +1,9 @@
+exec set int ip address GigabitEthernet0/9/0 6.0.2.1/24
+exec set int state GigabitEthernet0/9/0 up
+exec set int ip address GigabitEthernet0/a/0 6:0:3::2/64
+exec set int state GigabitEthernet0/a/0 up
+lisp_gpe_enable_disable enable
+lisp_add_del_map_resolver 6:0:3::100
+lisp_add_del_locator_set locator-set  ls1
+lisp_add_del_locator locator-set  ls1 iface GigabitEthernet0/a/0 p 1 w 2
+lisp_add_del_local_eid eid 6.0.2.0/24 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp2_6o4.conf b/tests/data_plane/configs/vpp_csit_config/vpp2_6o4.conf
new file mode 100644
index 0000000..db581f8
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp2_6o4.conf
@@ -0,0 +1,9 @@
+exec set int ip address GigabitEthernet0/9/0 6:0:2::1/64
+exec set int state GigabitEthernet0/9/0 up
+exec set int ip address GigabitEthernet0/a/0 6.0.3.2/24
+exec set int state GigabitEthernet0/a/0 up
+lisp_gpe_enable_disable enable
+lisp_add_del_map_resolver 6.0.3.100
+lisp_add_del_locator_set locator-set  ls1
+lisp_add_del_locator locator-set  ls1 iface GigabitEthernet0/a/0 p 1 w 2
+lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_4o6.conf b/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_4o6.conf
new file mode 100644
index 0000000..3f37a61
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_4o6.conf
@@ -0,0 +1,3 @@
+exec set int ip address del GigabitEthernet0/a/0 6:0:3::2/64
+exec set int ip address GigabitEthernet0/a/0 6:0:3::20/64
+exec set int state GigabitEthernet0/a/0 up
\ No newline at end of file
diff --git a/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_6o4.conf b/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_6o4.conf
new file mode 100644
index 0000000..fec4070
--- /dev/null
+++ b/tests/data_plane/configs/vpp_csit_config/vpp2_reconf_6o4.conf
@@ -0,0 +1,3 @@
+exec set int ip address del GigabitEthernet0/a/0 6.0.3.2/24
+exec set int ip address GigabitEthernet0/a/0 6.0.3.20/24
+exec set int state GigabitEthernet0/a/0 up
\ No newline at end of file
diff --git a/tests/data_plane/configs/vpp_lite_config/vpp1_4o6.conf b/tests/data_plane/configs/vpp_lite_config/vpp1_4o6.conf
new file mode 100644
index 0000000..248eca4
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/vpp1_4o6.conf
@@ -0,0 +1,13 @@
+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 intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6:0:3::1/64
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp1 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/vpp1_6o4.conf b/tests/data_plane/configs/vpp_lite_config/vpp1_6o4.conf
new file mode 100644
index 0000000..d4788c2
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/vpp1_6o4.conf
@@ -0,0 +1,13 @@
+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 intervpp1
+set int state host-intervpp1 up
+set int ip address host-intervpp1 6.0.3.1/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp1 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/vpp2_4o6.conf b/tests/data_plane/configs/vpp_lite_config/vpp2_4o6.conf
new file mode 100644
index 0000000..5f248ad
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/vpp2_4o6.conf
@@ -0,0 +1,13 @@
+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 intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6:0:3::2/64
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp2 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/vpp2_6o4.conf b/tests/data_plane/configs/vpp_lite_config/vpp2_6o4.conf
new file mode 100644
index 0000000..cbfa148
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/vpp2_6o4.conf
@@ -0,0 +1,13 @@
+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 intervpp2
+set int state host-intervpp2 up
+set int ip address host-intervpp2 6.0.3.2/24
+
+lisp enable
+
+lisp locator-set add ls1 iface host-intervpp2 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