diff options
| author |   Ole Trøan <otroan@employees.org> | 2019-03-15 16:14:41 +0000 |
|---|---|---|
| committer | Ole Trøan <otroan@employees.org> | 2019-03-15 17:34:06 +0000 |
| commit | 3b0d7e42f65eaf8d84cfe26e2e9f5244c554b934 (patch) | |
| tree | 4c7248e37fc7e0d3478fa5a77a8bfc7b2c9159d4 /test/ext | |
| parent | 3fef8f811a013d1392f702fda1347c5211471ed7 (diff) | |
Revert "API: Cleanup APIs interface.api"
This reverts commit e63325e3ca03c847963863446345e6c80a2c0cfd.
Allow time for CSIT to accommodate.
Change-Id: I59435e4ab5e05e36a2796c3bf44889b5d4823cc2
Signed-off-by: ot@cisco.com
Diffstat (limited to 'test/ext')
| -rw-r--r-- | test/ext/vapi_c_test.c | 18 | ||||
| -rw-r--r-- | test/ext/vapi_cpp_test.cpp | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c index 725f5c30407..0b22fff1706 100644 --- a/test/ext/vapi_c_test.c +++ b/test/ext/vapi_c_test.c @@ -514,7 +514,7 @@ sw_interface_dump_cb (struct vapi_ctx_s *ctx, void *callback_ctx, { ck_assert (NULL != reply); printf ("Interface dump entry: [%u]: %s\n", reply->sw_if_index, - reply->interface_name.buf); + reply->interface_name); size_t i = 0; for (i = 0; i < dctx->num_ifs; ++i) { @@ -577,8 +577,8 @@ START_TEST (test_loopbacks_1) clib_memset (&seen, 0, sizeof (seen)); dump = vapi_alloc_sw_interface_dump (ctx); dump->payload.name_filter_valid = 0; - clib_memset (dump->payload.name_filter.buf, 0, - dump->payload.name_filter.length); + clib_memset (dump->payload.name_filter, 0, + sizeof (dump->payload.name_filter)); while (VAPI_EAGAIN == (rv = vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, @@ -609,8 +609,8 @@ START_TEST (test_loopbacks_1) clib_memset (&seen, 0, sizeof (seen)); dump = vapi_alloc_sw_interface_dump (ctx); dump->payload.name_filter_valid = 0; - clib_memset (dump->payload.name_filter.buf, 0, - dump->payload.name_filter.length); + clib_memset (dump->payload.name_filter, 0, + sizeof (dump->payload.name_filter)); while (VAPI_EAGAIN == (rv = vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx))) @@ -734,8 +734,8 @@ START_TEST (test_loopbacks_2) 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); dump->payload.name_filter_valid = 0; - clib_memset (dump->payload.name_filter.buf, 0, - dump->payload.name_filter.length); + clib_memset (dump->payload.name_filter, 0, + sizeof (dump->payload.name_filter)); while (VAPI_EAGAIN == (rv = vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx))) @@ -775,8 +775,8 @@ START_TEST (test_loopbacks_2) dctx.last_called = false; dump = vapi_alloc_sw_interface_dump (ctx); dump->payload.name_filter_valid = 0; - clib_memset (dump->payload.name_filter.buf, 0, - dump->payload.name_filter.length); + clib_memset (dump->payload.name_filter, 0, + sizeof (dump->payload.name_filter)); while (VAPI_EAGAIN == (rv = vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx))) diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp index 46a2c0ec2f1..68366af2ac8 100644 --- a/test/ext/vapi_cpp_test.cpp +++ b/test/ext/vapi_cpp_test.cpp @@ -151,7 +151,7 @@ START_TEST (test_loopbacks_1) Sw_interface_dump d (con); auto &p = d.get_request ().get_payload (); p.name_filter_valid = 0; - memset (p.name_filter.buf, 0, p.name_filter.length); + memset (p.name_filter, 0, sizeof (p.name_filter)); auto rv = d.execute (); ck_assert_int_eq (VAPI_OK, rv); WAIT_FOR_RESPONSE (d, rv); @@ -193,7 +193,7 @@ START_TEST (test_loopbacks_1) Sw_interface_dump d (con); auto &p = d.get_request ().get_payload (); p.name_filter_valid = 0; - memset (p.name_filter.buf, 0, p.name_filter.length); + memset (p.name_filter, 0, sizeof (p.name_filter)); auto rv = d.execute (); ck_assert_int_eq (VAPI_OK, rv); WAIT_FOR_RESPONSE (d, rv); @@ -311,7 +311,7 @@ START_TEST (test_loopbacks_2) Sw_interface_dump d (con, std::ref (swdcb)); auto &p = d.get_request ().get_payload (); p.name_filter_valid = 0; - memset (p.name_filter.buf, 0, p.name_filter.length); + memset (p.name_filter, 0, sizeof (p.name_filter)); auto rv = d.execute (); ck_assert_int_eq (VAPI_OK, rv); WAIT_FOR_RESPONSE (d, rv); @@ -340,7 +340,7 @@ START_TEST (test_loopbacks_2) Sw_interface_dump d (con); auto &p = d.get_request ().get_payload (); p.name_filter_valid = 0; - memset (p.name_filter.buf, 0, p.name_filter.length); + memset (p.name_filter, 0, sizeof (p.name_filter)); auto rv = d.execute (); ck_assert_int_eq (VAPI_OK, rv); WAIT_FOR_RESPONSE (d, rv); |