diff options
| -rw-r--r-- | src/plugins/ioam.am | 50 | ||||
| -rw-r--r-- | src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/export/ioam_export_test.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/ioam_test.c | 47 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-pot/pot_test.c | 3 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-trace/trace_test.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c | 2 | ||||
| -rw-r--r-- | src/plugins/ioam/udp-ping/udp_ping_test.c | 2 |
8 files changed, 73 insertions, 37 deletions
diff --git a/src/plugins/ioam.am b/src/plugins/ioam.am index dd59736c028..848e6cc2f32 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,12 +49,6 @@ 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 ######################################## @@ -119,18 +107,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 ######################################## @@ -201,13 +177,6 @@ UDP_PING_NOINST_HDR = \ 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 ######################################## @@ -242,4 +211,23 @@ nobase_apiinclude_HEADERS += \ 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/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 diff --git a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c index 7e66329a998..85e1ee37bcc 100644 --- a/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c +++ b/src/plugins/ioam/export-vxlan-gpe/vxlan_gpe_ioam_export_test.c @@ -151,7 +151,7 @@ vxlan_gpe_ioam_vat_api_hookup (vat_main_t * vam) } clib_error_t * -vat_plugin_register (vat_main_t * vam) +vxlan_gpe_ioam_export_vat_plugin_register (vat_main_t * vam) { export_test_main_t *sm = &export_test_main; u8 *name; diff --git a/src/plugins/ioam/export/ioam_export_test.c b/src/plugins/ioam/export/ioam_export_test.c index 70efc7e3e4e..2af4eeed51a 100644 --- a/src/plugins/ioam/export/ioam_export_test.c +++ b/src/plugins/ioam/export/ioam_export_test.c @@ -153,7 +153,7 @@ ioam_export_vat_api_hookup (vat_main_t * vam) } clib_error_t * -vat_plugin_register (vat_main_t * vam) +ioam_export_vat_plugin_register (vat_main_t * vam) { export_test_main_t *sm = &export_test_main; u8 *name; diff --git a/src/plugins/ioam/ioam_test.c b/src/plugins/ioam/ioam_test.c new file mode 100644 index 00000000000..323c8d75738 --- /dev/null +++ b/src/plugins/ioam/ioam_test.c @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2018 Cisco and/or its affiliates. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <vat/vat.h> +#include <vlibapi/api.h> +#include <vlibmemory/api.h> + +clib_error_t * vxlan_gpe_ioam_export_vat_plugin_register (vat_main_t * vam); +clib_error_t * pot_vat_plugin_register (vat_main_t *vam); +clib_error_t * trace_vat_plugin_register (vat_main_t * vam); +clib_error_t * vxlan_gpe_vat_plugin_register (vat_main_t * vam); +clib_error_t * udp_ping_vat_plugin_register (vat_main_t * vam); + +clib_error_t * +vat_plugin_register (vat_main_t *vam) +{ + clib_error_t *err; + + if ((err = pot_vat_plugin_register (vam))) + return err; + + if ((err = vxlan_gpe_ioam_export_vat_plugin_register (vam))) + return err; + + if ((err = trace_vat_plugin_register (vam))) + return err; + + if ((err = vxlan_gpe_vat_plugin_register(vam))) + return err; + + if ((err = udp_ping_vat_plugin_register (vam))) + return err; + + return 0; +} diff --git a/src/plugins/ioam/lib-pot/pot_test.c b/src/plugins/ioam/lib-pot/pot_test.c index 2b528ece54e..e02640b44dc 100644 --- a/src/plugins/ioam/lib-pot/pot_test.c +++ b/src/plugins/ioam/lib-pot/pot_test.c @@ -314,7 +314,8 @@ pot_vat_api_hookup (vat_main_t *vam) #undef _ } -clib_error_t * vat_plugin_register (vat_main_t *vam) +clib_error_t * +pot_vat_plugin_register (vat_main_t *vam) { pot_test_main_t * sm = &pot_test_main; u8 * name; diff --git a/src/plugins/ioam/lib-trace/trace_test.c b/src/plugins/ioam/lib-trace/trace_test.c index f598b7ee936..060c621836a 100644 --- a/src/plugins/ioam/lib-trace/trace_test.c +++ b/src/plugins/ioam/lib-trace/trace_test.c @@ -226,7 +226,7 @@ ioam_trace_vat_api_hookup (vat_main_t * vam) } clib_error_t * -vat_plugin_register (vat_main_t * vam) +trace_vat_plugin_register (vat_main_t * vam) { trace_test_main_t *sm = &trace_test_main; u8 *name; diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c index fdb4cf63b8b..ef24a500b9f 100644 --- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c +++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_test.c @@ -521,7 +521,7 @@ vxlan_gpe_vat_api_hookup (vat_main_t * vam) } clib_error_t * -vat_plugin_register (vat_main_t * vam) +vxlan_gpe_vat_plugin_register (vat_main_t * vam) { vxlan_gpe_test_main_t *sm = &vxlan_gpe_test_main; u8 *name; diff --git a/src/plugins/ioam/udp-ping/udp_ping_test.c b/src/plugins/ioam/udp-ping/udp_ping_test.c index 1ab8eec954a..9a5375cda0d 100644 --- a/src/plugins/ioam/udp-ping/udp_ping_test.c +++ b/src/plugins/ioam/udp-ping/udp_ping_test.c @@ -242,7 +242,7 @@ udp_ping_test_api_hookup (vat_main_t * vam) } clib_error_t * -vat_plugin_register (vat_main_t * vam) +udp_ping_vat_plugin_register (vat_main_t * vam) { udp_ping_test_main_t *sm = &udp_ping_test_main; u8 *name; |