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/vpp_lite_topo/topologies/smr_rtr_disjoint.sh | |
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/vpp_lite_topo/topologies/smr_rtr_disjoint.sh')
-rw-r--r-- | tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh index 2b50cc9..e18d229 100644 --- a/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh +++ b/tests/data_plane/vpp_lite_topo/topologies/smr_rtr_disjoint.sh @@ -115,29 +115,29 @@ function smr_rtr_disjoint_setup { 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} - - sleep 2 - ${VPP_API_TEST} chroot prefix xtr1 script in ${VPP_LITE_CONF}/vpp1.vat - ${VPP_API_TEST} chroot prefix xtr2 script in ${VPP_LITE_CONF}/vpp2.vat - ${VPP_API_TEST} chroot prefix rtr script in ${VPP_LITE_CONF}/vpp3.vat - + # generate config files + ./scripts/generate_config.py ${VPP_LITE_CONF} ${CFG_METHOD} + + start_vpp 5002 vpp1 + start_vpp 5003 vpp2 + start_vpp 5004 vpp3 + + echo "* Selected configuration method: $CFG_METHOD" + if [ "$CFG_METHOD" == "cli" ] ; then + echo "exec ${VPP_LITE_CONF}/vpp1.cli" | nc 0 5002 + echo "exec ${VPP_LITE_CONF}/vpp2.cli" | nc 0 5003 + echo "exec ${VPP_LITE_CONF}/vpp3.cli" | nc 0 5004 + elif [ "$CFG_METHOD" == "vat" ] ; then + sleep 2 + ${VPP_API_TEST} chroot prefix vpp1 script in ${VPP_LITE_CONF}/vpp1.vat + ${VPP_API_TEST} chroot prefix vpp2 script in ${VPP_LITE_CONF}/vpp2.vat + ${VPP_API_TEST} chroot prefix vpp3 script in ${VPP_LITE_CONF}/vpp3.vat + else + echo "=== WARNING:" + echo "=== Invalid configuration method selected!" + echo "=== To resolve this set env variable CFG_METHOD to vat or cli." + echo "===" + fi post_curl "add-mapping" ${ODL_CONFIG_FILE1} post_curl "add-mapping" ${ODL_CONFIG_FILE2} } |