Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP: use sclass in the DP for policy
[vpp.git]
/
src
/
plugins
/
gbp
/
gbp_endpoint_group.c
diff --git
a/src/plugins/gbp/gbp_endpoint_group.c
b/src/plugins/gbp/gbp_endpoint_group.c
index
a8c0b0f
..
d6e42e8
100644
(file)
--- 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
}
index_t
-gbp_endpoint_group_find (
epg_id_t epg_id
)
+gbp_endpoint_group_find (
sclass_t sclass
)
{
uword *p;
{
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];
if (NULL != p)
return p[0];
@@
-73,7
+73,7
@@
gbp_endpoint_group_find (epg_id_t epg_id)
}
int
}
int
-gbp_endpoint_group_add_and_lock (
epg_id_t epg_
id,
+gbp_endpoint_group_add_and_lock (
vnid_t vn
id,
u16 sclass,
u32 bd_id,
u32 rd_id,
u16 sclass,
u32 bd_id,
u32 rd_id,
@@
-83,7
+83,7
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
gbp_endpoint_group_t *gg;
index_t ggi;
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)
{
if (INDEX_INVALID == ggi)
{
@@
-108,7
+108,7
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
pool_get_zero (gbp_endpoint_group_pool, gg);
pool_get_zero (gbp_endpoint_group_pool, gg);
- gg->gg_
id = epg_
id;
+ gg->gg_
vnid = vn
id;
gg->gg_rd = grdi;
gg->gg_gbd = gbi;
gg->gg_bd_index = gb->gb_bd_index;
gg->gg_rd = grdi;
gg->gg_gbd = gbi;
gg->gg_bd_index = gb->gb_bd_index;
@@
-119,7
+119,7
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
gg->gg_retention = *retention;
if (SCLASS_INVALID != gg->gg_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_
vn
id);
/*
* an egress DVR dpo for internal subnets to use when sending
/*
* an egress DVR dpo for internal subnets to use when sending
@@
-145,9
+145,8
@@
gbp_endpoint_group_add_and_lock (epg_id_t epg_id,
L2INPUT_FEAT_GBP_NULL_CLASSIFY, 1);
}
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
{
}
else
{
@@
-196,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);
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
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;
{
index_t ggi;
- ggi = gbp_endpoint_group_find (
epg_id
);
+ ggi = gbp_endpoint_group_find (
sclass
);
if (INDEX_INVALID != ggi)
{
if (INDEX_INVALID != ggi)
{
@@
-261,7
+260,7
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
unformat_input_t * input, vlib_cli_command_t * cmd)
{
gbp_endpoint_retention_t retention = { 0 };
unformat_input_t * input, vlib_cli_command_t * cmd)
{
gbp_endpoint_retention_t retention = { 0 };
-
epg_id_t epg_id = EPG
_INVALID, sclass;
+
vnid_t vnid = VNID
_INVALID, sclass;
vnet_main_t *vnm = vnet_get_main ();
u32 uplink_sw_if_index = ~0;
u32 bd_id = ~0;
vnet_main_t *vnm = vnet_get_main ();
u32 uplink_sw_if_index = ~0;
u32 bd_id = ~0;
@@
-277,7
+276,7
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
add = 1;
else if (unformat (input, "del"))
add = 0;
add = 1;
else if (unformat (input, "del"))
add = 0;
- else if (unformat (input, "epg %d", &
epg_
id))
+ else if (unformat (input, "epg %d", &
vn
id))
;
else if (unformat (input, "sclass %d", &sclass))
;
;
else if (unformat (input, "sclass %d", &sclass))
;
@@
-289,7
+288,7
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
break;
}
break;
}
- if (
EPG_INVALID == epg_
id)
+ if (
VNID_INVALID == vn
id)
return clib_error_return (0, "EPG-ID must be specified");
if (add)
return clib_error_return (0, "EPG-ID must be specified");
if (add)
@@
-301,11
+300,11
@@
gbp_endpoint_group_cli (vlib_main_t * vm,
if (~0 == rd_id)
return clib_error_return (0, "route-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,
+ gbp_endpoint_group_add_and_lock (
vn
id, sclass, bd_id, rd_id,
uplink_sw_if_index, &retention);
}
else
uplink_sw_if_index, &retention);
}
else
- gbp_endpoint_group_delete (
epg_
id);
+ gbp_endpoint_group_delete (
vn
id);
return (NULL);
}
return (NULL);
}
@@
-324,6
+323,16
@@
VLIB_CLI_COMMAND (gbp_endpoint_group_cli_node, static) = {
.function = gbp_endpoint_group_cli,
};
.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)
{
u8 *
format_gbp_endpoint_group (u8 * s, va_list * args)
{
@@
-331,13
+340,14
@@
format_gbp_endpoint_group (u8 * s, va_list * args)
vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
vnet_main_t *vnm = vnet_get_main ();
if (NULL != gg)
- s = format (s, "[%d] %d, sclass:%d bd:[%d,%d]
, rd:[%d] uplink
:%U locks:%d",
+ s = format (s, "[%d] %d, sclass:%d bd:[%d,%d]
rd:[%d] uplink:%U retnetion
:%U locks:%d",
gg - gbp_endpoint_group_pool,
gg - gbp_endpoint_group_pool,
- gg->gg_id,
+ gg->gg_
vn
id,
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,
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");
gg->gg_locks);
else
s = format (s, "NULL");