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/smr_rtr_disjoint | |
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/smr_rtr_disjoint')
7 files changed, 23 insertions, 45 deletions
diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config deleted file mode 100644 index 07867ac..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/rtr.config +++ /dev/null @@ -1,7 +0,0 @@ -create host-interface name rtr_wan4 -set int state host-rtr_wan4 up -set int ip address host-rtr_wan4 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 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config index c36f223..a7c0eca 100644 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.config @@ -1,6 +1,7 @@ -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_wan4 -set int state host-vpp1_wan4 up -set int ip address host-vpp1_wan4 6.0.3.1/24 +create_host_iface vpp1 6:0:2::1/64 +create_host_iface vpp1_wan4 6.0.3.1/24 + +lisp_state enable +lisp_locator_set_with_locator ls1 host-vpp1_wan4 1 1 +lisp_local_eid eid 6:0:2::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat deleted file mode 100644 index 72d41e1..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp1.vat +++ /dev/null @@ -1,6 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-vpp1_wan4 p 1 w 1 -lisp_add_del_local_eid eid 6:0:2::0/64 locator-set ls1 -lisp_add_del_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config index 8069507..794ff84 100644 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.config @@ -1,9 +1,8 @@ -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 -create host-interface name vpp2_wan4 -set int state host-vpp2_wan4 up -set int ip address host-vpp2_wan4 6.0.3.3/24 +create_host_iface vpp2 6:0:4::1/64 +create_host_iface vpp2_rtr 6:0:5::1/64 +create_host_iface vpp2_wan4 6.0.3.3/24 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-vpp2_rtr p 1 w 1 iface host-vpp2_wan4 p 1 w 1 +lisp_local_eid eid 6:0:4::0/64 locator-set ls1 +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat deleted file mode 100644 index 304d7b4..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp2.vat +++ /dev/null @@ -1,7 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-vpp2_wan4 p 1 w 1 -lisp_add_del_locator locator-set ls1 iface host-vpp2_rtr p 1 w 1 -lisp_add_del_local_eid eid 6:0:4::0/64 locator-set ls1 -lisp_add_del_map_resolver 6:0:5::100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config new file mode 100644 index 0000000..b87a7d0 --- /dev/null +++ b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.config @@ -0,0 +1,8 @@ +create_host_iface rtr_wan4 6.0.3.2/24 +create_host_iface rtr_vpp2 6:0:5::2/64 + +lisp_state enable +lisp_ls_multiple_locs ls1 iface host-rtr_wan4 p 1 w 1 iface host-rtr_vpp2 p 1 w 1 +lisp_pitr ls1 +lisp_remote_mapping eid 6:0:0::0/32 action send-map-request +lisp_map_resolver 6.0.3.100 diff --git a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat deleted file mode 100644 index e38aadf..0000000 --- a/tests/data_plane/configs/vpp_lite_config/smr_rtr_disjoint/vpp3.vat +++ /dev/null @@ -1,10 +0,0 @@ -lisp_enable_disable enable - -lisp_add_del_locator_set locator-set ls1 -lisp_add_del_locator locator-set ls1 iface host-rtr_wan4 p 1 w 1 -lisp_add_del_locator locator-set ls1 iface host-rtr_vpp2 p 1 w 1 - -lisp_pitr_set_locator_set locator-set ls1 - -lisp_add_del_remote_mapping add deid 6:0:0::0/32 action 2 -lisp_add_del_map_resolver 6.0.3.100 |