X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp_endpoint_group.c;h=85afee2da721756df1333962f1b77fa3fd1a95d0;hb=f4f73340d61e3af199291344e36a01d289f095f0;hp=a2922716e42bf6e77a316bbb7c2b3544730f53b7;hpb=ba94462c42a27f7447e10ca55a3b212970448ceb;p=vpp.git diff --git a/src/plugins/gbp/gbp_endpoint_group.c b/src/plugins/gbp/gbp_endpoint_group.c index a2922716e42..85afee2da72 100644 --- a/src/plugins/gbp/gbp_endpoint_group.c +++ b/src/plugins/gbp/gbp_endpoint_group.c @@ -60,11 +60,11 @@ gbp_endpoint_group_lock (index_t i) } index_t -gbp_endpoint_group_find (epg_id_t epg_id) +gbp_endpoint_group_find (sclass_t sclass) { uword *p; - p = hash_get (gbp_endpoint_group_db.gg_hash, epg_id); + p = hash_get (gbp_endpoint_group_db.gg_hash_sclass, sclass); if (NULL != p) return p[0]; @@ -73,14 +73,17 @@ gbp_endpoint_group_find (epg_id_t epg_id) } int -gbp_endpoint_group_add_and_lock (epg_id_t epg_id, +gbp_endpoint_group_add_and_lock (vnid_t vnid, u16 sclass, - u32 bd_id, u32 rd_id, u32 uplink_sw_if_index) + u32 bd_id, + u32 rd_id, + u32 uplink_sw_if_index, + const gbp_endpoint_retention_t * retention) { gbp_endpoint_group_t *gg; index_t ggi; - ggi = gbp_endpoint_group_find (epg_id); + ggi = gbp_endpoint_group_find (sclass); if (INDEX_INVALID == ggi) { @@ -105,7 +108,7 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, pool_get_zero (gbp_endpoint_group_pool, gg); - gg->gg_id = epg_id; + gg->gg_vnid = vnid; gg->gg_rd = grdi; gg->gg_gbd = gbi; gg->gg_bd_index = gb->gb_bd_index; @@ -113,9 +116,10 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, gg->gg_uplink_sw_if_index = uplink_sw_if_index; gg->gg_locks = 1; gg->gg_sclass = sclass; + gg->gg_retention = *retention; if (SCLASS_INVALID != gg->gg_sclass) - hash_set (gbp_epg_sclass_db, gg->gg_sclass, gg->gg_id); + hash_set (gbp_epg_sclass_db, gg->gg_sclass, gg->gg_vnid); /* * an egress DVR dpo for internal subnets to use when sending @@ -141,9 +145,8 @@ gbp_endpoint_group_add_and_lock (epg_id_t epg_id, L2INPUT_FEAT_GBP_NULL_CLASSIFY, 1); } - hash_set (gbp_endpoint_group_db.gg_hash, - gg->gg_id, gg - gbp_endpoint_group_pool); - + hash_set (gbp_endpoint_group_db.gg_hash_sclass, + gg->gg_sclass, gg - gbp_endpoint_group_pool); } else { @@ -192,18 +195,18 @@ gbp_endpoint_group_unlock (index_t ggi) if (SCLASS_INVALID != gg->gg_sclass) hash_unset (gbp_epg_sclass_db, gg->gg_sclass); - hash_unset (gbp_endpoint_group_db.gg_hash, gg->gg_id); + hash_unset (gbp_endpoint_group_db.gg_hash_sclass, gg->gg_sclass); pool_put (gbp_endpoint_group_pool, gg); } } int -gbp_endpoint_group_delete (epg_id_t epg_id) +gbp_endpoint_group_delete (sclass_t sclass) { index_t ggi; - ggi = gbp_endpoint_group_find (epg_id); + ggi = gbp_endpoint_group_find (sclass); if (INDEX_INVALID != ggi) { @@ -256,7 +259,8 @@ static clib_error_t * gbp_endpoint_group_cli (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - epg_id_t epg_id = EPG_INVALID, sclass; + gbp_endpoint_retention_t retention = { 0 }; + vnid_t vnid = VNID_INVALID, sclass; vnet_main_t *vnm = vnet_get_main (); u32 uplink_sw_if_index = ~0; u32 bd_id = ~0; @@ -272,7 +276,7 @@ gbp_endpoint_group_cli (vlib_main_t * vm, add = 1; else if (unformat (input, "del")) add = 0; - else if (unformat (input, "epg %d", &epg_id)) + else if (unformat (input, "epg %d", &vnid)) ; else if (unformat (input, "sclass %d", &sclass)) ; @@ -284,23 +288,21 @@ gbp_endpoint_group_cli (vlib_main_t * vm, break; } - if (EPG_INVALID == epg_id) + if (VNID_INVALID == vnid) return clib_error_return (0, "EPG-ID must be specified"); if (add) { - if (~0 == uplink_sw_if_index) - return clib_error_return (0, "interface must be specified"); if (~0 == bd_id) return clib_error_return (0, "Bridge-domain must be specified"); if (~0 == rd_id) return clib_error_return (0, "route-domain must be specified"); - gbp_endpoint_group_add_and_lock (epg_id, sclass, bd_id, rd_id, - uplink_sw_if_index); + gbp_endpoint_group_add_and_lock (vnid, sclass, bd_id, rd_id, + uplink_sw_if_index, &retention); } else - gbp_endpoint_group_delete (epg_id); + gbp_endpoint_group_delete (vnid); return (NULL); } @@ -309,16 +311,26 @@ gbp_endpoint_group_cli (vlib_main_t * vm, * Configure a GBP Endpoint Group * * @cliexpar - * @cliexstart{set gbp endpoint-group [del] epg bd } + * @cliexstart{gbp endpoint-group [del] epg bd rd [sclass ] []} * @cliexend ?*/ /* *INDENT-OFF* */ VLIB_CLI_COMMAND (gbp_endpoint_group_cli_node, static) = { .path = "gbp endpoint-group", - .short_help = "gbp endpoint-group [del] epg bd rd ", + .short_help = "gbp endpoint-group [del] epg bd rd [sclass ] []", .function = gbp_endpoint_group_cli, }; +static u8 * +format_gbp_endpoint_retention (u8 * s, va_list * args) +{ + gbp_endpoint_retention_t *rt = va_arg (*args, gbp_endpoint_retention_t*); + + s = format (s, "[remote-EP-timeout:%d]", rt->remote_ep_timeout); + + return (s); +} + u8 * format_gbp_endpoint_group (u8 * s, va_list * args) { @@ -326,12 +338,14 @@ format_gbp_endpoint_group (u8 * s, va_list * args) vnet_main_t *vnm = vnet_get_main (); if (NULL != gg) - s = format (s, "%d, sclass:%d bd:[%d,%d], rd:[%d] uplink:%U locks:%d", - gg->gg_id, + s = format (s, "[%d] %d, sclass:%d bd:[%d,%d] rd:[%d] uplink:%U retention:%U locks:%d", + gg - gbp_endpoint_group_pool, + gg->gg_vnid, gg->gg_sclass, gbp_endpoint_group_get_bd_id(gg), gg->gg_bd_index, gg->gg_rd, format_vnet_sw_if_index_name, vnm, gg->gg_uplink_sw_if_index, + format_gbp_endpoint_retention, &gg->gg_retention, gg->gg_locks); else s = format (s, "NULL");