X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fioam.am;h=4ac69aacd538f636704f7df25864e7a32420e988;hb=faef07fdd048cf96626daa8e09ed995af8e30f00;hp=a2b298b130f7d1f9ffdb36b1ac7ff1e53e1ad9eb;hpb=a90ba9d3d0daf583f225617e57252f172e99df21;p=vpp.git

diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am
index a2b298b130f..4ac69aacd53 100644
--- a/src/plugins/ioam.am
+++ b/src/plugins/ioam.am
@@ -67,7 +67,6 @@ vppapitestplugins_LTLIBRARIES += ioam_export_test_plugin.la
 IOAM_TRACE_SRC =				\
 	ioam/lib-trace/trace_util.c		\
 	ioam/encap/ip6_ioam_trace.c		\
-	ioam/lib-trace/trace_util.h		\
 	ioam/lib-trace/trace_api.c
 
 IOAM_TRACE_NOINST_HDR =                 \
@@ -75,7 +74,9 @@ IOAM_TRACE_NOINST_HDR =                 \
   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/lib-trace/trace_util.h		\
+  ioam/encap/ip6_ioam_trace.h		\
+  ioam/lib-trace/trace_config.h
 
 IOAM_TRACE_API = ioam/lib-trace/trace.api
 
@@ -85,6 +86,10 @@ ioam_trace_test_plugin_la_SOURCES =		\
 
 vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la
 
+nobase_include_HEADERS +=                       \
+       ioam/lib-trace/trace_util.h		\
+       ioam/export-common/ioam_export.h
+
 ########################################
 # VxLAN-GPE
 ########################################
@@ -129,41 +134,113 @@ vxlan_gpe_ioam_export_test_plugin_la_SOURCES =          \
 vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la
 
 ########################################
-# iOAM E2E plugin
+# iOAM E2E
 ########################################
 
 IOAM_E2E_SRC =                			\
 	ioam/encap/ip6_ioam_e2e.c               \
-	ioam/encap/ip6_ioam_seqno.c             \
-	ioam/encap/ip6_ioam_seqno_analyse.c
+	ioam/encap/ip6_ioam_seqno.c		\
+	ioam/lib-e2e/ioam_seqno_lib.c
 
-IOAM_E2E_NOINST_HDR =                   \
+IOAM_E2E_NOINST_HDR =                    \
 	ioam/encap/ip6_ioam_e2e.h        \
-	ioam/encap/ip6_ioam_seqno.h
+	ioam/encap/ip6_ioam_seqno.h	 \
+	ioam/lib-e2e/ioam_seqno_lib.h
+
+########################################
+# ipfix collector
+########################################
+
+IPFIX_COLLECTOR_SRC =				\
+	ioam/ipfixcollector/ipfixcollector.c	\
+	ioam/ipfixcollector/node.c		\
+	ioam/ipfixcollector/ipfixcollector.h
+
+########################################
+# iOAM Analyse
+########################################
+
+IOAM_ANALYSE_SRC = 				\
+	ioam/analyse/ip6/ip6_ioam_analyse.c	\
+	ioam/analyse/ip6/node.c			\
+	ioam/analyse/ip6/ip6_ioam_analyse.h	\
+	ioam/analyse/ioam_summary_export.c	\
+	ioam/analyse/ioam_analyse.h		\
+	ioam/analyse/ioam_summary_export.h
+
+########################################
+# iOAM record cache and rewrite
+########################################
+
+IOAM_IP6_MANYCAST_SRC =        \
+ioam/ip6/ioam_cache.c                     \
+ioam/ip6/ioam_cache_node.c                \
+ioam/ip6/ioam_cache_tunnel_select_node.c  \
+ioam/ip6/ioam_cache.api.h
+
+IOAM_IP6_MANYCAST_API = ioam/ip6/ioam_cache.api
+
+IOAM_IP6_MANYCAST_NOINST_HDR =      \
+  ioam/ip6/ioam_cache_all_api_h.h   \
+  ioam/ip6/ioam_cache_msg_enum.h    \
+  ioam/ip6/ioam_cache.api.h
+
+# udp ping
+########################################
+
+UDP_PING_SRC = 					        \
+	ioam/udp-ping/udp_ping_node.c	    \
+	ioam/udp-ping/udp_ping_util.c		\
+	ioam/udp-ping/udp_ping_export.c		\
+	ioam/udp-ping/udp_ping_api.c
+
+UDP_PING_NOINST_HDR = 				    \
+	ioam/udp-ping/udp_ping_packet.h		\
+	ioam/udp-ping/udp_ping.h		    \
+	ioam/udp-ping/udp_ping_util.h		\
+	ioam/udp-ping/udp_ping_all_api_h.h	\
+	ioam/udp-ping/udp_ping_msg_enum.h	\
+	ioam/udp-ping/udp_ping.api.h
+
+UDP_PING_API = ioam/udp-ping/udp_ping.api
+
+udp_ping_test_plugin_la_SOURCES =          	\
+	ioam/udp-ping/udp_ping_test.c			\
+	ioam/udp-ping/udp_ping_plugin.api.h  
 
+vppapitestplugins_LTLIBRARIES += udp_ping_test_plugin.la
+ 
 ########################################
 # iOAM plugins
 ########################################
 
-ioam_plugin_la_SOURCES =		\
-        $(IOAM_POT_SRC)                 \
-        $(IOAM_EXPORT_SRC)              \
-        $(IOAM_TRACE_SRC)               \
+ioam_plugin_la_SOURCES =		    \
+        $(IOAM_POT_SRC)             \
+        $(IOAM_EXPORT_SRC)          \
+        $(IOAM_TRACE_SRC)           \
         $(IOAM_VXLAN_GPE_SRC)   	\
-        $(IOAM_E2E_SRC)
+        $(IOAM_E2E_SRC)			    \
+		$(IPFIX_COLLECTOR_SRC)		\
+		$(IOAM_ANALYSE_SRC)		    \
+        $(IOAM_IP6_MANYCAST_SRC)    \
+		$(UDP_PING_SRC)
 
-API_FILES +=				\
+API_FILES +=				            \
         $(IOAM_POT_API)                 \
         $(IOAM_EXPORT_API)              \
         $(IOAM_TRACE_API)               \
-        $(IOAM_VXLAN_GPE_API)
+        $(IOAM_VXLAN_GPE_API)		    \
+        $(IOAM_IP6_MANYCAST_API)        \
+		$(UDP_PING_API)
 
 noinst_HEADERS +=                               \
         $(IOAM_POT_NOINST_HDR)                  \
         $(IOAM_EXPORT_NOINST_HDR)               \
         $(IOAM_TRACE_NOINST_HDR)                \
         $(IOAM_VXLAN_GPE_NOINST_HDR)            \
-        $(IOAM_E2E_NOINST_HDR)
+        $(IOAM_E2E_NOINST_HDR)			        \
+        $(IOAM_IP6_MANYCAST_NOINST_HDR)         \
+		$(UDP_PING_NOINST_HDR)
 
 vppplugins_LTLIBRARIES += ioam_plugin.la