summaryrefslogtreecommitdiffstats
path: root/src/vpp-api
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2021-09-15 09:02:08 -0700
committerOle Tr�an <otroan@employees.org>2021-09-27 08:01:44 +0000
commita1400cecb8d8b423e83bd584e59fa817b8a243d9 (patch)
treefd812dd3cd4818d69ada7fc1972edc7fd8f10081 /src/vpp-api
parent400f23f9d02552fb650d6de46bef7ba42b3482fe (diff)
misc: api move continued
Move control ping and change dependencies from vpe.api_types to memclnt.api_types Type: refactor Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I9f8bc442e28738c48d64d1f6794082c8c4f5725b
Diffstat (limited to 'src/vpp-api')
-rw-r--r--src/vpp-api/client/test.c3
-rw-r--r--src/vpp-api/vapi/vapi.c3
-rwxr-xr-xsrc/vpp-api/vapi/vapi_c_gen.py6
3 files changed, 8 insertions, 4 deletions
diff --git a/src/vpp-api/client/test.c b/src/vpp-api/client/test.c
index 9bfed996e1b..4e98dc03a14 100644
--- a/src/vpp-api/client/test.c
+++ b/src/vpp-api/client/test.c
@@ -37,6 +37,9 @@
#include "vppapiclient.h"
#include "stat_client.h"
+#include <vlibmemory/vlib.api_enum.h>
+#include <vlibmemory/vlib.api_types.h>
+
#define vl_typedefs /* define message structures */
#include <vpp/api/vpe_all_api_h.h>
#undef vl_typedefs
diff --git a/src/vpp-api/vapi/vapi.c b/src/vpp-api/vapi/vapi.c
index ec87e7b7b72..1bd8e5bdd9f 100644
--- a/src/vpp-api/vapi/vapi.c
+++ b/src/vpp-api/vapi/vapi.c
@@ -31,6 +31,7 @@
#include <vlibapi/api_common.h>
#include <vlibmemory/memory_client.h>
+#include <vapi/vlib.api.vapi.h>
#include <vapi/memclnt.api.vapi.h>
/* we need to use control pings for some stuff and because we're forced to put
@@ -40,7 +41,7 @@ vapi_msg_id_t vapi_msg_id_control_ping = 0;
vapi_msg_id_t vapi_msg_id_control_ping_reply = 0;
DEFINE_VAPI_MSG_IDS_MEMCLNT_API_JSON;
-DEFINE_VAPI_MSG_IDS_VPE_API_JSON;
+DEFINE_VAPI_MSG_IDS_VLIB_API_JSON;
struct
{
diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py
index f0a284ccbc1..eacfab41555 100755
--- a/src/vpp-api/vapi/vapi_c_gen.py
+++ b/src/vpp-api/vapi/vapi_c_gen.py
@@ -705,12 +705,12 @@ def gen_json_unified_header(parser, logger, j, io, name):
print("#ifdef __cplusplus")
print("extern \"C\" {")
print("#endif")
- if name == "vpe.api.vapi.h":
+ if name == "vlib.api.vapi.h":
print("")
print("static inline vapi_error_e vapi_send_with_control_ping "
"(vapi_ctx_t ctx, void * msg, u32 context);")
else:
- print("#include <vapi/vpe.api.vapi.h>")
+ print("#include <vapi/vlib.api.vapi.h>")
print("")
for m in parser.messages_by_json[j].values():
print("extern vapi_msg_id_t %s;" % m.get_msg_id_name())
@@ -737,7 +737,7 @@ def gen_json_unified_header(parser, logger, j, io, name):
print("")
- if name == "vpe.api.vapi.h":
+ if name == "vlib.api.vapi.h":
print("%s" % vapi_send_with_control_ping)
print("")