commit 057b3565a09b62c9415a44a99f43ad891d864ca5
author Pierre Pfister <ppfister@cisco.com> Mon Dec 10 17:01:01 2018 +0100
committer Damjan Marion <dmarion@me.com> Wed Dec 12 00:34:13 2018 +0000
tree 403dc7e9e45d68bfe43941e55a016e65b9ad089e
parent bb5d22dafb394c6a619894bb803f770266f223f0

Change ipsec feature node names

ipsec4-output and ipsec6-output were conflicting with ipsec
interface names ("ipsec<id>") and vnet/interface.c autogenerated
output node ("<ifname>-output").

Changing feature names seems to be the less invasive option.
This patch also changes "input" feature names for consistency.

Change-Id: I4ba10d07e9ba09df20aa2500104252b06b55f8f7
Signed-off-by: Pierre Pfister <ppfister@cisco.com>

src/vnet/ipsec/ipsec_output.c

diff --git a/src/vnet/ipsec/ipsec_output.c b/src/vnet/ipsec/ipsec_output.c
index 6b99965..2ab98e7 100644
--- a/src/vnet/ipsec/ipsec_output.c
+++ b/src/vnet/ipsec/ipsec_output.c
@@ -428,7 +428,7 @@
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ipsec4_output_node) = {
-  .name = "ipsec4-output",
+  .name = "ipsec4-output-feature",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_output_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -454,7 +454,7 @@
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (ipsec6_output_node) = {
-  .name = "ipsec6-output",
+  .name = "ipsec6-output-feature",
   .vector_size = sizeof (u32),
   .format_trace = format_ipsec_output_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -487,13 +487,13 @@
 VLIB_REGISTER_NODE (ipsec4_output_node) = {
   .vector_size = sizeof (u32),
   .function = ipsec_output_node_fn,
-  .name = "ipsec4-output",
+  .name = "ipsec4-output-feature",
 };
 
 VLIB_REGISTER_NODE (ipsec6_output_node) = {
   .vector_size = sizeof (u32),
   .function = ipsec_output_node_fn,
-  .name = "ipsec6-output",
+  .name = "ipsec6-output-feature",
 };
 /* *INDENT-ON* */
 #endif