nat: optimize prefetching

[vpp.git] / test / ext / vapi_c_test.c

diff --git a/test/ext/vapi_c_test.c b/test/ext/vapi_c_test.c
index 51fc572..b5075e9 100644 (file)
--- 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);
@@ -942,7 +892,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 +916,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));