diff options
author | Filip Tehlar <ftehlar@cisco.com> | 2016-09-07 15:47:47 +0200 |
---|---|---|
committer | Filip Tehlar <ftehlar@cisco.com> | 2016-09-12 14:41:10 +0200 |
commit | bf231ba795387064e7c4f1781240619429a4ef29 (patch) | |
tree | 86da34369910ca1c85672ed30d4374d4ecda9ac3 /tests/data_plane/configs/vpp_lite_config/multihoming/l2o4 | |
parent | 1df1d674eaace35d52973786403eb1dbe3c0d5eb (diff) |
Introduce an option for testing binary API
This patch introduces an option for choosing a configuration method in
tests. Supported methods are VAT and vpp's debug CLI.
* Added new aprameter to run.sh to define method (--cfg-method [vat|cli]).
Defaults to vat.
* When running a test separately the method can be set as follows:
$ sudo CFG_METHOD=cli ./tests/<test_case>.sh
Again, it defaults to 'vat' if not provided.
* Increased readability in test driver scripts when checking test
status
* When debugging you can stop test execution by running the test with WAIT=1:
$ sudo WAIT=1 tests/<test_case>.sh
Change-Id: If851139cff072ba2e3b3594a3345763d360f3b59
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Diffstat (limited to 'tests/data_plane/configs/vpp_lite_config/multihoming/l2o4')
4 files changed, 18 insertions, 40 deletions
diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config index 55a2627..0ab9f49 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.config @@ -1,12 +1,10 @@ -create host-interface name vpp1 -set int state host-vpp1 up -set int ip address host-vpp1 6.0.1.1/24 -set interface l2 bridge host-vpp1 10 +create_host_iface vpp1 6.0.1.1/24 +set_if_l2_bridge host-vpp1 10 +create_host_iface intervpp11 6.0.3.1/24 +create_host_iface intervpp21 6.0.4.1/24 -create host-interface name intervpp11 -set int state host-intervpp11 up -set int ip address host-intervpp11 6.0.3.1/24 - -create host-interface name intervpp21 -set int state host-intervpp21 up -set int ip address host-intervpp21 6.0.4.1/24 +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp11 p 1 w 1 iface host-intervpp21 p 1 w 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat deleted file mode 100644 index 974f594..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp1.vat +++ /dev/null @@ -1,9 +0,0 @@ -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 host-intervpp11 p 1 w 1 -lisp_add_del_locator locator-set ls1 iface host-intervpp21 p 1 w 1 - -lisp_eid_table_add_del_map vni 10 bd_index 10 -lisp_add_del_local_eid vni 10 eid 08:11:11:11:11:11 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config index 8f13e84..f3384cb 100644 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.config @@ -1,12 +1,10 @@ -create host-interface name vpp2 -set int state host-vpp2 up -set int ip address host-vpp2 6.0.1.2/24 -set interface l2 bridge host-vpp2 10 +create_host_iface vpp2 6.0.1.2/24 +set_if_l2_bridge host-vpp2 10 +create_host_iface intervpp12 6.0.3.2/24 +create_host_iface intervpp22 6.0.4.2/24 -create host-interface name intervpp12 -set int state host-intervpp12 up -set int ip address host-intervpp12 6.0.3.2/24 - -create host-interface name intervpp22 -set int state host-intervpp22 up -set int ip address host-intervpp22 6.0.4.2/24 +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-intervpp12 p 1 w 1 iface host-intervpp22 p 1 w 1 +lisp_eid_map_bd 10 10 +lisp_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat deleted file mode 100644 index 9ded228..0000000 --- a/tests/data_plane/configs/vpp_lite_config/multihoming/l2o4/vpp2.vat +++ /dev/null @@ -1,9 +0,0 @@ -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 host-intervpp12 p 1 w 1 -lisp_add_del_locator locator-set ls1 iface host-intervpp22 p 1 w 1 - -lisp_eid_table_add_del_map vni 10 bd_index 10 -lisp_add_del_local_eid vni 10 eid 08:22:22:22:22:22 locator-set ls1 |