summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2018-01-15 04:43:02 -0800
committerDave Barach <openvpp@barachs.net>2018-01-17 16:11:59 +0000
commit34ae9b1a5463405d7fa9826605c2becceed38253 (patch)
treec49853a5e70bf1baa3d5aec2805a8ee029b118c0 /src/plugins
parent663ac58e1865acf669af43846b729ddf0782d20d (diff)
stn: add vat support
Change-Id: Ifba0a4a297b6c01d75b86bc211a32740af5e48ed Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/stn.am19
-rw-r--r--src/plugins/stn/stn_all_api_h.h16
-rw-r--r--src/plugins/stn/stn_api.c32
-rw-r--r--src/plugins/stn/stn_msg_enum.h38
-rw-r--r--src/plugins/stn/stn_test.c179
5 files changed, 260 insertions, 24 deletions
diff --git a/src/plugins/stn.am b/src/plugins/stn.am
index e2f1a179b18..5e755e2db4e 100644
--- a/src/plugins/stn.am
+++ b/src/plugins/stn.am
@@ -12,15 +12,24 @@
# limitations under the License.
vppplugins_LTLIBRARIES += stn_plugin.la
+vppapitestplugins_LTLIBRARIES += stn_test_plugin.la
-stn_plugin_la_SOURCES = stn/stn.c stn/stn_api.c
+stn_plugin_la_SOURCES = \
+ stn/stn.c \
+ stn/stn_api.c \
+ stn/stn_plugin.api.h
-BUILT_SOURCES += \
- stn/stn.api.h \
- stn/stn.api.json
+stn_test_plugin_la_SOURCES = \
+ stn/stn_test.c \
+ stn/stn_plugin.api.h
noinst_HEADERS += stn/stn.h
+nobase_apiinclude_HEADERS += \
+ stn/stn_all_api_h.h \
+ stn/stn_msg_enum.h \
+ stn/stn.api.h
+
API_FILES += stn/stn.api
-# vi:syntax=automake \ No newline at end of file
+# vi:syntax=automake
diff --git a/src/plugins/stn/stn_all_api_h.h b/src/plugins/stn/stn_all_api_h.h
new file mode 100644
index 00000000000..0abee00afb2
--- /dev/null
+++ b/src/plugins/stn/stn_all_api_h.h
@@ -0,0 +1,16 @@
+/*
+ * 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 the generated file, see BUILT_SOURCES in Makefile.am */
+#include <stn/stn.api.h>
diff --git a/src/plugins/stn/stn_api.c b/src/plugins/stn/stn_api.c
index 1052dd751e7..2f52c74659f 100644
--- a/src/plugins/stn/stn_api.c
+++ b/src/plugins/stn/stn_api.c
@@ -22,34 +22,27 @@
#include <vppinfra/byte_order.h>
/* define message IDs */
-#define vl_msg_id(n,h) n,
-typedef enum
-{
-#include <stn/stn.api.h>
- /* We'll want to know how many messages IDs we need... */
- VL_MSG_FIRST_AVAILABLE,
-} vl_msg_id_t;
-#undef vl_msg_id
+#include <stn/stn_msg_enum.h>
/* define message structures */
#define vl_typedefs
-#include <stn/stn.api.h>
+#include <stn/stn_all_api_h.h>
#undef vl_typedefs
/* define generated endian-swappers */
#define vl_endianfun
-#include <stn/stn.api.h>
+#include <stn/stn_all_api_h.h>
#undef vl_endianfun
/* instantiate all the print functions we know about */
#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__)
#define vl_printfun
-#include <stn/stn.api.h>
+#include <stn/stn_all_api_h.h>
#undef vl_printfun
/* Get the API version number */
#define vl_api_version(n,v) static u32 api_version=(v);
-#include <nat/nat_all_api_h.h>
+#include <stn/stn_all_api_h.h>
#undef vl_api_version
#define REPLY_MSG_ID_BASE stn_main.msg_id_base
@@ -108,14 +101,15 @@ vl_api_stn_add_del_rule_t_handler (vl_api_stn_add_del_rule_t * mp)
}
static void
-send_stn_rule_details (stn_rule_t * r, svm_queue_t * q, u32 context)
+send_stn_rule_details (stn_rule_t * r, vl_api_registration_t * reg,
+ u32 context)
{
vl_api_stn_rule_details_t *rmp;
rmp = vl_msg_api_alloc (sizeof (*rmp));
memset (rmp, 0, sizeof (*rmp));
rmp->_vl_msg_id =
- clib_host_to_net_u32 (VL_API_STN_RULE_DETAILS + stn_main.msg_id_base);
+ clib_host_to_net_u16 (VL_API_STN_RULE_DETAILS + stn_main.msg_id_base);
if (ip46_address_is_ip4 (&r->address))
{
@@ -130,23 +124,23 @@ send_stn_rule_details (stn_rule_t * r, svm_queue_t * q, u32 context)
rmp->context = context;
rmp->sw_if_index = clib_host_to_net_u32 (r->sw_if_index);
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (reg, (u8 *) rmp);
}
static void
vl_api_stn_rules_dump_t_handler (vl_api_stn_rules_dump_t * mp)
{
- svm_queue_t *q;
+ vl_api_registration_t *reg;
stn_main_t *stn = &stn_main;
stn_rule_t *r;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (reg == 0)
return;
/* *INDENT-OFF* */
pool_foreach (r, stn->rules,({
- send_stn_rule_details (r, q, mp->context);
+ send_stn_rule_details (r, reg, mp->context);
}));
/* *INDENT-ON* */
}
diff --git a/src/plugins/stn/stn_msg_enum.h b/src/plugins/stn/stn_msg_enum.h
new file mode 100644
index 00000000000..7e6027d2353
--- /dev/null
+++ b/src/plugins/stn/stn_msg_enum.h
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+#ifndef SRC_PLUGINS_STN_STN_MSG_ENUM_H_
+#define SRC_PLUGINS_STN_STN_MSG_ENUM_H_
+
+#include <vppinfra/byte_order.h>
+
+#define vl_msg_id(n,h) n,
+typedef enum
+{
+#include <stn/stn_all_api_h.h>
+ /* We'll want to know how many messages IDs we need... */
+ VL_MSG_FIRST_AVAILABLE,
+} vl_msg_id_t;
+#undef vl_msg_id
+
+#endif /* SRC_PLUGINS_STN_STN_MSG_ENUM_H_ */
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */
diff --git a/src/plugins/stn/stn_test.c b/src/plugins/stn/stn_test.c
new file mode 100644
index 00000000000..a4497cd22ab
--- /dev/null
+++ b/src/plugins/stn/stn_test.c
@@ -0,0 +1,179 @@
+/*
+ * 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>
+#include <vppinfra/error.h>
+
+#include <stn/stn.h>
+
+#define __plugin_msg_base stn_test_main.msg_id_base
+#include <vlibapi/vat_helper_macros.h>
+
+/* Declare message IDs */
+#include <stn/stn_msg_enum.h>
+
+/* Get CRC codes of the messages defined outside of this plugin */
+#define vl_msg_name_crc_list
+#include <vpp/api/vpe_all_api_h.h>
+#undef vl_msg_name_crc_list
+
+/* define message structures */
+#define vl_typedefs
+#include <vpp/api/vpe_all_api_h.h>
+#include <stn/stn_all_api_h.h>
+#undef vl_typedefs
+
+/* define message structures */
+#define vl_endianfun
+#include <stn/stn_all_api_h.h>
+#undef vl_endianfun
+
+/* instantiate all the print functions we know about */
+#define vl_print(handle, ...)
+#define vl_printfun
+#include <stn/stn_all_api_h.h>
+#undef vl_printfun
+
+/* Get the API version number. */
+#define vl_api_version(n,v) static u32 api_version=(v);
+#include <stn/stn_all_api_h.h>
+#undef vl_api_version
+
+typedef struct
+{
+ /* API message ID base */
+ u16 msg_id_base;
+ u32 ping_id;
+ vat_main_t *vat_main;
+} stn_test_main_t;
+
+stn_test_main_t stn_test_main;
+
+/*
+ * Table of message reply handlers, must include boilerplate handlers
+ * we just generated
+ */
+#define foreach_stn_api_reply_msg \
+_(STN_RULE_DETAILS, stn_rule_details)
+
+static int
+api_stn_rules_dump (vat_main_t * vam)
+{
+ stn_test_main_t *sm = &stn_test_main;
+ vl_api_stn_rules_dump_t *mp;
+ vl_api_control_ping_t *mp_ping;
+ int ret;
+
+ if (!vam->json_output)
+ {
+ print (vam->ofp, "%=20s", "STN Rules");
+ }
+
+ M (STN_RULES_DUMP, mp);
+ /* send it... */
+ S (mp);
+
+ /* Use a control ping for synchronization */
+ mp_ping = vl_msg_api_alloc_as_if_client (sizeof (*mp_ping));
+ mp_ping->_vl_msg_id = htons (sm->ping_id);
+ mp_ping->client_index = vam->my_client_index;
+
+ fformat (vam->ofp, "Sending ping id=%d\n", sm->ping_id);
+
+ vam->result_ready = 0;
+ S (mp_ping);
+
+ /* Wait for a reply... */
+ W (ret);
+ return ret;
+}
+
+static void
+vl_api_stn_rule_details_t_handler (vl_api_stn_rule_details_t * mp)
+{
+ vat_main_t *vam = stn_test_main.vat_main;
+ fformat (vam->ofp, "addr: %U sw_if_index: %u\n",
+ mp->is_ip4 ? format_ip4_address : format_ip6_address,
+ mp->ip_address, clib_net_to_host_u32 (mp->sw_if_index));
+}
+
+/*
+ * List of messages that the api test plugin sends,
+ * and that the data plane plugin processes
+ */
+#define foreach_stn_api_msg \
+_(stn_rules_dump, "") \
+
+static void
+stn_vat_api_hookup (vat_main_t * vam)
+{
+ stn_test_main_t *sm = &stn_test_main;
+ /* Hook up handlers for replies from the data plane plug-in */
+#define _(N,n) \
+ vl_msg_api_set_handlers((VL_API_##N + sm->msg_id_base), \
+ #n, \
+ vl_api_##n##_t_handler, \
+ vl_noop_handler, \
+ vl_api_##n##_t_endian, \
+ vl_api_##n##_t_print, \
+ sizeof(vl_api_##n##_t), 1);
+ foreach_stn_api_reply_msg;
+#undef _
+
+ /* API messages we can send */
+#define _(n,h) hash_set_mem (vam->function_by_name, #n, api_##n);
+ foreach_stn_api_msg;
+#undef _
+
+ /* Help strings */
+#define _(n,h) hash_set_mem (vam->help_by_name, #n, h);
+ foreach_stn_api_msg;
+#undef _
+}
+
+clib_error_t *
+vat_plugin_register (vat_main_t * vam)
+{
+ stn_test_main_t *sm = &stn_test_main;
+ u8 *name;
+
+ sm->vat_main = vam;
+
+ name = format (0, "stn_%08x%c", api_version, 0);
+ sm->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
+
+ /* Get the control ping ID */
+#define _(id,n,crc) \
+ const char *id ## _CRC __attribute__ ((unused)) = #n "_" #crc;
+ foreach_vl_msg_name_crc_vpe;
+#undef _
+ sm->ping_id = vl_msg_api_get_msg_index ((u8 *) (VL_API_CONTROL_PING_CRC));
+
+ if (sm->msg_id_base != (u16) ~ 0)
+ stn_vat_api_hookup (vam);
+
+ vec_free (name);
+
+ return 0;
+}
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */