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/vnet/l2/l2.api | 2 +- src/vnet/l2/l2_api.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'src/vnet/l2') diff --git a/src/vnet/l2/l2.api b/src/vnet/l2/l2.api index b6bd4b5f7b1..416874d94c2 100644 --- a/src/vnet/l2/l2.api +++ b/src/vnet/l2/l2.api @@ -315,7 +315,7 @@ typedef bridge_domain_sw_if @param bd_tag - optional textual tag for the bridge domain @param n_sw_ifs - number of sw_if_index's in the domain */ -manual_print manual_endian define bridge_domain_details +define bridge_domain_details { u32 context; u32 bd_id; diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c index c8690c6ccae..746c7fdf2a2 100644 --- a/src/vnet/l2/l2_api.c +++ b/src/vnet/l2/l2_api.c @@ -42,9 +42,6 @@ #include #undef vl_endianfun -#define vl_api_bridge_domain_details_t_endian vl_noop_handler -#define vl_api_bridge_domain_details_t_print vl_noop_handler - /* instantiate all the print functions we know about */ #define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) #define vl_printfun -- cgit 1.2.3-korg