X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Flb%2Flb_test.c;h=7176be8c8d8193e9b763262235cc5ee1aa80560d;hb=ae0724034;hp=f553a93e4dc3c9b00b23bcb8124152d28e3167ad;hpb=7bc770ceb62ede18414b7bb5788692e32477e373;p=vpp.git diff --git a/src/plugins/lb/lb_test.c b/src/plugins/lb/lb_test.c index f553a93e4dc..7176be8c8d8 100644 --- a/src/plugins/lb/lb_test.c +++ b/src/plugins/lb/lb_test.c @@ -16,13 +16,17 @@ #include #include #include -#include + #include #include #define __plugin_msg_base lb_test_main.msg_id_base #include +#include +#include +#include + //TODO: Move that to vat/plugin_api.c ////////////////////////// uword unformat_ip46_address (unformat_input_t * input, va_list * args) @@ -62,36 +66,6 @@ uword unformat_ip46_prefix (unformat_input_t * input, va_list * args) } ///////////////////////// -#define vl_msg_id(n,h) n, -typedef enum { -#include - /* We'll want to know how many messages IDs we need... */ - VL_MSG_FIRST_AVAILABLE, -} vl_msg_id_t; -#undef vl_msg_id - -/* define message structures */ -#define vl_typedefs -#include -#undef vl_typedefs - -/* declare message handlers for each api */ - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun - -/* Get the API version number. */ -#define vl_api_version(n,v) static u32 api_version=(v); -#include -#undef vl_api_version - typedef struct { /* API message ID base */ u16 msg_id_base; @@ -100,175 +74,373 @@ typedef struct { lb_test_main_t lb_test_main; -#define foreach_standard_reply_retval_handler \ -_(lb_conf_reply) \ -_(lb_add_del_vip_reply) \ -_(lb_add_del_as_reply) - -#define _(n) \ - static void vl_api_##n##_t_handler \ - (vl_api_##n##_t * mp) \ - { \ - vat_main_t * vam = lb_test_main.vat_main; \ - i32 retval = ntohl(mp->retval); \ - if (vam->async_mode) { \ - vam->async_errors += (retval < 0); \ - } else { \ - vam->retval = retval; \ - vam->result_ready = 1; \ - } \ - } -foreach_standard_reply_retval_handler; -#undef _ - -/* - * Table of message reply handlers, must include boilerplate handlers - * we just generated - */ -#define foreach_vpe_api_reply_msg \ - _(LB_CONF_REPLY, lb_conf_reply) \ - _(LB_ADD_DEL_VIP_REPLY, lb_add_del_vip_reply) \ - _(LB_ADD_DEL_AS_REPLY, lb_add_del_as_reply) - static int api_lb_conf (vat_main_t * vam) { - unformat_input_t *i = vam->input; - f64 timeout; - vl_api_lb_conf_t mps, *mp; - - if (!unformat(i, "%U %U %u %u", - unformat_ip4_address, &mps.ip4_src_address, - unformat_ip6_address, mps.ip6_src_address, - &mps.sticky_buckets_per_core, - &mps.flow_timeout)) { - errmsg ("invalid arguments\n"); - return -99; + unformat_input_t *line_input = vam->input; + vl_api_lb_conf_t *mp; + u32 ip4_src_address = 0xffffffff; + ip46_address_t ip6_src_address; + u32 sticky_buckets_per_core = LB_DEFAULT_PER_CPU_STICKY_BUCKETS; + u32 flow_timeout = LB_DEFAULT_FLOW_TIMEOUT; + int ret; + + ip6_src_address.as_u64[0] = 0xffffffffffffffffL; + ip6_src_address.as_u64[1] = 0xffffffffffffffffL; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat(line_input, "ip4-src-address %U", unformat_ip4_address, &ip4_src_address)) + ; + else if (unformat(line_input, "ip6-src-address %U", unformat_ip6_address, &ip6_src_address)) + ; + else if (unformat(line_input, "buckets %d", &sticky_buckets_per_core)) + ; + else if (unformat(line_input, "timeout %d", &flow_timeout)) + ; + else { + errmsg ("invalid arguments\n"); + return -99; + } } M(LB_CONF, mp); - S(mp); - W; + clib_memcpy (&(mp->ip4_src_address), &ip4_src_address, sizeof (ip4_src_address)); + clib_memcpy (&(mp->ip6_src_address), &ip6_src_address, sizeof (ip6_src_address)); + mp->sticky_buckets_per_core = htonl (sticky_buckets_per_core); + mp->flow_timeout = htonl (flow_timeout); - /* NOTREACHED */ - return 0; + S(mp); + W (ret); + return ret; } static int api_lb_add_del_vip (vat_main_t * vam) { - unformat_input_t * i = vam->input; - f64 timeout; - vl_api_lb_add_del_vip_t mps, *mp; - mps.is_del = 0; - mps.is_gre4 = 0; - - if (!unformat(i, "%U", - unformat_ip46_prefix, mps.ip_prefix, &mps.prefix_length, IP46_TYPE_ANY)) { - errmsg ("invalid prefix\n"); + unformat_input_t *line_input = vam->input; + vl_api_lb_add_del_vip_t *mp; + int ret; + ip46_address_t ip_prefix; + u8 prefix_length = 0; + u8 protocol = 0; + u32 port = 0; + u32 encap = 0; + u32 dscp = ~0; + u32 srv_type = LB_SRV_TYPE_CLUSTERIP; + u32 target_port = 0; + u32 new_length = 1024; + int is_del = 0; + + if (!unformat(line_input, "%U", unformat_ip46_prefix, &ip_prefix, + &prefix_length, IP46_TYPE_ANY, &prefix_length)) { + errmsg ("lb_add_del_vip: invalid vip prefix\n"); return -99; } - if (unformat(i, "gre4")) { - mps.is_gre4 = 1; - } else if (unformat(i, "gre6")) { - mps.is_gre4 = 0; - } else { - errmsg ("no encap\n"); - return -99; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat(line_input, "new_len %d", &new_length)) + ; + else if (unformat(line_input, "del")) + is_del = 1; + else if (unformat(line_input, "protocol tcp")) + { + protocol = IP_PROTOCOL_TCP; + } + else if (unformat(line_input, "protocol udp")) + { + protocol = IP_PROTOCOL_UDP; + } + else if (unformat(line_input, "port %d", &port)) + ; + else if (unformat(line_input, "encap gre4")) + encap = LB_ENCAP_TYPE_GRE4; + else if (unformat(line_input, "encap gre6")) + encap = LB_ENCAP_TYPE_GRE6; + else if (unformat(line_input, "encap l3dsr")) + encap = LB_ENCAP_TYPE_L3DSR; + else if (unformat(line_input, "encap nat4")) + encap = LB_ENCAP_TYPE_NAT4; + else if (unformat(line_input, "encap nat6")) + encap = LB_ENCAP_TYPE_NAT6; + else if (unformat(line_input, "dscp %d", &dscp)) + ; + else if (unformat(line_input, "type clusterip")) + srv_type = LB_SRV_TYPE_CLUSTERIP; + else if (unformat(line_input, "type nodeport")) + srv_type = LB_SRV_TYPE_NODEPORT; + else if (unformat(line_input, "target_port %d", &target_port)) + ; + else { + errmsg ("invalid arguments\n"); + return -99; + } } - if (!unformat(i, "%d", &mps.new_flows_table_length)) { - errmsg ("no table lentgh\n"); - return -99; - } + if ((encap != LB_ENCAP_TYPE_L3DSR) && (dscp != ~0)) + { + errmsg("lb_vip_add error: should not configure dscp for none L3DSR."); + return -99; + } - if (unformat(i, "del")) { - mps.is_del = 1; - } + if ((encap == LB_ENCAP_TYPE_L3DSR) && (dscp >= 64)) + { + errmsg("lb_vip_add error: dscp for L3DSR should be less than 64."); + return -99; + } M(LB_ADD_DEL_VIP, mp); + clib_memcpy (mp->pfx.address.un.ip6, &ip_prefix.ip6, sizeof (ip_prefix.ip6)); + mp->pfx.len = prefix_length; + mp->protocol = (u8)protocol; + mp->port = htons((u16)port); + mp->encap = (u8)encap; + mp->dscp = (u8)dscp; + mp->type = (u8)srv_type; + mp->target_port = htons((u16)target_port); + mp->node_port = htons((u16)target_port); + mp->new_flows_table_length = htonl(new_length); + mp->is_del = is_del; + S(mp); - W; - /* NOTREACHED */ - return 0; + W (ret); + return ret; } static int api_lb_add_del_as (vat_main_t * vam) { - unformat_input_t * i = vam->input; - f64 timeout; - vl_api_lb_add_del_as_t mps, *mp; - mps.is_del = 0; - - if (!unformat(i, "%U %U", - unformat_ip46_prefix, mps.vip_ip_prefix, &mps.vip_prefix_length, IP46_TYPE_ANY, - unformat_ip46_address, mps.as_address)) { - errmsg ("invalid prefix or address\n"); - return -99; + + unformat_input_t *line_input = vam->input; + vl_api_lb_add_del_as_t *mp; + int ret; + ip46_address_t vip_prefix, as_addr; + u8 vip_plen; + ip46_address_t *as_array = 0; + u32 port = 0; + u8 protocol = 0; + u8 is_del = 0; + u8 is_flush = 0; + + if (!unformat(line_input, "%U", unformat_ip46_prefix, + &vip_prefix, &vip_plen, IP46_TYPE_ANY)) + { + errmsg ("lb_add_del_as: invalid vip prefix\n"); + return -99; } - if (unformat(i, "del")) { - mps.is_del = 1; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat(line_input, "%U", unformat_ip46_address, + &as_addr, IP46_TYPE_ANY)) + { + vec_add1(as_array, as_addr); + } + else if (unformat(line_input, "del")) + { + is_del = 1; + } + else if (unformat(line_input, "flush")) + { + is_flush = 1; + } + else if (unformat(line_input, "protocol tcp")) + { + protocol = IP_PROTOCOL_TCP; + } + else if (unformat(line_input, "protocol udp")) + { + protocol = IP_PROTOCOL_UDP; + } + else if (unformat(line_input, "port %d", &port)) + ; + else { + errmsg ("invalid arguments\n"); + return -99; + } + } + + if (!vec_len(as_array)) { + errmsg ("No AS address provided \n"); + return -99; } M(LB_ADD_DEL_AS, mp); + clib_memcpy (mp->pfx.address.un.ip6, &vip_prefix.ip6, sizeof (vip_prefix.ip6)); + mp->pfx.len = vip_plen; + mp->protocol = (u8)protocol; + mp->port = htons((u16)port); + clib_memcpy (&mp->as_address, &as_addr, sizeof (as_addr)); + mp->is_del = is_del; + mp->is_flush = is_flush; + S(mp); - W; - /* NOTREACHED */ - return 0; + W (ret); + return ret; +} + +static int api_lb_flush_vip (vat_main_t * vam) +{ + + unformat_input_t *line_input = vam->input; + vl_api_lb_flush_vip_t *mp; + int ret; + ip46_address_t vip_prefix; + u8 vip_plen; + + if (!unformat(line_input, "%U", unformat_ip46_prefix, + &vip_prefix, &vip_plen, IP46_TYPE_ANY)) + { + errmsg ("lb_add_del_as: invalid vip prefix\n"); + return -99; + } + + M(LB_FLUSH_VIP, mp); + clib_memcpy (mp->pfx.address.un.ip6, &vip_prefix.ip6, sizeof (vip_prefix.ip6)); + mp->pfx.len = vip_plen; + S(mp); + W (ret); + return ret; +} +static int api_lb_add_del_intf_nat4 (vat_main_t * vam) +{ + // Not yet implemented + return -99; } +static int api_lb_add_del_intf_nat6 (vat_main_t * vam) +{ + // Not yet implemented + return -99; +} + +static void vl_api_lb_vip_details_t_handler + (vl_api_lb_vip_details_t * mp) +{ + vat_main_t *vam = &vat_main; + + print (vam->ofp, "%24U%14d%14d%18d", + format_ip46_address, &mp->vip.pfx.address, IP46_TYPE_ANY, + mp->vip.pfx.len, + mp->vip.protocol, + ntohs (mp->vip.port)); /* - * List of messages that the api test plugin sends, - * and that the data plane plugin processes - */ -#define foreach_vpe_api_msg \ -_(lb_conf, " ") \ -_(lb_add_del_vip, " [gre4|gre6] [del]") \ -_(lb_add_del_as, "
[del]") + lb_main_t *lbm = &lb_main; + u32 i = 0; + + u32 vip_count = pool_len(lbm->vips); + + print (vam->ofp, "%11d", vip_count); + + for (i=0; iofp, "%24U%14d%14d%18d", + format_ip46_address, &mp->vip.pfx.address, IP46_TYPE_ANY, + mp->vip.pfx.len, + mp->vip.protocol, + ntohs (mp->vip.port)); + } +*/ +} -static void -lb_vat_api_hookup (vat_main_t *vam) +static int api_lb_vip_dump (vat_main_t * vam) { - lb_test_main_t * lbtm = &lb_test_main; - /* Hook up handlers for replies from the data plane plug-in */ -#define _(N,n) \ - vl_msg_api_set_handlers((VL_API_##N + lbtm->msg_id_base), \ - #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_reply_msg; -#undef _ - - /* API messages we can send */ -#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n); - foreach_vpe_api_msg; -#undef _ - - /* Help strings */ -#define _(n,h) hash_set_mem (vam->help_by_name, #n, h); - foreach_vpe_api_msg; -#undef _ + vl_api_lb_vip_dump_t *mp; + int ret; + + M(LB_VIP_DUMP, mp); + + S(mp); + W (ret); + return ret; } -clib_error_t * vat_plugin_register (vat_main_t *vam) +static void vl_api_lb_as_details_t_handler + (vl_api_lb_as_details_t * mp) { - lb_test_main_t * lbtm = &lb_test_main; + vat_main_t *vam = &vat_main; - u8 * name; + print (vam->ofp, "%24U%14d%14d%18d%d%d", + format_ip46_address, &mp->vip.pfx.address, IP46_TYPE_ANY, + mp->vip.pfx.len, + mp->vip.protocol, + ntohs (mp->vip.port), + mp->flags, + mp->in_use_since); - lbtm->vat_main = vam; + //u32 i = 0; - /* Ask the vpp engine for the first assigned message-id */ - name = format (0, "lb_%08x%c", api_version, 0); - lbtm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name); +/* + lb_main_t *lbm = &lb_main; + print (vam->ofp, "%11d", pool_len(lbm->ass)); + for (i=0; iass); i--) + { + print (vam->ofp, "%24U%14d%14d%18d", + format_ip46_address, &mp->pfx.address, IP46_TYPE_ANY, + mp->pfx.len, + mp->pfx.protocol, + ntohs (mp->pfx.port), + ntohl(mp->app_srv), + mp->flags, + mp->in_use_; + } + */ +} - if (lbtm->msg_id_base != (u16) ~0) - lb_vat_api_hookup (vam); +static int api_lb_as_dump (vat_main_t * vam) +{ - vec_free(name); + unformat_input_t *line_input = vam->input; + vl_api_lb_as_dump_t *mp; + int ret; + ip46_address_t vip_prefix, as_addr; + u8 vip_plen; + ip46_address_t *as_array = 0; + u32 port = 0; + u8 protocol = 0; + + if (!unformat(line_input, "%U", unformat_ip46_prefix, + &vip_prefix, &vip_plen, IP46_TYPE_ANY)) + { + errmsg ("lb_add_del_as: invalid vip prefix\n"); + return -99; + } - return 0; + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat(line_input, "%U", unformat_ip46_address, + &as_addr, IP46_TYPE_ANY)) + { + vec_add1(as_array, as_addr); + } + else if (unformat(line_input, "protocol tcp")) + { + protocol = IP_PROTOCOL_TCP; + } + else if (unformat(line_input, "protocol udp")) + { + protocol = IP_PROTOCOL_UDP; + } + else if (unformat(line_input, "port %d", &port)) + ; + else { + errmsg ("invalid arguments\n"); + return -99; + } + } + + if (!vec_len(as_array)) { + errmsg ("No AS address provided \n"); + return -99; + } + + M(LB_AS_DUMP, mp); + clib_memcpy (mp->pfx.address.un.ip6, &vip_prefix.ip6, sizeof (vip_prefix.ip6)); + mp->pfx.len = vip_plen; + mp->protocol = (u8)protocol; + mp->port = htons((u16)port); + + S(mp); + W (ret); + return ret; } + +#include