From 572c17d6b9db44b8e0fb70222a13272fe41a4a7e Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 29 Jun 2016 14:53:39 +0200 Subject: Add RTR + EID virt test (6over46) Change-Id: Ia21075fc33059165f1fcef1bcb177e54dee0e6b8 Signed-off-by: Filip Tehlar --- .../configs/odl/rtr_two_iface/6o46/elp1.json | 42 ++++++ .../configs/odl/rtr_two_iface/6o46/elp2.json | 42 ++++++ .../configs/odl/rtr_two_iface/mixed/elp1.json | 42 ------ .../configs/odl/rtr_two_iface/mixed/elp2.json | 42 ------ .../6o46/vpp1_customer1.json | 43 ++++++ .../6o46/vpp1_customer2.json | 43 ++++++ .../6o46/vpp2_customer1.json | 43 ++++++ .../6o46/vpp2_customer2.json | 43 ++++++ .../vpp_lite_config/rtr_two_iface/6o46/rtr.config | 15 ++ .../vpp_lite_config/rtr_two_iface/6o46/vpp1.config | 12 ++ .../vpp_lite_config/rtr_two_iface/6o46/vpp2.config | 12 ++ .../vpp_lite_config/rtr_two_iface/mixed/rtr.config | 15 -- .../rtr_two_iface/mixed/vpp1.config | 12 -- .../rtr_two_iface/mixed/vpp2.config | 12 -- .../rtr_two_iface_two_customers/6o46/rtr.config | 18 +++ .../rtr_two_iface_two_customers/6o46/vpp1.config | 24 +++ .../rtr_two_iface_two_customers/6o46/vpp2.config | 24 +++ .../test_driver/rtr_two_iface_two_customers.sh | 50 ++++++ .../test_driver/two_customers_topo.sh | 4 +- .../vpp_lite_topo/test_rtr_two_iface_6o46.sh | 19 +++ .../vpp_lite_topo/test_rtr_two_iface_mixed.sh | 20 --- .../test_rtr_two_iface_two_customers_6o46.sh | 20 +++ .../topologies/rtr_two_iface_two_customers.sh | 167 +++++++++++++++++++++ 23 files changed, 619 insertions(+), 145 deletions(-) create mode 100644 tests/data_plane/configs/odl/rtr_two_iface/6o46/elp1.json create mode 100644 tests/data_plane/configs/odl/rtr_two_iface/6o46/elp2.json delete mode 100644 tests/data_plane/configs/odl/rtr_two_iface/mixed/elp1.json delete mode 100644 tests/data_plane/configs/odl/rtr_two_iface/mixed/elp2.json create mode 100644 tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer1.json create mode 100644 tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer2.json create mode 100644 tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer1.json create mode 100644 tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer2.json create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config delete mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/rtr.config delete mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp1.config delete mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp2.config create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config create mode 100644 tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.config create mode 100644 tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface_two_customers.sh create mode 100755 tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh delete mode 100755 tests/data_plane/vpp_lite_topo/test_rtr_two_iface_mixed.sh create mode 100755 tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh create mode 100644 tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh diff --git a/tests/data_plane/configs/odl/rtr_two_iface/6o46/elp1.json b/tests/data_plane/configs/odl/rtr_two_iface/6o46/elp1.json new file mode 100644 index 0000000..7696f59 --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface/6o46/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": true, + "rloc": { + "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf", + "explicit-locator-path": { + "hop": [ + { + "hop-id": "Hop 1", + "address": "6:0:5::2", + "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_two_iface/6o46/elp2.json b/tests/data_plane/configs/odl/rtr_two_iface/6o46/elp2.json new file mode 100644 index 0000000..a043715 --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface/6o46/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.2", + "lrs-bits": "lookup rloc-probe strict" + }, + { + "hop-id": "Hop 2", + "address": "6:0:5::1", + "lrs-bits": "lookup strict" + } + ] + } + } + } + ] + } + } +} diff --git a/tests/data_plane/configs/odl/rtr_two_iface/mixed/elp1.json b/tests/data_plane/configs/odl/rtr_two_iface/mixed/elp1.json deleted file mode 100644 index 7696f59..0000000 --- a/tests/data_plane/configs/odl/rtr_two_iface/mixed/elp1.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "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": true, - "rloc": { - "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf", - "explicit-locator-path": { - "hop": [ - { - "hop-id": "Hop 1", - "address": "6:0:5::2", - "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_two_iface/mixed/elp2.json b/tests/data_plane/configs/odl/rtr_two_iface/mixed/elp2.json deleted file mode 100644 index a043715..0000000 --- a/tests/data_plane/configs/odl/rtr_two_iface/mixed/elp2.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "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.2", - "lrs-bits": "lookup rloc-probe strict" - }, - { - "hop-id": "Hop 2", - "address": "6:0:5::1", - "lrs-bits": "lookup strict" - } - ] - } - } - } - ] - } - } -} diff --git a/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer1.json b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer1.json new file mode 100644 index 0000000..38cfc9a --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer1.json @@ -0,0 +1,43 @@ +{ + "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": "ELP", + "priority": 1, + "weight": 1, + "multicastPriority": 255, + "multicastWeight": 0, + "localLocator": true, + "rlocProbed": false, + "routed": true, + "rloc": { + "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf", + "explicit-locator-path": { + "hop": [ + { + "hop-id": "Hop 1", + "address": "6:0:5::2", + "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_two_iface_two_customers/6o46/vpp1_customer2.json b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer2.json new file mode 100644 index 0000000..9f5a208 --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp1_customer2.json @@ -0,0 +1,43 @@ +{ + "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": "ELP", + "priority": 1, + "weight": 1, + "multicastPriority": 255, + "multicastWeight": 0, + "localLocator": true, + "rlocProbed": false, + "routed": true, + "rloc": { + "address-type": "ietf-lisp-address-types:explicit-locator-path-lcaf", + "explicit-locator-path": { + "hop": [ + { + "hop-id": "Hop 1", + "address": "6:0:5::2", + "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_two_iface_two_customers/6o46/vpp2_customer1.json b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer1.json new file mode 100644 index 0000000..bf15ffa --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer1.json @@ -0,0 +1,43 @@ +{ + "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": "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.2", + "lrs-bits": "lookup rloc-probe strict" + }, + { + "hop-id": "Hop 2", + "address": "6:0:5::1", + "lrs-bits": "lookup strict" + } + ] + } + } + } + ] + } + } +} diff --git a/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer2.json b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer2.json new file mode 100644 index 0000000..c06939e --- /dev/null +++ b/tests/data_plane/configs/odl/rtr_two_iface_two_customers/6o46/vpp2_customer2.json @@ -0,0 +1,43 @@ +{ + "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": "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.2", + "lrs-bits": "lookup rloc-probe strict" + }, + { + "hop-id": "Hop 2", + "address": "6:0:5::1", + "lrs-bits": "lookup strict" + } + ] + } + } + } + ] + } + } +} 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 new file mode 100644 index 0000000..02953d0 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/rtr.config @@ -0,0 +1,15 @@ +create host-interface name rtr_vpp1 +set int state host-rtr_vpp1 up +set int ip address host-rtr_vpp1 6.0.3.2/24 + +create host-interface name rtr_vpp2 +set int state host-rtr_vpp2 up +set int ip address host-rtr_vpp2 6:0:5::2/64 + +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 map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config new file mode 100644 index 0000000..72e460b --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp1.config @@ -0,0 +1,12 @@ +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 vpp1_rtr +set int state host-vpp1_rtr up +set int ip address host-vpp1_rtr 6.0.3.1/24 + +lisp enable + +lisp map-resolver add 6.0.3.100 +lisp locator-set add ls1 iface host-vpp1_rtr 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_two_iface/6o46/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config new file mode 100644 index 0000000..eddefba --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/6o46/vpp2.config @@ -0,0 +1,12 @@ +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 vpp2_rtr +set int state host-vpp2_rtr up +set int ip address host-vpp2_rtr 6:0:5::1/64 + +lisp enable + +lisp map-resolver add 6:0:5::100 +lisp locator-set add ls1 iface host-vpp2_rtr 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_two_iface/mixed/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/rtr.config deleted file mode 100644 index 02953d0..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/rtr.config +++ /dev/null @@ -1,15 +0,0 @@ -create host-interface name rtr_vpp1 -set int state host-rtr_vpp1 up -set int ip address host-rtr_vpp1 6.0.3.2/24 - -create host-interface name rtr_vpp2 -set int state host-rtr_vpp2 up -set int ip address host-rtr_vpp2 6:0:5::2/64 - -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 map-resolver add 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp1.config deleted file mode 100644 index 72e460b..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp1.config +++ /dev/null @@ -1,12 +0,0 @@ -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 vpp1_rtr -set int state host-vpp1_rtr up -set int ip address host-vpp1_rtr 6.0.3.1/24 - -lisp enable - -lisp map-resolver add 6.0.3.100 -lisp locator-set add ls1 iface host-vpp1_rtr 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_two_iface/mixed/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp2.config deleted file mode 100644 index eddefba..0000000 --- a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface/mixed/vpp2.config +++ /dev/null @@ -1,12 +0,0 @@ -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 vpp2_rtr -set int state host-vpp2_rtr up -set int ip address host-vpp2_rtr 6:0:5::1/64 - -lisp enable - -lisp map-resolver add 6:0:5::100 -lisp locator-set add ls1 iface host-vpp2_rtr 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_two_iface_two_customers/6o46/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config new file mode 100644 index 0000000..24a5eb8 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/rtr.config @@ -0,0 +1,18 @@ +create host-interface name rtr_vpp1 +set int state host-rtr_vpp1 up +set int ip address host-rtr_vpp1 6.0.3.2/24 + +create host-interface name rtr_vpp2 +set int state host-rtr_vpp2 up +set int ip address host-rtr_vpp2 6:0:5::2/64 + +lisp enable + +lisp map-resolver add 6.0.3.100 + +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 diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp1.config new file mode 100644 index 0000000..3f8d436 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/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 vpp1_rtr +set int state host-vpp1_rtr up +set int ip address host-vpp1_rtr 6.0.3.1/24 + +lisp enable +lisp map-resolver add 6.0.3.100 + +lisp locator-set add ls1 iface host-vpp1_rtr 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-vpp1_rtr 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/rtr_two_iface_two_customers/6o46/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/vpp2.config new file mode 100644 index 0000000..8f7966c --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/rtr_two_iface_two_customers/6o46/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 interface ip6 table host-vpp2_cus2 200 +set int state host-vpp2_cus2 up +set int ip address host-vpp2_cus2 6:0:4::1/64 + +create host-interface name vpp2_rtr +set int state host-vpp2_rtr up +set int ip address host-vpp2_rtr 6:0:5::1/64 + +lisp enable +lisp map-resolver add 6:0:5::100 + +lisp locator-set add ls1 iface host-vpp2_rtr 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-vpp2_rtr 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/vpp_lite_topo/test_driver/rtr_two_iface_two_customers.sh b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface_two_customers.sh new file mode 100644 index 0000000..46e0918 --- /dev/null +++ b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface_two_customers.sh @@ -0,0 +1,50 @@ +source config.sh +source odl_utils.sh +source topologies/rtr_two_iface_two_customers.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 + rtr_two_iface_clean + exit 0 +fi + +if [[ $(id -u) != 0 ]]; then + echo "Error: run this as a root." + exit 1 +fi + +function test_rtr_two_iface_two_customers { + rtr_two_iface_two_customers_setup + sleep 1 + + test_result=0 + rc=0 + + ip netns exec vpp1-cus1-ns "${1}" -w 20 -c 1 "${2}" + rc=$? + if [ $rc -ne 0 ] ; then + echo "Error: customer 1 did not receive any response!" + test_result=1 + fi + + ip netns exec vpp1-cus2-ns "${1}" -w 20 -c 1 "${2}" + rc=$? + if [ $rc -ne 0 ] ; then + echo "Error: customer 2 did not receive any response!" + test_result=1 + fi + + rtr_two_iface_two_customers_clean + + if [ $rc -ne 0 ] ; then + echo "Test failed: No ICMP response received within specified timeout limit!" + else + echo "Test passed." + fi + + exit $test_result +} 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 index 79349b6..174a683 100644 --- 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 @@ -30,7 +30,7 @@ function test_eid_virtualization { 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!" + echo "Error: customer 1 did not receive any response!" fi #read -p "press any key to continue .." -n1 @@ -38,7 +38,7 @@ function test_eid_virtualization { 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!" + echo "Error: customer 2 did not receive any response!" fi # two_customers_topo_clean diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh b/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh new file mode 100755 index 0000000..fd59664 --- /dev/null +++ b/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_6o46.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +# +# Test for VPP LISP RTR functionality (6over46). +# +# 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_two_iface/6o46" +ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_two_iface/6o46" + +source test_driver/rtr_two_iface.sh + +test_rtr_two_iface "6:0:4::4" wait diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_mixed.sh b/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_mixed.sh deleted file mode 100755 index 8c16d68..0000000 --- a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_mixed.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -# -# Test for VPP LISP RTR functionality (4over4). -# -# 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 host and underlaying networks are IPv4. -# - -VPP_LITE_CONF=`pwd`"/../configs/vpp_lite_config/rtr_two_iface/mixed" -ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_two_iface/mixed/" - -source test_driver/rtr_two_iface.sh - -test_rtr_two_iface "6:0:4::4" wait diff --git a/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh b/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh new file mode 100755 index 0000000..eac2a7c --- /dev/null +++ b/tests/data_plane/vpp_lite_topo/test_rtr_two_iface_two_customers_6o46.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# +# Test for VPP LISP RTR functionality with EID virualization. +# +# 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_two_iface_two_customers/6o46" +ODL_CONFIG_DIR=`pwd`"/../configs/odl/rtr_two_iface_two_customers/6o46" + +source test_driver/rtr_two_iface_two_customers.sh + +test_rtr_two_iface_two_customers ping6 "6:0:4::4" diff --git a/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh new file mode 100644 index 0000000..ac9020d --- /dev/null +++ b/tests/data_plane/vpp_lite_topo/topologies/rtr_two_iface_two_customers.sh @@ -0,0 +1,167 @@ + +#!/usr/bin/env bash + +function rtr_two_iface_two_customers_clean { + echo "Clearing all VPP instances.." + pkill vpp --signal 9 + + rm /dev/shm/* + + echo "Cleaning RTR topology.." + ip netns exec vpp1-rtr-ns ifconfig vppbr1 down + ip netns exec vpp1-rtr-ns brctl delbr vppbr1 + ip netns exec vpp2-rtr-ns ifconfig vppbr2 down + ip netns exec vpp2-rtr-ns brctl delbr vppbr2 + ip link del dev vpp1 &> /dev/null + ip link del dev vpp2 &> /dev/null + ip link del dev vpp1_rtr &> /dev/null + ip link del dev rtr1_vpp1 &> /dev/null + ip link del dev vpp2_rtr &> /dev/null + ip link del dev rtr_vpp2 &> /dev/null + ip link del dev odl_vpp1 &> /dev/null + ip link del dev odl_vpp2 &> /dev/null + + ip netns del vpp1-cus1-ns &> /dev/null + ip netns del vpp2-cus1-ns &> /dev/null + ip netns del vpp1-cus2-ns &> /dev/null + ip netns del vpp2-cus2-ns &> /dev/null + ip netns del vpp1-rtr-ns &> /dev/null + ip netns del vpp2-rtr-ns &> /dev/null + + odl_clear_all +} + +function rtr_two_iface_two_customers_setup { + # create namespaces + 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 vpp1-rtr-ns + ip netns add vpp2-rtr-ns + + # create pair interfaces between vpp[1|2], rtr and odl + ip link add veth_vpp1_rtr type veth peer name vpp1_rtr + ip link add veth_rtr_vpp1 type veth peer name rtr_vpp1 + ip link add veth_vpp2_rtr type veth peer name vpp2_rtr + ip link add veth_rtr_vpp2 type veth peer name rtr_vpp2 + ip link add veth_odl_vpp1 type veth peer name odl_vpp1 + ip link add veth_odl_vpp2 type veth peer name odl_vpp2 + + # enable peer interfaces + ip link set dev vpp1_rtr up + ip link set dev rtr_vpp1 up + ip link set dev vpp2_rtr up + ip link set dev rtr_vpp2 up + ip link set dev odl_vpp1 up + ip link set dev odl_vpp2 up + + # enable veth interfaces and set them in the appropriate ip ns + ip link set dev veth_vpp1_rtr up netns vpp1-rtr-ns + ip link set dev veth_rtr_vpp1 up netns vpp1-rtr-ns + ip link set dev veth_vpp2_rtr up netns vpp2-rtr-ns + ip link set dev veth_rtr_vpp2 up netns vpp2-rtr-ns + ip link set dev veth_odl_vpp1 up netns vpp1-rtr-ns + ip link set dev veth_odl_vpp2 up netns vpp2-rtr-ns + + # vpp1, rtr and odl + ip netns exec vpp1-rtr-ns brctl addbr vppbr1 + ip netns exec vpp1-rtr-ns brctl addif vppbr1 veth_vpp1_rtr + ip netns exec vpp1-rtr-ns brctl addif vppbr1 veth_rtr_vpp1 + ip netns exec vpp1-rtr-ns brctl addif vppbr1 veth_odl_vpp1 + ip netns exec vpp1-rtr-ns ifconfig vppbr1 up + + # vpp2, rtr and odl + ip netns exec vpp2-rtr-ns brctl addbr vppbr2 + ip netns exec vpp2-rtr-ns brctl addif vppbr2 veth_vpp2_rtr + ip netns exec vpp2-rtr-ns brctl addif vppbr2 veth_rtr_vpp2 + ip netns exec vpp2-rtr-ns brctl addif vppbr2 veth_odl_vpp2 + ip netns exec vpp2-rtr-ns ifconfig vppbr2 up + + # vpp1 to client1 + 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 + " + # vpp1 to client2 + 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 + " + + # vpp2 to client1 + 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 + " + # vpp2 to client2 + 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 + " + + # vpp1 to odl + ip addr add 6.0.3.100/24 dev odl_vpp1 + ip addr add 6:0:3::100/64 dev odl_vpp1 + ethtool --offload odl_vpp1 rx off tx off + + # vpp2 to odl + ip addr add 6.0.5.100/24 dev odl_vpp2 + ip addr add 6:0:5::100/64 dev odl_vpp2 + ethtool --offload odl_vpp2 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} + + ${VPP_LITE_BIN} \ + unix { log /tmp/rtr.log cli-listen \ + localhost:5004 full-coredump \ + exec ${VPP_LITE_CONF}/rtr.config } \ + api-trace { on } api-segment {prefix rtr} + + 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} +} -- cgit 1.2.3-korg