X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fioam.am;h=88439adfc644cb380ef9b9061e6739f862a6d9e7;hb=fe0a2c5a45e69eeff318e4419afe651eacfaea21;hp=14d8a9eb6d910f63d37fc64c6bcf6e5dc1415391;hpb=fdd81af6afe6c782ad2c1a139210378badec626b;p=vpp.git diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am index 14d8a9eb6d9..88439adfc64 100644 --- a/src/plugins/ioam.am +++ b/src/plugins/ioam.am @@ -32,12 +32,6 @@ IOAM_POT_NOINST_HDR = \ IOAM_POT_API = ioam/lib-pot/pot.api -ioam_pot_test_plugin_la_SOURCES = \ - ioam/lib-pot/pot_test.c \ - ioam/lib-pot/pot_plugin.api.h - -vppapitestplugins_LTLIBRARIES += ioam_pot_test_plugin.la - ######################################## # iOAM trace export for IPv6 ######################################## @@ -55,35 +49,27 @@ IOAM_EXPORT_NOINST_HDR = \ IOAM_EXPORT_API = ioam/export/ioam_export.api -ioam_export_test_plugin_la_SOURCES = \ - ioam/export/ioam_export_test.c \ - ioam/export/ioam_export_plugin.api.h - -vppapitestplugins_LTLIBRARIES += ioam_export_test_plugin.la - ######################################## # iOAM Trace ######################################## 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 = \ - 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_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 -ioam_trace_test_plugin_la_SOURCES = \ - ioam/lib-trace/trace_test.c \ - ioam/lib-trace/trace_plugin.api.h - -vppapitestplugins_LTLIBRARIES += ioam_trace_test_plugin.la +nobase_include_HEADERS += \ + ioam/lib-trace/trace_util.h \ + ioam/export-common/ioam_export.h ######################################## # VxLAN-GPE @@ -102,7 +88,6 @@ IOAM_VXLAN_GPE_SRC = \ ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_thread.c IOAM_VXLAN_GPE_NOINST_HDR = \ - 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/ioam_vxlan_gpe.api.h \ @@ -116,18 +101,6 @@ IOAM_VXLAN_GPE_NOINST_HDR = \ IOAM_VXLAN_GPE_API = ioam/lib-vxlan-gpe/ioam_vxlan_gpe.api IOAM_VXLAN_GPE_API += ioam/export-vxlan-gpe/vxlan_gpe_ioam_export.api -ioam_vxlan_gpe_test_plugin_la_SOURCES = \ - ioam/lib-vxlan-gpe/vxlan_gpe_test.c \ - ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h - -vppapitestplugins_LTLIBRARIES += ioam_vxlan_gpe_test_plugin.la - -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 - -vppapitestplugins_LTLIBRARIES += vxlan_gpe_ioam_export_test_plugin.la - ######################################## # iOAM E2E ######################################## @@ -163,32 +136,94 @@ IOAM_ANALYSE_SRC = \ 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 ######################################## # 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) \ - $(IPFIX_COLLECTOR_SRC) \ - $(IOAM_ANALYSE_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 += \ +nobase_apiinclude_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 +######################################## +# iOAM plugins +######################################## + +ioam_test_plugin_la_SOURCES = \ + ioam/ioam_test.c \ + ioam/lib-pot/pot_test.c \ + ioam/lib-pot/pot_plugin.api.h \ + ioam/lib-trace/trace_test.c \ + ioam/lib-trace/trace_plugin.api.h \ + ioam/export/ioam_export_test.c \ + ioam/export/ioam_export_plugin.api.h \ + ioam/lib-vxlan-gpe/vxlan_gpe_test.c \ + ioam/lib-vxlan-gpe/vxlan_gpe_plugin.api.h \ + ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c \ + ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_plugin.api.h \ + ioam/udp-ping/udp_ping_test.c \ + ioam/udp-ping/udp_ping_plugin.api.h + +vppapitestplugins_LTLIBRARIES += ioam_test_plugin.la + # vi:syntax=automake