X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fapi%2Ftest_client.c;h=e36fdbfc22cd6e9520ea23b9d011fe2cf95656a8;hb=ec11b13a;hp=5c568950499ff4d24faa3106d0d80cfcf0df75d5;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c index 5c568950499..e36fdbfc22c 100644 --- a/src/vpp/api/test_client.c +++ b/src/vpp/api/test_client.c @@ -78,7 +78,7 @@ typedef struct int oam_events_on; /* convenience */ - unix_shared_memory_queue_t *vl_input_queue; + svm_queue_t *vl_input_queue; u32 my_client_index; } test_main_t; @@ -93,7 +93,7 @@ vlib_main_t **vlib_mains; void vlib_cli_output (struct vlib_main_t *vm, char *fmt, ...) { - clib_warning ("vlib_cli_output callled..."); + clib_warning ("vlib_cli_output called..."); } u8 * @@ -133,12 +133,30 @@ vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp) case VNET_HW_INTERFACE_FLAG_SPEED_1G: speed = "1Gbps"; break; + case VNET_HW_INTERFACE_FLAG_SPEED_2_5G: + speed = "2.5Gbps"; + break; + case VNET_HW_INTERFACE_FLAG_SPEED_5G: + speed = "5Gbps"; + break; case VNET_HW_INTERFACE_FLAG_SPEED_10G: speed = "10Gbps"; break; + case VNET_HW_INTERFACE_FLAG_SPEED_20G: + speed = "20Gbps"; + break; + case VNET_HW_INTERFACE_FLAG_SPEED_25G: + speed = "25Gbps"; + break; case VNET_HW_INTERFACE_FLAG_SPEED_40G: speed = "40Gbps"; break; + case VNET_HW_INTERFACE_FLAG_SPEED_50G: + speed = "50Gbps"; + break; + case VNET_HW_INTERFACE_FLAG_SPEED_56G: + speed = "56Gbps"; + break; case VNET_HW_INTERFACE_FLAG_SPEED_100G: speed = "100Gbps"; break; @@ -161,10 +179,8 @@ vl_api_sw_interface_details_t_handler (vl_api_sw_interface_details_t * mp) static void vl_api_sw_interface_set_flags_t_handler (vl_api_sw_interface_set_flags_t * mp) { - fformat (stdout, "set flags: sw_if_index %d, admin %s link %s\n", - ntohl (mp->sw_if_index), - mp->admin_up_down ? "up" : "down", - mp->link_up_down ? "up" : "down"); + fformat (stdout, "set flags: sw_if_index %d, admin %s\n", + ntohl (mp->sw_if_index), mp->admin_up_down ? "up" : "down"); } static void @@ -245,6 +261,7 @@ static void vl_api_ip_neighbor_add_del_reply_t_handler fformat (stdout, "ip neighbor add del reply %d\n", ntohl (mp->retval)); } +#if 0 static void vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t * mp) @@ -332,6 +349,7 @@ vl_api_vnet_interface_counters_t_handler (vl_api_vnet_interface_counters_t * } } } +#endif /* Format an IP4 address. */ u8 * @@ -534,11 +552,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 @@ -578,7 +596,6 @@ _(WANT_STATS_REPLY, want_stats_reply) \ _(WANT_OAM_EVENTS_REPLY, want_oam_events_reply) \ _(OAM_EVENT, oam_event) \ _(OAM_ADD_DEL_REPLY, oam_add_del_reply) \ -_(VNET_INTERFACE_COUNTERS, vnet_interface_counters) \ _(VNET_IP4_FIB_COUNTERS, vnet_ip4_fib_counters) \ _(VNET_IP6_FIB_COUNTERS, vnet_ip6_fib_counters) \ _(IP_ADD_DEL_ROUTE_REPLY, ip_add_del_route_reply) \ @@ -598,8 +615,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) @@ -731,7 +748,6 @@ add_del_ip4_route (test_main_t * tm, int enable_disable) mp->client_index = tm->my_client_index; mp->context = 0xdeadbeef; mp->table_id = ntohl (0); - mp->create_vrf_if_needed = 1; mp->next_hop_sw_if_index = ntohl (5); mp->is_add = enable_disable; @@ -902,15 +918,15 @@ add_del_proxy_arp (test_main_t * tm, int is_add) mp->_vl_msg_id = ntohs (VL_API_PROXY_ARP_ADD_DEL); mp->client_index = tm->my_client_index; mp->context = 0xdeadbeef; - mp->vrf_id = ntohl (11); + mp->proxy.vrf_id = ntohl (11); mp->is_add = is_add; /* proxy fib 11, 1.1.1.1 -> 1.1.1.10 */ tmp = ntohl (0x01010101); - clib_memcpy (mp->low_address, &tmp, 4); + clib_memcpy (mp->proxy.low_address, &tmp, 4); tmp = ntohl (0x0101010a); - clib_memcpy (mp->hi_address, &tmp, 4); + clib_memcpy (mp->proxy.hi_address, &tmp, 4); vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp); } @@ -942,7 +958,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 +980,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; @@ -1008,7 +1022,7 @@ dhcpv6_set_vss (test_main_t * tm) mp->client_index = tm->my_client_index; mp->context = 0xdeadbeef; mp->oui = ntohl (6); - mp->fib_id = ntohl (60); + mp->tbl_id = ntohl (60); mp->is_add = 1; mp->is_ipv6 = 1; vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp); @@ -1025,7 +1039,7 @@ dhcpv4_set_vss (test_main_t * tm) mp->client_index = tm->my_client_index; mp->context = 0xdeadbeef; mp->oui = ntohl (4); - mp->fib_id = ntohl (40); + mp->tbl_id = ntohl (40); mp->is_add = 1; mp->is_ipv6 = 0; vl_msg_api_send_shmem (tm->vl_input_queue, (u8 *) & mp); @@ -1048,9 +1062,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 +1208,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);