tests: move vapi C/C++ test files into src/

Type: improvement
Change-Id: Iaad004661db1e9076e6c27227878f1612fa7289f
Signed-off-by: Damjan Marion <damarion@cisco.com>
Signed-off-by: Klement Sekera <ksekera@cisco.com>

6 files changed, 9 insertions, 1562 deletions

diff --git a/test/Makefile b/test/Makefile
index 82095883b55..6726ac3e1e2 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -194,10 +194,6 @@ sanity: test-dep
 	         echo \"*******************************************************************\" &&\
 		 false)"
 
-.PHONY: ext-test-apps
-ext-test-apps:
-	make -C ext test-apps
-
 $(FAILED_DIR): reset
 	@mkdir -p $@
 
@@ -205,7 +201,7 @@ $(FAILED_DIR): reset
 test-dep: $(PAPI_INSTALL_DONE) $(FAILED_DIR)
 
 .PHONY: test
-test: test-dep ext-test-apps sanity
+test: test-dep sanity
 	$(call retest-func)
 
 .PHONY: retest
diff --git a/test/ext/Makefile b/test/ext/Makefile
deleted file mode 100644
index bc2061446f4..00000000000
--- a/test/ext/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-TEST_EXT_DIR=$(TEST_DIR)/ext
-VAPI_BINDIR = $(TEST_BR)/vapi_test
-VAPI_CBIN = $(addprefix $(VAPI_BINDIR), /vapi_c_test)
-VAPI_CPPBIN = $(addprefix $(VAPI_BINDIR), /vapi_cpp_test)
-
-VAPI_LIBS = \
-  -L$(VPP_INSTALL_PATH)/vpp/lib \
-  -lvppinfra -lvlibmemoryclient -lsvm -lpthread -lcheck -lrt -lm -lvapiclient
-
-ifneq ($(filter centos,$(OS_ID)),$(OS_ID))
-VAPI_LIBS += -lsubunit
-endif
-
-FLAGS = -g -Wall -lstdc++ -pthread -I$(WS_ROOT)/src -I$(VPP_INSTALL_PATH)/vpp/include -I$(VAPI_BINDIR)
-CFLAGS = -std=gnu99 $(FLAGS)
-CPPFLAGS = -std=c++11 $(FLAGS)
-
-$(VAPI_BINDIR):
-	@mkdir -p $(VAPI_BINDIR)
-
-CSRC = $(TEST_EXT_DIR)/vapi_c_test.c
-
-$(VAPI_BINDIR)/fake.api.vapi.h: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_c_gen.py | $(VAPI_BINDIR)
-	$(WS_ROOT)/src/vpp-api/vapi/vapi_c_gen.py --prefix $(VAPI_BINDIR) $<
-
-$(VAPI_BINDIR)/fake.api.vapi.hpp: fake.api.json $(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py | $(VAPI_BINDIR)
-	$(WS_ROOT)/src/vpp-api/vapi/vapi_cpp_gen.py --prefix $(VAPI_BINDIR) $<
-
-$(VAPI_CBIN): $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h | $(VAPI_BINDIR)
-	$(CC) -o $@ $(CFLAGS) $(CSRC) $(VAPI_LIBS)
-
-$(VAPI_CBIN).d: $(CSRC) $(VAPI_BINDIR)/fake.api.vapi.h
-	$(CC) -o $@ $(CFLAGS) -MM -MT '$(VAPI_CBIN)' $(CSRC) > $@
-
-
-ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID) AND $(OS_VERSION_ID),7)
-VAPI_CPPBIN=
-else
-CPPSRC = $(TEST_EXT_DIR)/vapi_cpp_test.cpp
-
-$(VAPI_CPPBIN): $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp | $(VAPI_BINDIR)
-	$(CXX) -o $@ $(CPPFLAGS) $(CPPSRC) $(VAPI_LIBS)
-
-$(VAPI_CPPBIN).d: $(CPPSRC) $(VAPI_BINDIR)/fake.api.vapi.hpp
-	$(CXX) -o $@ $(CPPFLAGS) -MM -MT '$(VAPI_CPPBIN)' $(CPPSRC) > $@
-endif
-
-.PHONY: test-apps
-test-apps: $(VAPI_CBIN) $(VAPI_CPPBIN)
-
-.PHONY: clean
-clean:
-	@rm -rf $(VAPI_BINDIR)
-
-ifneq ($(MAKECMDGOALS),clean)
--include $(VAPI_CBIN).d
-ifneq ($(VAPI_CPPBIN),)
--include $(VAPI_CPPBIN).d
-endif
-endif
diff --git a/test/ext/fake.api.json b/test/ext/fake.api.json
deleted file mode 100644
index 24c9f4dbfa1..00000000000
--- a/test/ext/fake.api.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "services": {
-	    "test_fake_msg": {
-		    "reply":"test_fake_msg_reply"
-	    },
-	    "test_fake_dump": {
-		    "reply":"test_fake_details",
-		    "stream":"true"
-	    }
-    },
-    "enums" : [
-    ],
-    "unions" : [
-    ],
-    "types" : [
-    ],
-    "messages" : [
-        ["test_fake_msg",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u8", "dummy", 256],
-            {"crc" : "0xcafebafe"}
-        ],
-        ["test_fake_msg_reply",
-            ["u16", "_vl_msg_id"],
-            ["u32", "context"],
-            ["i32", "retval"],
-            {"crc" : "0xcafebafe"}
-        ],
-	["test_fake_dump",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u32", "dummy"],
-            {"crc" : "0xcafebafe"}
-	],
-        ["test_fake_details",
-            ["u16", "_vl_msg_id"],
-            ["u32", "client_index"],
-            ["u32", "context"],
-            ["u32", "dummy"],
-            {"crc" : "0xcafebafe"}
-        ]
-    ],
-    "aliases" : {
-    },
-"vl_api_version" :"0x224c7aad"
-}
diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c
deleted file mode 100644
index efa6a735611..00000000000
--- a/test/ext/vapi_c_test.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <endian.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <setjmp.h>
-#include <check.h>
-#include <vppinfra/string.h>
-#include <vapi/vapi.h>
-#include <vapi/vpe.api.vapi.h>
-#include <vapi/interface.api.vapi.h>
-#include <vapi/l2.api.vapi.h>
-#include <fake.api.vapi.h>
-
-#include <vppinfra/vec.h>
-#include <vppinfra/mem.h>
-
-DEFINE_VAPI_MSG_IDS_VPE_API_JSON;
-DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON;
-DEFINE_VAPI_MSG_IDS_L2_API_JSON;
-DEFINE_VAPI_MSG_IDS_FAKE_API_JSON;
-
-static char *app_name = NULL;
-static char *api_prefix = NULL;
-static const int max_outstanding_requests = 64;
-static const int response_queue_size = 32;
-
-/* centos has ancient check so we hack our way around here
- * to make it work somehow */
-#ifndef ck_assert_ptr_eq
-#define ck_assert_ptr_eq(X,Y) ck_assert_int_eq((long)X, (long)Y)
-#endif
-
-#ifndef ck_assert_ptr_ne
-#define ck_assert_ptr_ne(X,Y) ck_assert_int_ne((long)X, (long)Y)
-#endif
-
-START_TEST (test_invalid_values)
-{
-  vapi_ctx_t ctx;
-  vapi_error_e rv = vapi_ctx_alloc (&ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_eq (NULL, sv);
-  rv = vapi_send (ctx, sv);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING, true);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_send (ctx, NULL);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_send (NULL, NULL);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_recv (NULL, NULL, NULL, 0, 0);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_recv (ctx, NULL, NULL, 0, 0);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  vapi_msg_show_version_reply *reply;
-  rv = vapi_recv (ctx, (void **) &reply, NULL, 0, 0);
-  ck_assert_int_eq (VAPI_EINVAL, rv);
-  rv = vapi_disconnect (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  vapi_ctx_free (ctx);
-}
-
-END_TEST;
-
-START_TEST (test_hton_1)
-{
-  const u16 _vl_msg_id = 1;
-  vapi_type_msg_header1_t h;
-  h._vl_msg_id = _vl_msg_id;
-  vapi_type_msg_header1_t_hton (&h);
-  ck_assert_int_eq (be16toh (h._vl_msg_id), _vl_msg_id);
-}
-
-END_TEST;
-
-START_TEST (test_hton_2)
-{
-  const u16 _vl_msg_id = 1;
-  const u32 client_index = 3;
-  vapi_type_msg_header2_t h;
-  h._vl_msg_id = _vl_msg_id;
-  h.client_index = client_index;
-  vapi_type_msg_header2_t_hton (&h);
-  ck_assert_int_eq (be16toh (h._vl_msg_id), _vl_msg_id);
-  ck_assert_int_eq (h.client_index, client_index);
-}
-
-END_TEST;
-
-#define verify_hton_swap(expr, value)           \
-  if (4 == sizeof (expr))                       \
-    {                                           \
-      ck_assert_int_eq (expr, htobe32 (value)); \
-    }                                           \
-  else if (2 == sizeof (expr))                  \
-    {                                           \
-      ck_assert_int_eq (expr, htobe16 (value)); \
-    }                                           \
-  else                                          \
-    {                                           \
-      ck_assert_int_eq (expr, value);           \
-    }
-
-START_TEST (test_hton_4)
-{
-  const int vla_count = 3;
-  char x[sizeof (vapi_msg_bridge_domain_details) +
-	 vla_count * sizeof (vapi_type_bridge_domain_sw_if)];
-  vapi_msg_bridge_domain_details *d = (void *) x;
-  int cnt = 1;
-  d->header._vl_msg_id = cnt++;
-  d->header.context = cnt++;
-  d->payload.bd_id = cnt++;
-  d->payload.mac_age = cnt++;
-  d->payload.bvi_sw_if_index = cnt++;
-  d->payload.n_sw_ifs = vla_count;
-  int i;
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      det->context = cnt++;
-      det->sw_if_index = cnt++;
-      det->shg = cnt++;
-    }
-  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
-  vapi_msg_bridge_domain_details_hton (d);
-  int tmp = 1;
-  verify_hton_swap (d->header._vl_msg_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->header.context, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.bd_id, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.mac_age, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.bvi_sw_if_index, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.n_sw_ifs, htobe32 (vla_count));
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      verify_hton_swap (det->context, tmp);
-      ++tmp;
-      verify_hton_swap (det->sw_if_index, tmp);
-      ++tmp;
-      verify_hton_swap (det->shg, tmp);
-      ++tmp;
-    }
-  vapi_msg_bridge_domain_details_ntoh (d);
-  tmp = 1;
-  ck_assert_int_eq (d->header._vl_msg_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->header.context, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.bd_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.mac_age, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.n_sw_ifs, vla_count);
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      ck_assert_int_eq (det->context, tmp);
-      ++tmp;
-      ck_assert_int_eq (det->sw_if_index, tmp);
-      ++tmp;
-      ck_assert_int_eq (det->shg, tmp);
-      ++tmp;
-    }
-  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
-}
-
-END_TEST;
-
-START_TEST (test_ntoh_1)
-{
-  const u16 _vl_msg_id = 1;
-  vapi_type_msg_header1_t h;
-  h._vl_msg_id = _vl_msg_id;
-  vapi_type_msg_header1_t_ntoh (&h);
-  ck_assert_int_eq (htobe16 (h._vl_msg_id), _vl_msg_id);
-}
-
-END_TEST;
-
-START_TEST (test_ntoh_2)
-{
-  const u16 _vl_msg_id = 1;
-  const u32 client_index = 3;
-  vapi_type_msg_header2_t h;
-  h._vl_msg_id = _vl_msg_id;
-  h.client_index = client_index;
-  vapi_type_msg_header2_t_ntoh (&h);
-  ck_assert_int_eq (htobe16 (h._vl_msg_id), _vl_msg_id);
-  ck_assert_int_eq (h.client_index, client_index);
-}
-
-END_TEST;
-
-#define verify_ntoh_swap(expr, value)           \
-  if (4 == sizeof (expr))                       \
-    {                                           \
-      ck_assert_int_eq (expr, be32toh (value)); \
-    }                                           \
-  else if (2 == sizeof (expr))                  \
-    {                                           \
-      ck_assert_int_eq (expr, be16toh (value)); \
-    }                                           \
-  else                                          \
-    {                                           \
-      ck_assert_int_eq (expr, value);           \
-    }
-
-START_TEST (test_ntoh_4)
-{
-  const int vla_count = 3;
-  char x[sizeof (vapi_msg_bridge_domain_details) +
-	 vla_count * sizeof (vapi_type_bridge_domain_sw_if)];
-  vapi_msg_bridge_domain_details *d = (void *) x;
-  int cnt = 1;
-  d->header._vl_msg_id = cnt++;
-  d->header.context = cnt++;
-  d->payload.bd_id = cnt++;
-  d->payload.mac_age = cnt++;
-  d->payload.bvi_sw_if_index = cnt++;
-  d->payload.n_sw_ifs = htobe32 (vla_count);
-  int i;
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      det->context = cnt++;
-      det->sw_if_index = cnt++;
-      det->shg = cnt++;
-    }
-  vapi_msg_bridge_domain_details_ntoh (d);
-  ck_assert_int_eq (sizeof (x), vapi_calc_bridge_domain_details_msg_size (d));
-  int tmp = 1;
-  verify_ntoh_swap (d->header._vl_msg_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->header.context, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.bd_id, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.mac_age, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.bvi_sw_if_index, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.n_sw_ifs, vla_count);
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      verify_ntoh_swap (det->context, tmp);
-      ++tmp;
-      verify_ntoh_swap (det->sw_if_index, tmp);
-      ++tmp;
-      verify_ntoh_swap (det->shg, tmp);
-      ++tmp;
-    }
-  vapi_msg_bridge_domain_details_hton (d);
-  tmp = 1;
-  ck_assert_int_eq (d->header._vl_msg_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->header.context, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.bd_id, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.mac_age, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.n_sw_ifs, htobe32 (vla_count));
-  for (i = 0; i < vla_count; ++i)
-    {
-      vapi_type_bridge_domain_sw_if *det = &d->payload.sw_if_details[i];
-      ck_assert_int_eq (det->context, tmp);
-      ++tmp;
-      ck_assert_int_eq (det->sw_if_index, tmp);
-      ++tmp;
-      ck_assert_int_eq (det->shg, tmp);
-      ++tmp;
-    }
-}
-
-END_TEST;
-
-vapi_error_e
-show_version_cb (vapi_ctx_t ctx, void *caller_ctx,
-		 vapi_error_e rv, bool is_last,
-		 vapi_payload_show_version_reply * p)
-{
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (true, is_last);
-  ck_assert_str_eq ("vpe", (char *) p->program);
-  printf
-    ("show_version_reply: program: `%s', version: `%s', build directory: "
-     "`%s', build date: `%s'\n", p->program, p->version, p->build_directory,
-     p->build_date);
-  ++*(int *) caller_ctx;
-  return VAPI_OK;
-}
-
-typedef struct
-{
-  int called;
-  int expected_retval;
-  u32 *sw_if_index_storage;
-} test_create_loopback_ctx_t;
-
-vapi_error_e
-loopback_create_cb (vapi_ctx_t ctx, void *caller_ctx,
-		    vapi_error_e rv, bool is_last,
-		    vapi_payload_create_loopback_reply * p)
-{
-  test_create_loopback_ctx_t *clc = caller_ctx;
-  ck_assert_int_eq (clc->expected_retval, p->retval);
-  *clc->sw_if_index_storage = p->sw_if_index;
-  ++clc->called;
-  return VAPI_OK;
-}
-
-typedef struct
-{
-  int called;
-  int expected_retval;
-  u32 *sw_if_index_storage;
-} test_delete_loopback_ctx_t;
-
-vapi_error_e
-loopback_delete_cb (vapi_ctx_t ctx, void *caller_ctx,
-		    vapi_error_e rv, bool is_last,
-		    vapi_payload_delete_loopback_reply * p)
-{
-  test_delete_loopback_ctx_t *dlc = caller_ctx;
-  ck_assert_int_eq (dlc->expected_retval, p->retval);
-  ++dlc->called;
-  return VAPI_OK;
-}
-
-START_TEST (test_connect)
-{
-  vapi_ctx_t ctx;
-  vapi_error_e rv = vapi_ctx_alloc (&ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING, true);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_disconnect (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  vapi_ctx_free (ctx);
-}
-
-END_TEST;
-
-vapi_ctx_t ctx;
-
-void
-setup_blocking (void)
-{
-  vapi_error_e rv = vapi_ctx_alloc (&ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_BLOCKING, true);
-  ck_assert_int_eq (VAPI_OK, rv);
-}
-
-void
-setup_nonblocking (void)
-{
-  vapi_error_e rv = vapi_ctx_alloc (&ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_connect (ctx, app_name, api_prefix, max_outstanding_requests,
-		     response_queue_size, VAPI_MODE_NONBLOCKING, true);
-  ck_assert_int_eq (VAPI_OK, rv);
-}
-
-void
-teardown (void)
-{
-  vapi_disconnect (ctx);
-  vapi_ctx_free (ctx);
-}
-
-START_TEST (test_show_version_1)
-{
-  printf ("--- Basic show version message - reply test ---\n");
-  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  vapi_msg_show_version_hton (sv);
-  vapi_error_e rv = vapi_send (ctx, sv);
-  ck_assert_int_eq (VAPI_OK, rv);
-  vapi_msg_show_version_reply *resp;
-  size_t size;
-  rv = vapi_recv (ctx, (void *) &resp, &size, 0, 0);
-  ck_assert_int_eq (VAPI_OK, rv);
-  int placeholder;
-  show_version_cb (NULL, &placeholder, VAPI_OK, true, &resp->payload);
-  vapi_msg_free (ctx, resp);
-}
-
-END_TEST;
-
-START_TEST (test_show_version_2)
-{
-  int called = 0;
-  printf ("--- Show version via blocking callback API ---\n");
-  const int attempts = response_queue_size * 4;
-  int i = 0;
-  for (i = 0; i < attempts; ++i)
-    {
-      vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-      ck_assert_ptr_ne (NULL, sv);
-      vapi_error_e rv = vapi_show_version (ctx, sv, show_version_cb, &called);
-      ck_assert_int_eq (VAPI_OK, rv);
-    }
-  ck_assert_int_eq (attempts, called);
-}
-
-END_TEST;
-
-typedef struct
-{
-  bool last_called;
-  size_t num_ifs;
-  u32 *sw_if_indexes;
-  bool *seen;
-  int called;
-} sw_interface_dump_ctx;
-
-vapi_error_e
-sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
-		      vapi_error_e rv, bool is_last,
-		      vapi_payload_sw_interface_details * reply)
-{
-  sw_interface_dump_ctx *dctx = callback_ctx;
-  ck_assert_int_eq (false, dctx->last_called);
-  if (is_last)
-    {
-      ck_assert (NULL == reply);
-      dctx->last_called = true;
-    }
-  else
-    {
-      ck_assert (NULL != reply);
-      printf ("Interface dump entry: [%u]: %s\n", reply->sw_if_index,
-	      reply->interface_name);
-      size_t i = 0;
-      for (i = 0; i < dctx->num_ifs; ++i)
-	{
-	  if (dctx->sw_if_indexes[i] == reply->sw_if_index)
-	    {
-	      ck_assert_int_eq (false, dctx->seen[i]);
-	      dctx->seen[i] = true;
-	    }
-	}
-    }
-  ++dctx->called;
-  return VAPI_OK;
-}
-
-START_TEST (test_loopbacks_1)
-{
-  printf ("--- Create/delete loopbacks using blocking API ---\n");
-  const size_t num_ifs = 5;
-  u8 mac_addresses[num_ifs][6];
-  clib_memset (&mac_addresses, 0, sizeof (mac_addresses));
-  u32 sw_if_indexes[num_ifs];
-  clib_memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
-  test_create_loopback_ctx_t clcs[num_ifs];
-  clib_memset (&clcs, 0, sizeof (clcs));
-  test_delete_loopback_ctx_t dlcs[num_ifs];
-  clib_memset (&dlcs, 0, sizeof (dlcs));
-  int i;
-  for (i = 0; i < num_ifs; ++i)
-    {
-      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
-      mac_addresses[i][5] = i;
-      clcs[i].sw_if_index_storage = &sw_if_indexes[i];
-    }
-  for (i = 0; i < num_ifs; ++i)
-    {
-      vapi_msg_create_loopback *cl = vapi_alloc_create_loopback (ctx);
-      memcpy (cl->payload.mac_address, mac_addresses[i],
-	      sizeof (cl->payload.mac_address));
-      vapi_error_e rv =
-	vapi_create_loopback (ctx, cl, loopback_create_cb, &clcs[i]);
-      ck_assert_int_eq (VAPI_OK, rv);
-    }
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (1, clcs[i].called);
-      printf ("Created loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
-	      "sw_if_index %u\n",
-	      mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
-	      mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
-	      sw_if_indexes[i]);
-    }
-  bool seen[num_ifs];
-  sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
-  vapi_msg_sw_interface_dump *dump;
-  vapi_error_e rv;
-  const int attempts = response_queue_size * 4;
-  for (i = 0; i < attempts; ++i)
-    {
-      dctx.last_called = false;
-      clib_memset (&seen, 0, sizeof (seen));
-      dump = vapi_alloc_sw_interface_dump (ctx);
-      while (VAPI_EAGAIN ==
-	     (rv =
-	      vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb,
-				      &dctx)))
-	;
-      ck_assert_int_eq (true, dctx.last_called);
-      int j = 0;
-      for (j = 0; j < num_ifs; ++j)
-	{
-	  ck_assert_int_eq (true, seen[j]);
-	}
-    }
-  clib_memset (&seen, 0, sizeof (seen));
-  for (i = 0; i < num_ifs; ++i)
-    {
-      vapi_msg_delete_loopback *dl = vapi_alloc_delete_loopback (ctx);
-      dl->payload.sw_if_index = sw_if_indexes[i];
-      vapi_error_e rv =
-	vapi_delete_loopback (ctx, dl, loopback_delete_cb, &dlcs[i]);
-      ck_assert_int_eq (VAPI_OK, rv);
-    }
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (1, dlcs[i].called);
-      printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
-    }
-  dctx.last_called = false;
-  clib_memset (&seen, 0, sizeof (seen));
-  dump = vapi_alloc_sw_interface_dump (ctx);
-  while (VAPI_EAGAIN ==
-	 (rv =
-	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
-    ;
-  ck_assert_int_eq (true, dctx.last_called);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (false, seen[i]);
-    }
-}
-
-END_TEST;
-
-START_TEST (test_show_version_3)
-{
-  printf ("--- Show version via async callback ---\n");
-  int called = 0;
-  vapi_error_e rv;
-  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  while (VAPI_EAGAIN ==
-	 (rv = vapi_show_version (ctx, sv, show_version_cb, &called)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (0, called);
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (1, called);
-  called = 0;
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (0, called);
-}
-
-END_TEST;
-
-START_TEST (test_show_version_4)
-{
-  printf ("--- Show version via async callback - multiple messages ---\n");
-  vapi_error_e rv;
-  const size_t num_req = 5;
-  int contexts[num_req];
-  clib_memset (contexts, 0, sizeof (contexts));
-  int i;
-  for (i = 0; i < num_req; ++i)
-    {
-      vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-      ck_assert_ptr_ne (NULL, sv);
-      while (VAPI_EAGAIN ==
-	     (rv =
-	      vapi_show_version (ctx, sv, show_version_cb, &contexts[i])))
-	;
-      ck_assert_int_eq (VAPI_OK, rv);
-      int j;
-      for (j = 0; j < num_req; ++j)
-	{
-	  ck_assert_int_eq (0, contexts[j]);
-	}
-    }
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_req; ++i)
-    {
-      ck_assert_int_eq (1, contexts[i]);
-    }
-  clib_memset (contexts, 0, sizeof (contexts));
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_req; ++i)
-    {
-      ck_assert_int_eq (0, contexts[i]);
-    }
-}
-
-END_TEST;
-
-START_TEST (test_loopbacks_2)
-{
-  printf ("--- Create/delete loopbacks using non-blocking API ---\n");
-  vapi_error_e rv;
-  const size_t num_ifs = 5;
-  u8 mac_addresses[num_ifs][6];
-  clib_memset (&mac_addresses, 0, sizeof (mac_addresses));
-  u32 sw_if_indexes[num_ifs];
-  clib_memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
-  test_create_loopback_ctx_t clcs[num_ifs];
-  clib_memset (&clcs, 0, sizeof (clcs));
-  test_delete_loopback_ctx_t dlcs[num_ifs];
-  clib_memset (&dlcs, 0, sizeof (dlcs));
-  int i;
-  for (i = 0; i < num_ifs; ++i)
-    {
-      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
-      mac_addresses[i][5] = i;
-      clcs[i].sw_if_index_storage = &sw_if_indexes[i];
-    }
-  for (i = 0; i < num_ifs; ++i)
-    {
-      vapi_msg_create_loopback *cl = vapi_alloc_create_loopback (ctx);
-      memcpy (cl->payload.mac_address, mac_addresses[i],
-	      sizeof (cl->payload.mac_address));
-      while (VAPI_EAGAIN ==
-	     (rv =
-	      vapi_create_loopback (ctx, cl, loopback_create_cb, &clcs[i])))
-	;
-      ck_assert_int_eq (VAPI_OK, rv);
-    }
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (1, clcs[i].called);
-      printf ("Loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
-	      "sw_if_index %u\n",
-	      mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
-	      mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
-	      sw_if_indexes[i]);
-    }
-  bool seen[num_ifs];
-  clib_memset (&seen, 0, sizeof (seen));
-  sw_interface_dump_ctx dctx = { false, num_ifs, sw_if_indexes, seen, 0 };
-  vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
-  while (VAPI_EAGAIN ==
-	 (rv =
-	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
-    ;
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (false, seen[i]);
-    }
-  clib_memset (&seen, 0, sizeof (seen));
-  ck_assert_int_eq (false, dctx.last_called);
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (true, seen[i]);
-    }
-  clib_memset (&seen, 0, sizeof (seen));
-  ck_assert_int_eq (true, dctx.last_called);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      vapi_msg_delete_loopback *dl = vapi_alloc_delete_loopback (ctx);
-      dl->payload.sw_if_index = sw_if_indexes[i];
-      while (VAPI_EAGAIN ==
-	     (rv =
-	      vapi_delete_loopback (ctx, dl, loopback_delete_cb, &dlcs[i])))
-	;
-      ck_assert_int_eq (VAPI_OK, rv);
-    }
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (1, dlcs[i].called);
-      printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
-    }
-  clib_memset (&seen, 0, sizeof (seen));
-  dctx.last_called = false;
-  dump = vapi_alloc_sw_interface_dump (ctx);
-  while (VAPI_EAGAIN ==
-	 (rv =
-	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
-    ;
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  for (i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (false, seen[i]);
-    }
-  clib_memset (&seen, 0, sizeof (seen));
-  ck_assert_int_eq (true, dctx.last_called);
-}
-
-END_TEST;
-
-vapi_error_e
-generic_cb (vapi_ctx_t ctx, void *callback_ctx, vapi_msg_id_t id, void *msg)
-{
-  int *called = callback_ctx;
-  ck_assert_int_eq (0, *called);
-  ++*called;
-  ck_assert_int_eq (id, vapi_msg_id_show_version_reply);
-  ck_assert_ptr_ne (NULL, msg);
-  vapi_msg_show_version_reply *reply = msg;
-  ck_assert_str_eq ("vpe", (char *) reply->payload.program);
-  return VAPI_OK;
-}
-
-START_TEST (test_show_version_5)
-{
-  printf ("--- Receive show version using generic callback - nonblocking "
-	  "API ---\n");
-  vapi_error_e rv;
-  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  vapi_msg_show_version_hton (sv);
-  while (VAPI_EAGAIN == (rv = vapi_send (ctx, sv)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  int called = 0;
-  vapi_set_generic_event_cb (ctx, generic_cb, &called);
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_dispatch_one (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (1, called);
-  sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  vapi_msg_show_version_hton (sv);
-  while (VAPI_EAGAIN == (rv = vapi_send (ctx, sv)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  vapi_clear_generic_event_cb (ctx);
-  rv = vapi_dispatch_one (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (1, called);	/* needs to remain unchanged */
-}
-
-END_TEST;
-
-vapi_error_e
-show_version_no_cb (vapi_ctx_t ctx, void *caller_ctx,
-		    vapi_error_e rv, bool is_last,
-		    vapi_payload_show_version_reply * p)
-{
-  ck_assert_int_eq (VAPI_ENORESP, rv);
-  ck_assert_int_eq (true, is_last);
-  ck_assert_ptr_eq (NULL, p);
-  ++*(int *) caller_ctx;
-  return VAPI_OK;
-}
-
-START_TEST (test_no_response_1)
-{
-  printf ("--- Simulate no response to regular message ---\n");
-  vapi_error_e rv;
-  vapi_msg_show_version *sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  sv->header._vl_msg_id = ~0;	/* malformed ID causes vpp to drop the msg */
-  int called = 0;
-  while (VAPI_EAGAIN ==
-	 (rv = vapi_show_version (ctx, sv, show_version_no_cb, &called)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  sv = vapi_alloc_show_version (ctx);
-  ck_assert_ptr_ne (NULL, sv);
-  while (VAPI_EAGAIN ==
-	 (rv = vapi_show_version (ctx, sv, show_version_cb, &called)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (2, called);
-}
-
-END_TEST;
-
-vapi_error_e
-no_msg_cb (struct vapi_ctx_s *ctx, void *callback_ctx,
-	   vapi_error_e rv, bool is_last,
-	   vapi_payload_sw_interface_details * reply)
-{
-  int *called = callback_ctx;
-  ++*called;
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (true, is_last);
-  ck_assert_ptr_eq (NULL, reply);
-  return VAPI_OK;
-}
-
-START_TEST (test_no_response_2)
-{
-  printf ("--- Simulate no response to dump message ---\n");
-  vapi_error_e rv;
-  vapi_msg_sw_interface_dump *dump = vapi_alloc_sw_interface_dump (ctx);
-  dump->header._vl_msg_id = ~0;	/* malformed ID causes vpp to drop the msg */
-  int no_called = 0;
-  while (VAPI_EAGAIN ==
-	 (rv = vapi_sw_interface_dump (ctx, dump, no_msg_cb, &no_called)))
-    ;
-  ck_assert_int_eq (VAPI_OK, rv);
-  rv = vapi_dispatch (ctx);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_eq (1, no_called);
-}
-
-END_TEST;
-
-START_TEST (test_unsupported)
-{
-  printf ("--- Unsupported messages ---\n");
-  bool available = vapi_is_msg_available (ctx, vapi_msg_id_test_fake_msg);
-  ck_assert_int_eq (false, available);
-}
-
-END_TEST;
-
-START_TEST (test_api_strings)
-{
-  printf ("--- Invalid api strings ---\n");
-
-  /* test string 'TEST'
-   * size = 5
-   * length = 4
-   */
-  const char str[] = "TEST";
-  u8 *vec_str = 0, *vstr = 0;
-  char *cstr;
-
-  vapi_msg_sw_interface_dump *dump =
-    malloc (sizeof (vapi_msg_sw_interface_dump) + strlen (str));
-  clib_mem_init (0, 1 << 20);
-
-  vl_api_c_string_to_api_string (str, &dump->payload.name_filter);
-  /* Assert nul terminator NOT present */
-  ck_assert_int_eq (vl_api_string_len (&dump->payload.name_filter),
-		    strlen (str));
-
-  cstr = vl_api_from_api_to_new_c_string (&dump->payload.name_filter);
-  ck_assert_ptr_ne (cstr, NULL);
-  /* Assert nul terminator present */
-  ck_assert_int_eq (vec_len (cstr), sizeof (str));
-  ck_assert_int_eq (strlen (str), strlen (cstr));
-  vec_free (cstr);
-
-  vstr = vl_api_from_api_to_new_vec (0 /* not really an API message */ ,
-				     &dump->payload.name_filter);
-  ck_assert_ptr_ne (vstr, NULL);
-  /* Assert nul terminator NOT present */
-  ck_assert_int_eq (vec_len (vstr), strlen (str));
-  vec_free (vstr);
-
-  /* vector conaining NON nul terminated string 'TEST' */
-  vec_add (vec_str, str, strlen (str));
-  clib_memset (dump->payload.name_filter.buf, 0, strlen (str));
-  dump->payload.name_filter.length = 0;
-
-  vl_api_vec_to_api_string (vec_str, &dump->payload.name_filter);
-  /* Assert nul terminator NOT present */
-  ck_assert_int_eq (vl_api_string_len (&dump->payload.name_filter),
-		    vec_len (vec_str));
-
-  cstr = vl_api_from_api_to_new_c_string (&dump->payload.name_filter);
-  ck_assert_ptr_ne (cstr, NULL);
-  /* Assert nul terminator present */
-  ck_assert_int_eq (vec_len (cstr), sizeof (str));
-  ck_assert_int_eq (strlen (str), strlen (cstr));
-  vec_free (cstr);
-
-  vstr = vl_api_from_api_to_new_vec (0 /* not a real api msg */ ,
-				     &dump->payload.name_filter);
-  ck_assert_ptr_ne (vstr, NULL);
-  /* Assert nul terminator NOT present */
-  ck_assert_int_eq (vec_len (vstr), strlen (str));
-  vec_free (vstr);
-}
-
-END_TEST;
-
-Suite *
-test_suite (void)
-{
-  Suite *s = suite_create ("VAPI test");
-
-  TCase *tc_negative = tcase_create ("Negative tests");
-  tcase_add_test (tc_negative, test_invalid_values);
-  suite_add_tcase (s, tc_negative);
-
-  TCase *tc_swap = tcase_create ("Byteswap tests");
-  tcase_add_test (tc_swap, test_hton_1);
-  tcase_add_test (tc_swap, test_hton_2);
-  tcase_add_test (tc_swap, test_hton_4);
-  tcase_add_test (tc_swap, test_ntoh_1);
-  tcase_add_test (tc_swap, test_ntoh_2);
-  tcase_add_test (tc_swap, test_ntoh_4);
-  suite_add_tcase (s, tc_swap);
-
-  TCase *tc_connect = tcase_create ("Connect");
-  tcase_add_test (tc_connect, test_connect);
-  suite_add_tcase (s, tc_connect);
-
-  TCase *tc_block = tcase_create ("Blocking API");
-  tcase_set_timeout (tc_block, 25);
-  tcase_add_checked_fixture (tc_block, setup_blocking, teardown);
-  tcase_add_test (tc_block, test_show_version_1);
-  tcase_add_test (tc_block, test_show_version_2);
-  tcase_add_test (tc_block, test_loopbacks_1);
-  suite_add_tcase (s, tc_block);
-
-  TCase *tc_nonblock = tcase_create ("Nonblocking API");
-  tcase_set_timeout (tc_nonblock, 25);
-  tcase_add_checked_fixture (tc_nonblock, setup_nonblocking, teardown);
-  tcase_add_test (tc_nonblock, test_show_version_3);
-  tcase_add_test (tc_nonblock, test_show_version_4);
-  tcase_add_test (tc_nonblock, test_show_version_5);
-  tcase_add_test (tc_nonblock, test_loopbacks_2);
-  tcase_add_test (tc_nonblock, test_no_response_1);
-  tcase_add_test (tc_nonblock, test_no_response_2);
-  suite_add_tcase (s, tc_nonblock);
-
-  TCase *tc_unsupported = tcase_create ("Unsupported message");
-  tcase_add_checked_fixture (tc_unsupported, setup_blocking, teardown);
-  tcase_add_test (tc_unsupported, test_unsupported);
-  suite_add_tcase (s, tc_unsupported);
-
-  TCase *tc_dynamic = tcase_create ("Dynamic message size");
-  tcase_add_test (tc_dynamic, test_api_strings);
-  suite_add_tcase (s, tc_dynamic);
-
-  return s;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (3 != argc)
-    {
-      printf ("Invalid argc==`%d'\n", argc);
-      return EXIT_FAILURE;
-    }
-  app_name = argv[1];
-  api_prefix = argv[2];
-  printf ("App name: `%s', API prefix: `%s'\n", app_name, api_prefix);
-
-  int number_failed;
-  Suite *s;
-  SRunner *sr;
-
-  s = test_suite ();
-  sr = srunner_create (s);
-
-  srunner_run_all (sr, CK_NORMAL);
-  number_failed = srunner_ntests_failed (sr);
-  srunner_free (sr);
-  return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp
deleted file mode 100644
index 1dd58f85484..00000000000
--- a/test/ext/vapi_cpp_test.cpp
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- *------------------------------------------------------------------
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *------------------------------------------------------------------
- */
-
-#include <memory>
-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-#include <setjmp.h>
-#include <check.h>
-#include <vapi/vapi.hpp>
-#include <vapi/vpe.api.vapi.hpp>
-#include <vapi/interface.api.vapi.hpp>
-#include <fake.api.vapi.hpp>
-
-DEFINE_VAPI_MSG_IDS_VPE_API_JSON;
-DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON;
-DEFINE_VAPI_MSG_IDS_FAKE_API_JSON;
-
-static char *app_name = nullptr;
-static char *api_prefix = nullptr;
-static const int max_outstanding_requests = 32;
-static const int response_queue_size = 32;
-
-#define WAIT_FOR_RESPONSE(param, ret)      \
-  do                                       \
-    {                                      \
-      ret = con.wait_for_response (param); \
-    }                                      \
-  while (ret == VAPI_EAGAIN)
-
-using namespace vapi;
-
-void verify_show_version_reply (const Show_version_reply &r)
-{
-  auto &p = r.get_payload ();
-  printf ("show_version_reply: program: `%s', version: `%s', build directory: "
-          "`%s', build date: `%s'\n",
-          p.program, p.version, p.build_directory, p.build_date);
-  ck_assert_str_eq ("vpe", (char *)p.program);
-}
-
-Connection con;
-
-void setup (void)
-{
-  vapi_error_e rv = con.connect (
-      app_name, api_prefix, max_outstanding_requests, response_queue_size);
-  ck_assert_int_eq (VAPI_OK, rv);
-}
-
-void teardown (void)
-{
-  con.disconnect ();
-}
-
-START_TEST (test_show_version_1)
-{
-  printf ("--- Show version by reading response associated to request ---\n");
-  Show_version sv (con);
-  vapi_error_e rv = sv.execute ();
-  ck_assert_int_eq (VAPI_OK, rv);
-  WAIT_FOR_RESPONSE (sv, rv);
-  ck_assert_int_eq (VAPI_OK, rv);
-  auto &r = sv.get_response ();
-  verify_show_version_reply (r);
-}
-
-END_TEST;
-
-struct Show_version_cb
-{
-  Show_version_cb () : called{0} {};
-  int called;
-  vapi_error_e operator() (Show_version &sv)
-  {
-    auto &r = sv.get_response ();
-    verify_show_version_reply (r);
-    ++called;
-    return VAPI_OK;
-  }
-};
-
-START_TEST (test_show_version_2)
-{
-  printf ("--- Show version by getting a callback ---\n");
-  Show_version_cb cb;
-  Show_version sv (con, std::ref (cb));
-  vapi_error_e rv = sv.execute ();
-  ck_assert_int_eq (VAPI_OK, rv);
-  con.dispatch (sv);
-  ck_assert_int_eq (1, cb.called);
-}
-
-END_TEST;
-
-START_TEST (test_loopbacks_1)
-{
-  printf ("--- Create/delete loopbacks by waiting for response ---\n");
-  const auto num_ifs = 5;
-  u8 mac_addresses[num_ifs][6];
-  memset (&mac_addresses, 0, sizeof (mac_addresses));
-  u32 sw_if_indexes[num_ifs];
-  memset (&sw_if_indexes, 0xff, sizeof (sw_if_indexes));
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
-      mac_addresses[i][5] = i;
-    }
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      Create_loopback cl (con);
-      auto &p = cl.get_request ().get_payload ();
-      memcpy (p.mac_address, mac_addresses[i], sizeof (p.mac_address));
-      auto e = cl.execute ();
-      ck_assert_int_eq (VAPI_OK, e);
-      vapi_error_e rv;
-      WAIT_FOR_RESPONSE (cl, rv);
-      ck_assert_int_eq (VAPI_OK, rv);
-      auto &rp = cl.get_response ().get_payload ();
-      ck_assert_int_eq (0, rp.retval);
-      sw_if_indexes[i] = rp.sw_if_index;
-    }
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      printf ("Created loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
-              "sw_if_index %u\n",
-              mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
-              mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
-              sw_if_indexes[i]);
-    }
-
-  { // new context
-    bool seen[num_ifs] = {0};
-    Sw_interface_dump d (con);
-    d.get_request ().get_payload ();
-    auto rv = d.execute ();
-    ck_assert_int_eq (VAPI_OK, rv);
-    WAIT_FOR_RESPONSE (d, rv);
-    ck_assert_int_eq (VAPI_OK, rv);
-    auto &rs = d.get_result_set ();
-    for (auto &r : rs)
-      {
-        auto &p = r.get_payload ();
-        for (int i = 0; i < num_ifs; ++i)
-          {
-            if (sw_if_indexes[i] == p.sw_if_index)
-              {
-                ck_assert_int_eq (0, seen[i]);
-                seen[i] = true;
-              }
-          }
-      }
-    for (int i = 0; i < num_ifs; ++i)
-      {
-        ck_assert_int_eq (1, seen[i]);
-      }
-  }
-
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      Delete_loopback dl (con);
-      dl.get_request ().get_payload ().sw_if_index = sw_if_indexes[i];
-      auto rv = dl.execute ();
-      ck_assert_int_eq (VAPI_OK, rv);
-      WAIT_FOR_RESPONSE (dl, rv);
-      ck_assert_int_eq (VAPI_OK, rv);
-      auto &response = dl.get_response ();
-      auto rp = response.get_payload ();
-      ck_assert_int_eq (0, rp.retval);
-      printf ("Deleted loopback with sw_if_index %u\n", sw_if_indexes[i]);
-    }
-
-  { // new context
-    Sw_interface_dump d (con);
-    d.get_request ().get_payload ();
-    auto rv = d.execute ();
-    ck_assert_int_eq (VAPI_OK, rv);
-    WAIT_FOR_RESPONSE (d, rv);
-    ck_assert_int_eq (VAPI_OK, rv);
-    auto &rs = d.get_result_set ();
-    for (auto &r : rs)
-      {
-        auto &p = r.get_payload ();
-        for (int i = 0; i < num_ifs; ++i)
-          {
-            ck_assert_int_ne (sw_if_indexes[i], p.sw_if_index);
-          }
-      }
-  }
-}
-
-END_TEST;
-
-struct Create_loopback_cb
-{
-  Create_loopback_cb () : called{0}, sw_if_index{0} {};
-  int called;
-  u32 sw_if_index;
-  bool seen;
-  vapi_error_e operator() (Create_loopback &cl)
-  {
-    auto &r = cl.get_response ();
-    sw_if_index = r.get_payload ().sw_if_index;
-    ++called;
-    return VAPI_OK;
-  }
-};
-
-struct Delete_loopback_cb
-{
-  Delete_loopback_cb () : called{0}, sw_if_index{0} {};
-  int called;
-  u32 sw_if_index;
-  bool seen;
-  vapi_error_e operator() (Delete_loopback &dl)
-  {
-    auto &r = dl.get_response ();
-    ck_assert_int_eq (0, r.get_payload ().retval);
-    ++called;
-    return VAPI_OK;
-  }
-};
-
-template <int num_ifs> struct Sw_interface_dump_cb
-{
-  Sw_interface_dump_cb (std::array<Create_loopback_cb, num_ifs> &cbs)
-      : called{0}, cbs{cbs} {};
-  int called;
-  std::array<Create_loopback_cb, num_ifs> &cbs;
-  vapi_error_e operator() (Sw_interface_dump &d)
-  {
-    for (auto &y : cbs)
-      {
-        y.seen = false;
-      }
-    for (auto &x : d.get_result_set ())
-      {
-        auto &p = x.get_payload ();
-        for (auto &y : cbs)
-          {
-            if (p.sw_if_index == y.sw_if_index)
-              {
-                y.seen = true;
-              }
-          }
-      }
-    for (auto &y : cbs)
-      {
-        ck_assert_int_eq (true, y.seen);
-      }
-    ++called;
-    return VAPI_OK;
-  }
-};
-
-START_TEST (test_loopbacks_2)
-{
-  printf ("--- Create/delete loopbacks by getting a callback ---\n");
-  const auto num_ifs = 5;
-  u8 mac_addresses[num_ifs][6];
-  memset (&mac_addresses, 0, sizeof (mac_addresses));
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      memcpy (&mac_addresses[i], "\1\2\3\4\5\6", 6);
-      mac_addresses[i][5] = i;
-    }
-  std::array<Create_loopback_cb, num_ifs> ccbs;
-  std::array<std::unique_ptr<Create_loopback>, num_ifs> clcs;
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      Create_loopback *cl = new Create_loopback (con, std::ref (ccbs[i]));
-      clcs[i].reset (cl);
-      auto &p = cl->get_request ().get_payload ();
-      memcpy (p.mac_address, mac_addresses[i], sizeof (p.mac_address));
-      auto e = cl->execute ();
-      ck_assert_int_eq (VAPI_OK, e);
-    }
-  con.dispatch ();
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      ck_assert_int_eq (1, ccbs[i].called);
-      printf ("Created loopback with MAC %02x:%02x:%02x:%02x:%02x:%02x --> "
-              "sw_if_index %u\n",
-              mac_addresses[i][0], mac_addresses[i][1], mac_addresses[i][2],
-              mac_addresses[i][3], mac_addresses[i][4], mac_addresses[i][5],
-              ccbs[i].sw_if_index);
-    }
-
-  Sw_interface_dump_cb<num_ifs> swdcb (ccbs);
-  Sw_interface_dump d (con, std::ref (swdcb));
-  d.get_request ().get_payload ();
-  auto rv = d.execute ();
-  ck_assert_int_eq (VAPI_OK, rv);
-  WAIT_FOR_RESPONSE (d, rv);
-  ck_assert_int_eq (VAPI_OK, rv);
-  ck_assert_int_ne (0, swdcb.called);
-  std::array<Delete_loopback_cb, num_ifs> dcbs;
-  std::array<std::unique_ptr<Delete_loopback>, num_ifs> dlcs;
-  for (int i = 0; i < num_ifs; ++i)
-    {
-      Delete_loopback *dl = new Delete_loopback (con, std::ref (dcbs[i]));
-      dlcs[i].reset (dl);
-      auto &p = dl->get_request ().get_payload ();
-      p.sw_if_index = ccbs[i].sw_if_index;
-      dcbs[i].sw_if_index = ccbs[i].sw_if_index;
-      auto e = dl->execute ();
-      ck_assert_int_eq (VAPI_OK, e);
-    }
-  con.dispatch ();
-  for (auto &x : dcbs)
-    {
-      ck_assert_int_eq (true, x.called);
-      printf ("Deleted loopback with sw_if_index %u\n", x.sw_if_index);
-    }
-
-  { // new context
-    Sw_interface_dump d (con);
-    d.get_request ().get_payload ();
-    auto rv = d.execute ();
-    ck_assert_int_eq (VAPI_OK, rv);
-    WAIT_FOR_RESPONSE (d, rv);
-    ck_assert_int_eq (VAPI_OK, rv);
-    auto &rs = d.get_result_set ();
-    for (auto &r : rs)
-      {
-        auto &p = r.get_payload ();
-        for (int i = 0; i < num_ifs; ++i)
-          {
-            ck_assert_int_ne (ccbs[i].sw_if_index, p.sw_if_index);
-          }
-      }
-  }
-}
-
-END_TEST;
-
-START_TEST (test_unsupported)
-{
-  printf ("--- Unsupported messages ---\n");
-  bool thrown = false;
-  try
-    {
-      Test_fake_msg fake (con);
-    }
-  catch (const Msg_not_available_exception &)
-    {
-      thrown = true;
-      printf ("Constructing unsupported msg not possible - test pass.\n");
-    }
-  ck_assert_int_eq (true, thrown);
-  thrown = false;
-  try
-    {
-      Test_fake_dump fake (con);
-    }
-  catch (const Msg_not_available_exception &)
-    {
-      thrown = true;
-      printf ("Constructing unsupported dump not possible - test pass.\n");
-    }
-  ck_assert_int_eq (true, thrown);
-  thrown = false;
-  try
-    {
-      Event_registration<Test_fake_details> fake (con);
-    }
-  catch (const Msg_not_available_exception &)
-    {
-      thrown = true;
-      printf ("Constructing unsupported event registration not possible - "
-              "test pass.\n");
-    }
-  ck_assert_int_eq (true, thrown);
-}
-
-END_TEST;
-
-Suite *test_suite (void)
-{
-  Suite *s = suite_create ("VAPI test");
-
-  TCase *tc_cpp_api = tcase_create ("C++ API");
-  tcase_set_timeout (tc_cpp_api, 25);
-  tcase_add_checked_fixture (tc_cpp_api, setup, teardown);
-  tcase_add_test (tc_cpp_api, test_show_version_1);
-  tcase_add_test (tc_cpp_api, test_show_version_2);
-  tcase_add_test (tc_cpp_api, test_loopbacks_1);
-  tcase_add_test (tc_cpp_api, test_loopbacks_2);
-  tcase_add_test (tc_cpp_api, test_unsupported);
-  suite_add_tcase (s, tc_cpp_api);
-
-  return s;
-}
-
-int main (int argc, char *argv[])
-{
-  if (3 != argc)
-    {
-      printf ("Invalid argc==`%d'\n", argc);
-      return EXIT_FAILURE;
-    }
-  app_name = argv[1];
-  api_prefix = argv[2];
-  printf ("App name: `%s', API prefix: `%s'\n", app_name, api_prefix);
-
-  int number_failed;
-  Suite *s;
-  SRunner *sr;
-
-  s = test_suite ();
-  sr = srunner_create (s);
-
-  srunner_run_all (sr, CK_NORMAL);
-  number_failed = srunner_ntests_failed (sr);
-  srunner_free (sr);
-  return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-/*
- * fd.io coding-style-patch-verification: ON
- *
- * Local Variables:
- * eval: (c-set-style "gnu")
- * End:
- */
diff --git a/test/test_vapi.py b/test/test_vapi.py
index d91099210d2..9b4cad090a0 100644
--- a/test/test_vapi.py
+++ b/test/test_vapi.py
@@ -20,11 +20,11 @@ class VAPITestCase(VppTestCase):
 
     def test_vapi_c(self):
         """ run C VAPI tests """
-        var = "TEST_BR"
-        built_root = os.getenv(var, None)
-        self.assertIsNotNone(built_root,
+        var = "VPP_BUILD_DIR"
+        build_dir = os.getenv(var, None)
+        self.assertIsNotNone(build_dir,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_c_test" % built_root
+        executable = f"{build_dir}/vpp/bin/vapi_c_test"
         worker = Worker([executable, "vapi client",
                          self.get_api_segment_prefix()], self.logger)
         worker.start()
@@ -49,11 +49,11 @@ class VAPITestCase(VppTestCase):
 
     def test_vapi_cpp(self):
         """ run C++ VAPI tests """
-        var = "TEST_BR"
-        built_root = os.getenv(var, None)
-        self.assertIsNotNone(built_root,
+        var = "VPP_BUILD_DIR"
+        build_dir = os.getenv(var, None)
+        self.assertIsNotNone(build_dir,
                              "Environment variable `%s' not set" % var)
-        executable = "%s/vapi_test/vapi_cpp_test" % built_root
+        executable = f"{build_dir}/vpp/bin/vapi_cpp_test"
         worker = Worker([executable, "vapi client",
                          self.get_api_segment_prefix()], self.logger)
         worker.start()