VPP-470: Introduce VxLAN-GPE as transport for iOAM.

See Jira ticket for more details
- New plugins created to (a) Add VxLAN-GPE as transport (b) Provide export infra for
  VxLAN-GPE.

Change-Id: Ife50c7434f53d17a4783062310f73d063d53494c
Signed-off-by: Vengada Govindan <venggovi@cisco.com>

1 files changed, 70 insertions, 9 deletions

diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am
index 6e17959d71d..990f6da7a2d 100644
--- a/plugins/ioam-plugin/Makefile.am
+++ b/plugins/ioam-plugin/Makefile.am
@@ -68,7 +68,7 @@ vppapitestplugins_LTLIBRARIES = ioam_pot_test_plugin.la
 vppplugins_LTLIBRARIES = ioam_pot_plugin.la
 
 ########################################
-# iOAM trace export
+# iOAM trace export for IPv6
 ########################################
 
 ioam_export_plugin_la_SOURCES =   \
@@ -96,10 +96,10 @@ vppplugins_LTLIBRARIES += ioam_export_plugin.la
 ########################################
 # iOAM Trace
 ########################################
-ioam_trace_plugin_la_SOURCES =			\
-	ioam/lib-trace/trace_util.c			\
+libioam_trace_plugin_la_SOURCES =		\
+	ioam/lib-trace/trace_util.c		\
 	ioam/encap/ip6_ioam_trace.c		\
-	ioam/lib-trace/trace_util.h			\
+	ioam/lib-trace/trace_util.h		\
 	ioam/lib-trace/trace_api.c
 
 BUILT_SOURCES +=				\
@@ -108,17 +108,78 @@ BUILT_SOURCES +=				\
 
 noinst_HEADERS +=                       \
   ioam/export/ioam_export_all_api_h.h   \
-  ioam/lib-trace/trace_all_api_h.h			\
-  ioam/lib-trace/trace_msg_enum.h			\
-  ioam/lib-trace/trace.api.h			\
+  ioam/lib-trace/trace_all_api_h.h	\
+  ioam/lib-trace/trace_msg_enum.h	\
+  ioam/lib-trace/trace.api.h		\
   ioam/lib-trace/trace_util.h
 
 ioam_trace_test_plugin_la_SOURCES =		\
-	ioam/lib-trace/trace_test.c			\
+	ioam/lib-trace/trace_test.c		\
 	ioam/lib-trace/trace_plugin.api.h
 
 vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
-vppplugins_LTLIBRARIES += ioam_trace_plugin.la
+vppplugins_LTLIBRARIES += libioam_trace_plugin.la
+
+########################################
+# VxLAN-GPE
+########################################
+libioam_vxlan_gpe_plugin_la_SOURCES =			\
+	ioam/lib-vxlan-gpe/ioam_encap.c			\
+	ioam/lib-vxlan-gpe/ioam_decap.c			\
+	ioam/lib-vxlan-gpe/ioam_pop.c			\
+	ioam/lib-vxlan-gpe/vxlan_gpe_api.c		\
+	ioam/lib-vxlan-gpe/vxlan_gpe_ioam_trace.c	\
+    ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
+
+BUILT_SOURCES +=				\
+	ioam/lib-vxlan-gpe/vxlan_gpe.api.h		\
+	ioam/lib-vxlan-gpe/vxlan_gpe.api.json
+
+noinst_HEADERS +=                       \
+  ioam/export/ioam_export_all_api_h.h   \
+  ioam/lib-vxlan-gpe/vxlan_gpe_all_api_h.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_msg_enum.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe.api.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_util.h			\
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam_packet.h                    \
+  ioam/lib-vxlan-gpe/vxlan_gpe_ioam.h
+
+ioam_vxlan_gpe_test_plugin_la_SOURCES =		\
+	ioam/lib-vxlan-gpe/vxlan_gpe_test.c			\
+	ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h
+
+libioam_vxlan_gpe_plugin_la_LIBADD = libioam_trace_plugin.la
+
+vppapitestplugins_LTLIBRARIES += ioam_vxlan_gpe_test_plugin.la
+vppplugins_LTLIBRARIES += libioam_vxlan_gpe_plugin.la
+
+########################################
+# iOAM export for VxLAN-GPE
+########################################
+
+libvxlan_gpe_ioam_export_plugin_la_SOURCES =   \
+ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.c         \
+ioam/export-vxlan-gpe/vxlan_gpe_node.c                \
+ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h     \
+ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c
+
+BUILT_SOURCES +=				\
+	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h		\
+	ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.json
+
+noinst_HEADERS +=                                            \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_all_api_h.h       \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_msg_enum.h        \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api.h
+
+vxlan_gpe_ioam_export_test_plugin_la_SOURCES =          \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c      \
+  ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h
+
+libvxlan_gpe_ioam_export_plugin_la_LIBADD = libioam_vxlan_gpe_plugin.la
+
+vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la
+vppplugins_LTLIBRARIES += libvxlan_gpe_ioam_export_plugin.la
 
 ########################################
 # iOAM E2E plugin