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/eid_virt/4o4 | |
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/eid_virt/4o4')
4 files changed, 20 insertions, 52 deletions
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 index 58d3133..269290c 100644 --- 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 @@ -1,13 +1,11 @@ -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_iface_vrf vpp1_cus1 6.0.2.1/24 100 +create_host_iface_vrf vpp1_cus2 6.0.2.1/24 200 +create_host_iface intervpp1 6.0.3.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_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp1 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.2.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat deleted file mode 100644 index 071bd31..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp1.vat +++ /dev/null @@ -1,14 +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_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp1 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp1 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.2.0/24 locator-set ls1 -lisp_add_del_local_eid 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 index db01d3f..ae70864 100644 --- 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 @@ -1,13 +1,11 @@ -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_iface_vrf vpp2_cus1 6.0.4.1/24 100 +create_host_iface_vrf vpp2_cus2 6.0.4.1/24 200 +create_host_iface intervpp2 6.0.3.2/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_state enable +lisp_map_resolver 6.0.3.100 +lisp_locator_set_with_locator ls1 host-intervpp2 1 1 +lisp_eid_map_vrf 100 100 +lisp_eid_map_vrf 200 200 +lisp_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1 +lisp_local_eid vni 200 eid 6.0.4.0/24 locator-set ls1 diff --git a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat deleted file mode 100644 index dd01932..0000000 --- a/tests/data_plane/configs/vpp_lite_config/eid_virt/4o4/vpp2.vat +++ /dev/null @@ -1,14 +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_set locator-set ls2 - -lisp_add_del_locator locator-set ls1 iface host-intervpp2 p 1 w 1 -lisp_add_del_locator locator-set ls2 iface host-intervpp2 p 1 w 1 - -lisp_eid_table_add_del_map vni 200 vrf 200 -lisp_eid_table_add_del_map vni 100 vrf 100 - -lisp_add_del_local_eid vni 100 eid 6.0.4.0/24 locator-set ls1 -lisp_add_del_local_eid vni 200 eid 6.0.4.0/24 locator-set ls2 |