X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvapi_cpp_test.cpp;h=ee0a9f38d3e172c7f2da1f4081db4fa00892ad6a;hb=f9e02772bc90a5995202d23bf98199cba07f3d2f;hp=68366af2ac8938d0fbe841529c926cf5d4435509;hpb=003d5da298b2cd1e20400fb5fdcefce752ca616e;p=vpp.git

diff --git a/test/ext/vapi_cpp_test.cpp b/test/ext/vapi_cpp_test.cpp
index 68366af2ac8..ee0a9f38d3e 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;
@@ -150,8 +147,6 @@ START_TEST (test_loopbacks_1)
     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, 0, sizeof (p.name_filter));
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -192,8 +187,6 @@ 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, 0, sizeof (p.name_filter));
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);
@@ -310,8 +303,6 @@ 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, 0, sizeof (p.name_filter));
   auto rv = d.execute ();
   ck_assert_int_eq (VAPI_OK, rv);
   WAIT_FOR_RESPONSE (d, rv);
@@ -339,8 +330,6 @@ 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, 0, sizeof (p.name_filter));
     auto rv = d.execute ();
     ck_assert_int_eq (VAPI_OK, rv);
     WAIT_FOR_RESPONSE (d, rv);