summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-03-22 11:08:39 +0100
committerOle Trøan <otroan@employees.org>2017-03-22 13:43:14 +0000
commit1bfb0ddace3ebb9010275e4bdd847c8c493ff4b3 (patch)
tree307ea8e61479211574c88e3915bc612a1aeb942c
parent864b25d0777d3226f475ef7d0232cacec7127770 (diff)
vlib: add description field in plugin registration
Change-Id: I88b322a5d602f3d6d3310e971479180a89430e0e Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--src/examples/sample-plugin/sample/sample.c1
-rw-r--r--src/plugins/acl/acl.c1
-rw-r--r--src/plugins/dpdk/main.c1
-rw-r--r--src/plugins/flowperpkt/flowperpkt.c1
-rw-r--r--src/plugins/ila/ila.c1
-rw-r--r--src/plugins/ioam/encap/ip6_ioam_trace.c1
-rw-r--r--src/plugins/ixge/ixge.c1
-rw-r--r--src/plugins/lb/lb.c1
-rw-r--r--src/plugins/sixrd/sixrd.c3
-rw-r--r--src/plugins/snat/snat.c1
-rw-r--r--src/vlib/unix/plugin.c14
-rw-r--r--src/vlib/unix/plugin.h1
12 files changed, 21 insertions, 6 deletions
diff --git a/src/examples/sample-plugin/sample/sample.c b/src/examples/sample-plugin/sample/sample.c
index 01852746d24..2f8ac4c9857 100644
--- a/src/examples/sample-plugin/sample/sample.c
+++ b/src/examples/sample-plugin/sample/sample.c
@@ -61,6 +61,7 @@ _(SAMPLE_MACSWAP_ENABLE_DISABLE, sample_macswap_enable_disable)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = SAMPLE_PLUGIN_BUILD_VER,
+ .description = "Sample of VPP Plugin",
};
/* *INDENT-ON* */
diff --git a/src/plugins/acl/acl.c b/src/plugins/acl/acl.c
index 476fbc33eae..4a4dd43423e 100644
--- a/src/plugins/acl/acl.c
+++ b/src/plugins/acl/acl.c
@@ -80,6 +80,7 @@ _(MACIP_ACL_INTERFACE_GET, macip_acl_interface_get)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Access Control Lists",
};
/* *INDENT-ON* */
diff --git a/src/plugins/dpdk/main.c b/src/plugins/dpdk/main.c
index 8073a50ae4e..7ee2a785ee6 100644
--- a/src/plugins/dpdk/main.c
+++ b/src/plugins/dpdk/main.c
@@ -91,5 +91,6 @@ VLIB_INIT_FUNCTION (dpdk_main_init);
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Data Plane Development Kit (DPDK)",
};
/* *INDENT-ON* */
diff --git a/src/plugins/flowperpkt/flowperpkt.c b/src/plugins/flowperpkt/flowperpkt.c
index 587972f7bb1..3e5fc8b0c4d 100644
--- a/src/plugins/flowperpkt/flowperpkt.c
+++ b/src/plugins/flowperpkt/flowperpkt.c
@@ -448,6 +448,7 @@ _(FLOWPERPKT_TX_INTERFACE_ADD_DEL, flowperpkt_tx_interface_add_del)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Flow per Packet",
};
/* *INDENT-ON* */
diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c
index 52c7ea5567d..edbf3017f0f 100644
--- a/src/plugins/ila/ila.c
+++ b/src/plugins/ila/ila.c
@@ -825,6 +825,7 @@ ila_interface (u32 sw_if_index, u8 disable)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Identifier-locator addressing for IPv6",
};
/* *INDENT-ON* */
diff --git a/src/plugins/ioam/encap/ip6_ioam_trace.c b/src/plugins/ioam/encap/ip6_ioam_trace.c
index 57d3ec5de75..299ee88f9c8 100644
--- a/src/plugins/ioam/encap/ip6_ioam_trace.c
+++ b/src/plugins/ioam/encap/ip6_ioam_trace.c
@@ -411,6 +411,7 @@ VLIB_CLI_COMMAND (ip6_show_ioam_trace_cmd, static) = {
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Inbound OAM",
};
/* *INDENT-ON* */
diff --git a/src/plugins/ixge/ixge.c b/src/plugins/ixge/ixge.c
index 4eebc457eaa..f3c5cc09d65 100644
--- a/src/plugins/ixge/ixge.c
+++ b/src/plugins/ixge/ixge.c
@@ -2935,6 +2935,7 @@ ixge_set_next_node (ixge_rx_next_t next, char *name)
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
.default_disabled = 1,
+ .description = "Intel 82599 Family Native Driver (experimental)",
};
/* *INDENT-ON* */
diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index dc3f5be1b1b..add81236ae5 100644
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -734,6 +734,7 @@ int lb_vip_del(u32 vip_index)
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Load Balancer",
};
/* *INDENT-ON* */
diff --git a/src/plugins/sixrd/sixrd.c b/src/plugins/sixrd/sixrd.c
index 67a9a3ad4d5..983875257e3 100644
--- a/src/plugins/sixrd/sixrd.c
+++ b/src/plugins/sixrd/sixrd.c
@@ -356,8 +356,9 @@ VLIB_CLI_COMMAND(show_sixrd_stats_command, static) = {
};
/* *INDENT-OFF* */
-VLIB_PLUGIN_REGISTER () = {
+VLIB_PLUGIN_REGISTER () ={
.version = VPP_BUILD_VER,
+ .description = "IPv6 Rapid Deployment on IPv4 Infrastructure (RFC5969)",
};
/* *INDENT-ON* */
diff --git a/src/plugins/snat/snat.c b/src/plugins/snat/snat.c
index d42303f6a05..70b6a6e285e 100644
--- a/src/plugins/snat/snat.c
+++ b/src/plugins/snat/snat.c
@@ -107,6 +107,7 @@ VNET_FEATURE_INIT (ip4_snat_out2in_fast, static) = {
/* *INDENT-OFF* */
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
+ .description = "Network Address Translation",
};
/* *INDENT-ON* */
diff --git a/src/vlib/unix/plugin.c b/src/vlib/unix/plugin.c
index e9846e3bbe2..9b341cc8113 100644
--- a/src/vlib/unix/plugin.c
+++ b/src/vlib/unix/plugin.c
@@ -105,13 +105,13 @@ load_one_plugin (plugin_main_t * pm, plugin_info_t * pi, int from_early_init)
}
if (reg->default_disabled && pc->is_enabled == 0)
{
- clib_warning ("Plugin disabled: %s (default)", pi->name);
+ clib_warning ("Plugin disabled (default): %s", pi->name);
goto error;
}
}
else if (reg->default_disabled)
{
- clib_warning ("Plugin disabled: %s (default)", pi->name);
+ clib_warning ("Plugin disabled (default): %s", pi->name);
goto error;
}
@@ -184,7 +184,10 @@ load_one_plugin (plugin_main_t * pm, plugin_info_t * pi, int from_early_init)
(char *) pi->name, reg->early_init);
}
- clib_warning ("Loaded plugin: %s", pi->name);
+ if (reg->description)
+ clib_warning ("Loaded plugin: %s (%s)", pi->name, reg->description);
+ else
+ clib_warning ("Loaded plugin: %s", pi->name);
return 0;
error:
@@ -374,7 +377,7 @@ vlib_plugins_show_cmd_fn (vlib_main_t * vm,
plugin_info_t *pi;
s = format (s, " Plugin path is: %s\n\n", pm->plugin_path);
- s = format (s, " %-41s%s\n", "Plugin", "Version");
+ s = format (s, " %-41s%-33s%s\n", "Plugin", "Version", "Description");
/* *INDENT-OFF* */
hash_foreach_mem (key, value, pm->plugin_by_name_hash,
@@ -382,7 +385,8 @@ vlib_plugins_show_cmd_fn (vlib_main_t * vm,
if (key != 0)
{
pi = vec_elt_at_index (pm->plugin_info, value);
- s = format (s, "%3d. %-40s %s\n", index, key, pi->version);
+ s = format (s, "%3d. %-40s %-32s %s\n", index, key, pi->version,
+ pi->reg->description ? pi->reg->description : "");
index++;
}
});
diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
index 01fec3564fc..d9801ec439a 100644
--- a/src/vlib/unix/plugin.h
+++ b/src/vlib/unix/plugin.h
@@ -62,6 +62,7 @@ typedef CLIB_PACKED(struct {
const char version[32];
const char version_required[32];
const char *early_init;
+ const char *description;
}) vlib_plugin_registration_t;
/* *INDENT-ON* */