From df87f8092f5b6b54eef0d5acf3c27c2e398a401a Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Wed, 18 Nov 2020 19:17:48 +0100 Subject: api: vat2 and json autogeneration for api messages VAT2: A completely auto-generated replacement of VAT. Reads input message in JSON from stdin and outputs received messages in JSON. A VAT2 plugin is automatically built for a .api file. There no longer a need for a separate _test.c. Example: vat2 show_version {} { "_msgname": "show_version_reply", "retval": 0, "program": "vpe", "version": "21.01-rc0~411-gf6eb348a6", "build_date": "2020-11-19T09:49:25", "build_directory": "/vpp/autogen3" } vat2 sw_interface_dump '{"sw_if_index": -1, "name_filter_valid": 0, "name_filter": ""}' [{ "_msgname": "sw_interface_details", "sw_if_index": 0, "sup_sw_if_index": 0, "l2_address": "00:00:00:00:00:00", "flags": "Invalid ENUM", "type": "IF_API_TYPE_HARDWARE", "link_duplex": "LINK_DUPLEX_API_UNKNOWN", "link_speed": 0, "link_mtu": 0, "mtu": [0, 0, 0, 0], "sub_id": 0, "sub_number_of_tags": 0, "sub_outer_vlan_id": 0, "sub_inner_vlan_id": 0, "sub_if_flags": "Invalid ENUM", "vtr_op": 0, "vtr_push_dot1q": 0, "vtr_tag1": 0, "vtr_tag2": 0, "outer_tag": 0, "b_dmac": "00:00:00:00:00:00", "b_smac": "00:00:00:00:00:00", "b_vlanid": 0, "i_sid": 0, "interface_name": "local0", "interface_dev_type": "local", "tag": "" }] This is the first phase and vat2 is not integrated in packaging yet. Type: feature Signed-off-by: Ole Troan Change-Id: Ib45ddeafb180ea7da8c5dc274a9274d7a4edc876 Signed-off-by: Ole Troan --- src/cmake/api.cmake | 21 ++++++++++++++++++++- src/cmake/library.cmake | 32 ++++++++++++++++++++++++++++++++ src/cmake/plugin.cmake | 6 +++++- 3 files changed, 57 insertions(+), 2 deletions(-) (limited to 'src/cmake') diff --git a/src/cmake/api.cmake b/src/cmake/api.cmake index fe2cad6bc46..f3af68748d6 100644 --- a/src/cmake/api.cmake +++ b/src/cmake/api.cmake @@ -23,13 +23,32 @@ function(vpp_generate_api_c_header file) if (VPP_INCLUDE_DIR) set(includedir "--includedir" ${VPP_INCLUDE_DIR}) endif() - add_custom_command (OUTPUT ${output_name} + + set(OUTPUT_HEADERS + "${CMAKE_CURRENT_BINARY_DIR}/${file}.h" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_fromjson.h" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_tojson.h" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h" + "${CMAKE_CURRENT_BINARY_DIR}/${file}.c" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_test.c" + "${CMAKE_CURRENT_BINARY_DIR}/${file}_test2.c" + ) + + add_custom_command ( + OUTPUT ${OUTPUT_HEADERS} COMMAND mkdir -p ${output_dir} COMMAND ${VPP_APIGEN} ARGS ${includedir} --includedir ${CMAKE_SOURCE_DIR} --input ${CMAKE_CURRENT_SOURCE_DIR}/${file} --outputdir ${output_dir} --output ${output_name} DEPENDS ${VPP_APIGEN} ${CMAKE_CURRENT_SOURCE_DIR}/${file} COMMENT "Generating API header ${output_name}" ) + get_filename_component(barename ${file} NAME) + set(t ${barename}_deps) + if (NOT TARGET ${t}) + add_custom_target(${t} ALL DEPENDS ${OUTPUT_HEADERS}) + add_dependencies(api_headers ${t}) + endif() endfunction() function(vpp_generate_api_json_header file dir component) diff --git a/src/cmake/library.cmake b/src/cmake/library.cmake index a5b6c76d2d1..3f17e30daab 100644 --- a/src/cmake/library.cmake +++ b/src/cmake/library.cmake @@ -57,6 +57,8 @@ macro(add_vpp_library lib) FILES ${file} ${CMAKE_CURRENT_BINARY_DIR}/${file}.h ${CMAKE_CURRENT_BINARY_DIR}/${file}_enum.h ${CMAKE_CURRENT_BINARY_DIR}/${file}_types.h + ${CMAKE_CURRENT_BINARY_DIR}/${file}_tojson.h + ${CMAKE_CURRENT_BINARY_DIR}/${file}_fromjson.h DESTINATION include/${lib}/${dir} COMPONENT vpp-dev ) @@ -93,3 +95,33 @@ function (add_vpp_headers path) ) endforeach() endfunction() + +macro(add_vpp_test_library lib) + cmake_parse_arguments(TEST + "" + "" + ${ARGN} + ) + + foreach(file ${ARGN}) + get_filename_component(name ${file} NAME_WE) + set(test_lib ${lib}_${name}_plugin) + add_library(${test_lib} SHARED ${file}_test2.c) + if(NOT VPP_EXTERNAL_PROJECT) + add_dependencies(${test_lib} api_headers) + endif() + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + set_target_properties(${test_lib} PROPERTIES NO_SONAME 1) + set_target_properties(${test_lib} PROPERTIES + PREFIX "" + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/vat2_plugins) + + # Later: Install and package + # install .so + #install( + # TARGETS ${test_lib} + # DESTINATION ${VPP_LIBRARY_DIR}/vat2_plugins + # #COMPONENT ${ARG_COMPONENT} + # ) + endforeach() +endmacro() diff --git a/src/cmake/plugin.cmake b/src/cmake/plugin.cmake index 2aae89510c1..c165b5914dc 100644 --- a/src/cmake/plugin.cmake +++ b/src/cmake/plugin.cmake @@ -15,7 +15,7 @@ macro(add_vpp_plugin name) cmake_parse_arguments(PLUGIN "" "LINK_FLAGS;COMPONENT;DEV_COMPONENT" - "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES" + "SOURCES;API_FILES;MULTIARCH_SOURCES;LINK_LIBRARIES;INSTALL_HEADERS;API_TEST_SOURCES;" ${ARGN} ) set(plugin_name ${name}_plugin) @@ -99,6 +99,10 @@ macro(add_vpp_plugin name) COMPONENT ${PLUGIN_COMPONENT} ) endif() + if (PLUGIN_API_FILES) + add_vpp_test_library(${name}_test_plugin ${PLUGIN_API_FILES}) + endif() + install( TARGETS ${plugin_name} DESTINATION ${VPP_LIBRARY_DIR}/vpp_plugins -- cgit 1.2.3-korg