Fix vnet unit tests

[vpp.git] / src / vpp / api / test_client.c

diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
index 5c56895..231b3c1 100644 (file)
--- a/src/vpp/api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -534,11 +534,11 @@ static void vl_api_create_loopback_reply_t_handler
           ntohl (mp->retval), ntohl (mp->sw_if_index));
 }
 
-static void
-vl_api_sr_tunnel_add_del_reply_t_handler (vl_api_sr_tunnel_add_del_reply_t *
-                                         mp)
+static void vl_api_create_loopback_instance_reply_t_handler
+  (vl_api_create_loopback_instance_reply_t * mp)
 {
-  fformat (stdout, "sr tunnel add/del reply %d\n", ntohl (mp->retval));
+  fformat (stdout, "create loopback status %d, sw_if_index %d\n",
+          ntohl (mp->retval), ntohl (mp->sw_if_index));
 }
 
 static void vl_api_l2_patch_add_del_reply_t_handler
@@ -598,8 +598,8 @@ _(SW_INTERFACE_IP6ND_RA_PREFIX_REPLY, sw_interface_ip6nd_ra_prefix_reply) \
 _(SW_INTERFACE_IP6_ENABLE_DISABLE_REPLY, sw_interface_ip6_enable_disable_reply) \
 _(SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS_REPLY, sw_interface_ip6_set_link_local_address_reply) \
  _(CREATE_LOOPBACK_REPLY, create_loopback_reply)                       \
+ _(CREATE_LOOPBACK_INSTANCE_REPLY, create_loopback_instance_reply)     \
 _(L2_PATCH_ADD_DEL_REPLY, l2_patch_add_del_reply)                      \
-_(SR_TUNNEL_ADD_DEL_REPLY,sr_tunnel_add_del_reply)          \
 _(SW_INTERFACE_SET_L2_XCONNECT_REPLY, sw_interface_set_l2_xconnect_reply) \
 _(SW_INTERFACE_SET_L2_BRIDGE_REPLY, sw_interface_set_l2_bridge_reply)
 
@@ -942,7 +942,6 @@ add_ip4_neighbor (test_main_t * tm, int add_del)
   mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
   mp->sw_if_index = ntohl (6);
   mp->is_add = add_del;
 
@@ -965,7 +964,6 @@ add_ip6_neighbor (test_main_t * tm, int add_del)
   mp->_vl_msg_id = ntohs (VL_API_IP_NEIGHBOR_ADD_DEL);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (11);
   mp->sw_if_index = ntohl (6);
   mp->is_add = add_del;
   mp->is_ipv6 = 1;
@@ -1048,9 +1046,7 @@ dhcp_set_proxy (test_main_t * tm, int ipv6)
   mp->_vl_msg_id = ntohs (VL_API_DHCP_PROXY_CONFIG);
   mp->client_index = tm->my_client_index;
   mp->context = 0xdeadbeef;
-  mp->vrf_id = ntohl (0);
   mp->is_ipv6 = ipv6;
-  mp->insert_circuit_id = 1;
   mp->is_add = 1;
   mp->dhcp_server[0] = 0x20;
   mp->dhcp_server[1] = 0x01;
@@ -1196,8 +1192,6 @@ ip6_set_link_local_address (test_main_t * tm)
   clib_memcpy (mp->address, &tmp[0], 8);
   clib_memcpy (&mp->address[8], &tmp[1], 8);
 
-  mp->address_length = 64;
-
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS);
 
   vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp);