X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fext%2Fvapi_c_test.c;h=efa6a735611c37087240fa7feab6efbf0890d6d8;hb=785458895dac4fd1f337e0b949bf011c363da99a;hp=51fc572746f2209296f4625527ca81343ae75d67;hpb=2dbee9361e74d03727a8b618ba80a5e28c006011;p=vpp.git

diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c
index 51fc572746f..efa6a735611 100644
--- a/test/ext/vapi_c_test.c
+++ b/test/ext/vapi_c_test.c
@@ -131,11 +131,6 @@ START_TEST (test_hton_4)
   d->header._vl_msg_id = cnt++;
   d->header.context = cnt++;
   d->payload.bd_id = cnt++;
-  d->payload.flood = cnt++;
-  d->payload.uu_flood = cnt++;
-  d->payload.forward = cnt++;
-  d->payload.learn = cnt++;
-  d->payload.arp_term = cnt++;
   d->payload.mac_age = cnt++;
   d->payload.bvi_sw_if_index = cnt++;
   d->payload.n_sw_ifs = vla_count;
@@ -156,16 +151,6 @@ START_TEST (test_hton_4)
   ++tmp;
   verify_hton_swap (d->payload.bd_id, tmp);
   ++tmp;
-  verify_hton_swap (d->payload.flood, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.uu_flood, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.forward, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.learn, tmp);
-  ++tmp;
-  verify_hton_swap (d->payload.arp_term, tmp);
-  ++tmp;
   verify_hton_swap (d->payload.mac_age, tmp);
   ++tmp;
   verify_hton_swap (d->payload.bvi_sw_if_index, tmp);
@@ -189,16 +174,6 @@ START_TEST (test_hton_4)
   ++tmp;
   ck_assert_int_eq (d->payload.bd_id, tmp);
   ++tmp;
-  ck_assert_int_eq (d->payload.flood, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.uu_flood, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.forward, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.learn, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.arp_term, tmp);
-  ++tmp;
   ck_assert_int_eq (d->payload.mac_age, tmp);
   ++tmp;
   ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
@@ -268,11 +243,6 @@ START_TEST (test_ntoh_4)
   d->header._vl_msg_id = cnt++;
   d->header.context = cnt++;
   d->payload.bd_id = cnt++;
-  d->payload.flood = cnt++;
-  d->payload.uu_flood = cnt++;
-  d->payload.forward = cnt++;
-  d->payload.learn = cnt++;
-  d->payload.arp_term = cnt++;
   d->payload.mac_age = cnt++;
   d->payload.bvi_sw_if_index = cnt++;
   d->payload.n_sw_ifs = htobe32 (vla_count);
@@ -293,16 +263,6 @@ START_TEST (test_ntoh_4)
   ++tmp;
   verify_ntoh_swap (d->payload.bd_id, tmp);
   ++tmp;
-  verify_ntoh_swap (d->payload.flood, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.uu_flood, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.forward, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.learn, tmp);
-  ++tmp;
-  verify_ntoh_swap (d->payload.arp_term, tmp);
-  ++tmp;
   verify_ntoh_swap (d->payload.mac_age, tmp);
   ++tmp;
   verify_ntoh_swap (d->payload.bvi_sw_if_index, tmp);
@@ -326,16 +286,6 @@ START_TEST (test_ntoh_4)
   ++tmp;
   ck_assert_int_eq (d->payload.bd_id, tmp);
   ++tmp;
-  ck_assert_int_eq (d->payload.flood, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.uu_flood, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.forward, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.learn, tmp);
-  ++tmp;
-  ck_assert_int_eq (d->payload.arp_term, tmp);
-  ++tmp;
   ck_assert_int_eq (d->payload.mac_age, tmp);
   ++tmp;
   ck_assert_int_eq (d->payload.bvi_sw_if_index, tmp);
@@ -464,8 +414,8 @@ START_TEST (test_show_version_1)
   size_t size;
   rv = vapi_recv (ctx, (void *) &resp, &size, 0, 0);
   ck_assert_int_eq (VAPI_OK, rv);
-  int dummy;
-  show_version_cb (NULL, &dummy, VAPI_OK, true, &resp->payload);
+  int placeholder;
+  show_version_cb (NULL, &placeholder, VAPI_OK, true, &resp->payload);
   vapi_msg_free (ctx, resp);
 }
 
@@ -576,9 +526,6 @@ START_TEST (test_loopbacks_1)
       dctx.last_called = false;
       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);
       while (VAPI_EAGAIN ==
 	     (rv =
 	      vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb,
@@ -608,9 +555,6 @@ START_TEST (test_loopbacks_1)
   dctx.last_called = false;
   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);
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -733,9 +677,6 @@ START_TEST (test_loopbacks_2)
   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);
-  dump->payload.name_filter_valid = 0;
-  clib_memset (dump->payload.name_filter.buf, 0,
-	       dump->payload.name_filter.length);
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -774,9 +715,6 @@ START_TEST (test_loopbacks_2)
   clib_memset (&seen, 0, sizeof (seen));
   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);
   while (VAPI_EAGAIN ==
 	 (rv =
 	  vapi_sw_interface_dump (ctx, dump, sw_interface_dump_cb, &dctx)))
@@ -942,7 +880,8 @@ START_TEST (test_api_strings)
   ck_assert_int_eq (strlen (str), strlen (cstr));
   vec_free (cstr);
 
-  vstr = vl_api_from_api_to_new_vec (&dump->payload.name_filter);
+  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));
@@ -965,7 +904,8 @@ START_TEST (test_api_strings)
   ck_assert_int_eq (strlen (str), strlen (cstr));
   vec_free (cstr);
 
-  vstr = vl_api_from_api_to_new_vec (&dump->payload.name_filter);
+  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));