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/vat2/jsonconvert.h | |
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/vat2/jsonconvert.h')
-rw-r--r-- | src/vat2/jsonconvert.h | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/src/vat2/jsonconvert.h b/src/vat2/jsonconvert.h new file mode 100644 index 00000000000..2e723fa637d --- /dev/null +++ b/src/vat2/jsonconvert.h @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2020 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 included_json_convert_h +#define included_json_convert_h + +#include <stdbool.h> +#include <vppinfra/cJSON.h> +#include <vnet/ethernet/mac_address.h> +#include <vnet/ip/ip6_packet.h> +#include <vnet/ip/ip_types.api_types.h> +#include <vnet/ethernet/ethernet_types.api_types.h> + +#define foreach_vat2_fromjson \ + _(i8) \ + _(u8) \ + _(i16) \ + _(u16) \ + _(i32) \ + _(u32) \ + _(u64) \ + _(f64) + +#define _(T) \ + int vl_api_ ##T## _fromjson(cJSON *o, T *d); + foreach_vat2_fromjson +#undef _ + +int vl_api_bool_fromjson(cJSON *o, bool *d); +void *vl_api_ip4_address_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip4_address_t *a); +void *vl_api_ip4_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip4_prefix_t *a); +void *vl_api_ip4_address_with_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip4_prefix_t *a); +void *vl_api_ip6_address_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip6_address_t *a); +void *vl_api_ip6_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip6_prefix_t *a); +void *vl_api_ip6_address_with_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_ip6_prefix_t *a); +void *vl_api_address_t_fromjson(void *mp, int *len, cJSON *o, vl_api_address_t *a); +void *vl_api_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_prefix_t *a); +void *vl_api_address_with_prefix_t_fromjson(void *mp, int *len, cJSON *o, vl_api_prefix_t *a); +void *vl_api_mac_address_t_fromjson(void *mp, int *len, cJSON *o, vl_api_mac_address_t *a); + +uword unformat_ip4_address(unformat_input_t * input, va_list * args); +uword unformat_ip6_address(unformat_input_t * input, va_list * args); +u8 *format_ip6_address(u8 * s, va_list * args); +uword unformat_mac_address(unformat_input_t * input, va_list * args); +u8 *format_ip4_address(u8 * s, va_list * args); +u8 *format_vl_api_interface_index_t(u8 *s, va_list *args); +uword unformat_vl_api_interface_index_t(unformat_input_t * input, va_list * args); +u8 *format_vl_api_timestamp_t(u8 * s, va_list * args); +u8 *format_vl_api_timedelta_t(u8 * s, va_list * args); +uword unformat_vl_api_timedelta_t(unformat_input_t * input, va_list * args); +uword unformat_vl_api_timestamp_t(unformat_input_t * input, va_list * args); +u8 *format_vl_api_gbp_scope_t(u8 * s, va_list * args); +uword unformat_vl_api_gbp_scope_t(unformat_input_t * input, va_list * args); + +int vl_api_c_string_to_api_string(const char *buf, vl_api_string_t * str); +void vl_api_string_cJSON_AddToObject(cJSON * const object, const char * const name, vl_api_string_t *astr); + +u8 *u8string_fromjson(cJSON *o, char *fieldname); +int u8string_fromjson2(cJSON *o, char *fieldname, u8 *data); +int vl_api_u8_string_fromjson(cJSON *o, u8 *s, int len); + +#define foreach_vat2_tojson \ + _(ip4_address) \ + _(ip4_prefix) \ + _(ip6_address) \ + _(ip6_prefix) \ + _(address) \ + _(prefix) \ + _(mac_address) + +#define _(T) \ + cJSON *vl_api_ ##T## _t_tojson(vl_api_ ##T## _t *); + foreach_vat2_tojson +#undef _ + +cJSON *vl_api_ip4_address_with_prefix_t_tojson (vl_api_ip4_prefix_t *a); +cJSON *vl_api_ip6_address_with_prefix_t_tojson (vl_api_ip6_prefix_t *a); +cJSON *vl_api_address_with_prefix_t_tojson (vl_api_prefix_t *a); + +#endif |