diff options
author | Ole Troan <ot@cisco.com> | 2020-11-18 19:17:48 +0100 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2020-11-25 08:25:50 +0000 |
commit | df87f8092f5b6b54eef0d5acf3c27c2e398a401a (patch) | |
tree | 762a3da5d6757c6f475ffce6dcfae2b65b2c3850 /src/vnet | |
parent | c95cfa218b214bd1c67dc165b4ed1fb7a224bdad (diff) |
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 <ot@cisco.com>
Change-Id: Ib45ddeafb180ea7da8c5dc274a9274d7a4edc876
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'src/vnet')
-rw-r--r-- | src/vnet/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/vnet/ip/ip.api | 6 | ||||
-rw-r--r-- | src/vnet/l2/l2.api | 2 | ||||
-rw-r--r-- | src/vnet/l2/l2_api.c | 3 | ||||
-rw-r--r-- | src/vnet/mpls/mpls.api | 4 |
5 files changed, 13 insertions, 10 deletions
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt index 9f4dbb085d3..e387d25f913 100644 --- a/src/vnet/CMakeLists.txt +++ b/src/vnet/CMakeLists.txt @@ -864,7 +864,6 @@ list(APPEND VNET_HEADERS list(APPEND VNET_API_FILES srmpls/sr_mpls.api - srv6/sr_types.api ) ############################################################################## @@ -1501,3 +1500,10 @@ add_vpp_library (vatclient ) ############################################################################## +# VAT2 plugins +############################################################################## +add_vpp_test_library(vnet + ${VNET_API_FILES} +) + +############################################################################## diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api index 7ac9de783bb..8b18c1e764a 100644 --- a/src/vnet/ip/ip.api +++ b/src/vnet/ip/ip.api @@ -124,7 +124,7 @@ autoreply define ip_table_flush @param context - sender context @param table - description of the table */ -manual_endian manual_print define ip_table_details +define ip_table_details { u32 context; vl_api_ip_table_t table; @@ -184,7 +184,7 @@ define ip_route_dump /** \brief IP FIB table entry response @param route The route entry in the table */ -manual_endian manual_print define ip_route_details +define ip_route_details { u32 context; vl_api_ip_route_t route; @@ -339,7 +339,7 @@ define ip_mroute_dump /** \brief IP Multicast Route Details @param route - Details of the route */ -manual_endian manual_print define ip_mroute_details +define ip_mroute_details { u32 context; vl_api_ip_mroute_t route; 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 <vnet/vnet_all_api_h.h> #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 diff --git a/src/vnet/mpls/mpls.api b/src/vnet/mpls/mpls.api index fb3ab1a4798..9d4ec0bf7bf 100644 --- a/src/vnet/mpls/mpls.api +++ b/src/vnet/mpls/mpls.api @@ -86,7 +86,7 @@ define mpls_tunnel_dump /** \brief mpls tunnel details */ -manual_endian manual_print define mpls_tunnel_details +define mpls_tunnel_details { u32 context; vl_api_mpls_tunnel_t mt_tunnel; @@ -192,7 +192,7 @@ define mpls_route_dump @param count - the number of fib_path in path @param path - array of of fib_path structures */ -manual_endian manual_print define mpls_route_details +define mpls_route_details { u32 context; vl_api_mpls_route_t mr_route; |