X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvapi_cpp_test.cpp;h=1dd58f85484fa1eb9a4fc7ec6a97ac0db533bb8a;hb=e3f078fcfc76d465552f0a0343a1886f4d177dd0;hp=46a2c0ec2f14b3021ff09aec392e005b5afc8e3a;hpb=7adaa226eaa2401d6bb0dfd38a0d943c9645d7dc;p=vpp.git

diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp
index 46a2c0ec2f1..1dd58f85484 100644
--- a/test/ext/vapi_cpp_test.cpp
+++ b/test/ext/vapi_cpp_test.cpp
@@ -49,11 +49,8 @@ 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",
-          vl_api_from_api_string (&p.program),
-          vl_api_from_api_string (&p.version),
-          vl_api_from_api_string (&p.build_directory),
-          vl_api_from_api_string (&p.build_date));
-  ck_assert_str_eq ("vpe", (char *)vl_api_from_api_string (&p.program));
+          p.program, p.version, p.build_directory, p.build_date);
+  ck_assert_str_eq ("vpe", (char *)p.program);
 }
 
 Connection con;
@@ -149,9 +146,7 @@ START_TEST (test_loopbacks_1)
   { // new context
     bool seen[num_ifs] = {0};
     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);
+    d.get_request ().get_payload ();
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -191,9 +186,7 @@ START_TEST (test_loopbacks_1)
 
   { // new context
     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);
+    d.get_request ().get_payload ();
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -309,9 +302,7 @@ START_TEST (test_loopbacks_2)
 
   Sw_interface_dump_cb<num_ifs> swdcb (ccbs);
   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);
+  d.get_request ().get_payload ();
   auto rv = d.execute ();
   ck_assert_int_eq (VAPI_OK, rv);
   WAIT_FOR_RESPONSE (d, rv);
@@ -338,9 +329,7 @@ START_TEST (test_loopbacks_2)
 
   { // new context
     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);
+    d.get_request ().get_payload ();
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);