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>

7 files changed, 19 insertions, 35 deletions

diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
deleted file mode 100644
index 7fd2b6f..0000000
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/rtr.config
+++ /dev/null
@@ -1,3 +0,0 @@
-create host-interface name xtr_rtr2
-set int state host-xtr_rtr2 up
-set int ip address host-xtr_rtr2 6.0.3.3/24
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
index 32089a2..46a3c98 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.config
@@ -1,7 +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_iface vpp1 6:0:2::1/64
+create_host_iface xtr_rtr1 6.0.3.1/24
 
-create host-interface name xtr_rtr1
-set int state host-xtr_rtr1 up
-set int ip address host-xtr_rtr1 6.0.3.1/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr1 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/rtr_single_iface/6o4/vpp1.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp1.vat
deleted file mode 100644
index 097cc6b..0000000
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/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-xtr_rtr1 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/rtr_single_iface/6o4/vpp2.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
index 97a15c4..240993a 100644
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.config
@@ -1,7 +1,7 @@
-create host-interface name vpp2
-set int state host-vpp2 up
-set int ip address host-vpp2 6:0:4::1/64
+create_host_iface vpp2 6:0:4::1/64
+create_host_iface xtr_rtr3 6.0.3.2/24
 
-create host-interface name xtr_rtr3
-set int state host-xtr_rtr3 up
-set int ip address host-xtr_rtr3 6.0.3.2/24
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr3 1 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/rtr_single_iface/6o4/vpp2.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.vat
deleted file mode 100644
index ff1db3a..0000000
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp2.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-xtr_rtr3 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.3.100
diff --git a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config
new file mode 100644
index 0000000..48c6ecb
--- /dev/null
+++ b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.config
@@ -0,0 +1,7 @@
+create_host_iface xtr_rtr2 6.0.3.3/24
+
+lisp_state enable
+lisp_locator_set_with_locator ls1 host-xtr_rtr2 1 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/rtr_single_iface/6o4/vpp3.vat b/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.vat
deleted file mode 100644
index 4feb7b8..0000000
--- a/tests/data_plane/configs/vpp_lite_config/rtr_single_iface/6o4/vpp3.vat
+++ /dev/null
@@ -1,8 +0,0 @@
-lisp_enable_disable enable
-
-lisp_add_del_locator_set locator-set ls1
-lisp_add_del_locator locator-set ls1 iface host-xtr_rtr2 p 1 w 1
-
-lisp_pitr_set_locator_set locator-set ls1
-lisp_add_del_remote_mapping add vni 0 deid 6:0:0::0/64 action 2
-lisp_add_del_map_resolver 6.0.3.100