summaryrefslogtreecommitdiffstats
path: root/src/plugins/lb
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2020-11-18 19:17:48 +0100
committerNeale Ranns <nranns@cisco.com>2020-11-25 08:25:50 +0000
commitdf87f8092f5b6b54eef0d5acf3c27c2e398a401a (patch)
tree762a3da5d6757c6f475ffce6dcfae2b65b2c3850 /src/plugins/lb
parentc95cfa218b214bd1c67dc165b4ed1fb7a224bdad (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/plugins/lb')
-rw-r--r--src/plugins/lb/api.c77
-rw-r--r--src/plugins/lb/lb.api8
2 files changed, 4 insertions, 81 deletions
diff --git a/src/plugins/lb/api.c b/src/plugins/lb/api.c
index 253cf5b5ba8..176da24ce16 100644
--- a/src/plugins/lb/api.c
+++ b/src/plugins/lb/api.c
@@ -65,19 +65,6 @@ vl_api_lb_conf_t_handler
REPLY_MACRO (VL_API_LB_CONF_REPLY);
}
-static void *vl_api_lb_conf_t_print
-(vl_api_lb_conf_t *mp, void * handle)
-{
- u8 * s;
- s = format (0, "SCRIPT: lb_conf ");
- s = format (s, "%U ", format_ip4_address, (ip4_address_t *)&mp->ip4_src_address);
- s = format (s, "%U ", format_ip6_address, (ip6_address_t *)&mp->ip6_src_address);
- s = format (s, "%u ", mp->sticky_buckets_per_core);
- s = format (s, "%u ", mp->flow_timeout);
- FINISH;
-}
-
-
static void
vl_api_lb_add_del_vip_t_handler
(vl_api_lb_add_del_vip_t * mp)
@@ -142,38 +129,6 @@ vl_api_lb_add_del_vip_t_handler
REPLY_MACRO (VL_API_LB_ADD_DEL_VIP_REPLY);
}
-static void *vl_api_lb_add_del_vip_t_print
-(vl_api_lb_add_del_vip_t *mp, void * handle)
-{
- u8 * s;
- s = format (0, "SCRIPT: lb_add_del_vip ");
- s = format (s, "%U", format_vl_api_prefix,
- &mp->pfx);
-
- s = format (s, "%s ", (mp->encap == LB_API_ENCAP_TYPE_GRE4)? "gre4"
- : (mp->encap == LB_API_ENCAP_TYPE_GRE6)? "gre6"
- : (mp->encap == LB_API_ENCAP_TYPE_NAT4)? "nat4"
- : (mp->encap == LB_API_ENCAP_TYPE_NAT6)? "nat6"
- : "l3dsr");
-
- if (mp->encap==LB_API_ENCAP_TYPE_L3DSR)
- {
- s = format (s, "dscp %u ", mp->dscp);
- }
-
- if ((mp->encap==LB_API_ENCAP_TYPE_NAT4)
- || (mp->encap==LB_API_ENCAP_TYPE_NAT6))
- {
- s = format (s, "type %u ", mp->type);
- s = format (s, "port %u ", mp->port);
- s = format (s, "target_port %u ", mp->target_port);
- }
-
- s = format (s, "%u ", mp->new_flows_table_length);
- s = format (s, "%s ", mp->is_del?"del":"add");
- FINISH;
-}
-
static void
vl_api_lb_add_del_as_t_handler
(vl_api_lb_add_del_as_t * mp)
@@ -206,25 +161,6 @@ done:
REPLY_MACRO (VL_API_LB_ADD_DEL_AS_REPLY);
}
-static void *vl_api_lb_add_del_as_t_print
-(vl_api_lb_add_del_as_t *mp, void * handle)
-{
- u8 * s;
- ip46_address_t address;
- s = format (0, "SCRIPT: lb_add_del_as ");
- s = format (s, "%U ", format_vl_api_prefix,
- &mp->pfx);
- s = format(s, "%u ", mp->protocol);
- if (ip_address_decode (&mp->as_address, &address) == IP46_TYPE_IP6)
- s = format (s, "%U ", format_ip6_address,
- (ip6_address_t *) & address.ip6);
- else
- s = format (s, "%U ", format_ip4_address,
- (ip6_address_t *) & address.ip4);
- s = format (s, "%s ", mp->is_del?"del":"add");
- FINISH;
-}
-
static void
vl_api_lb_vip_dump_t_handler
(vl_api_lb_vip_dump_t * mp)
@@ -407,19 +343,6 @@ static void vl_api_lb_add_del_intf_nat6_t_handler
REPLY_MACRO (VL_API_LB_ADD_DEL_INTF_NAT6_REPLY);
}
-static void *vl_api_lb_flush_vip_t_print
-(vl_api_lb_flush_vip_t *mp, void * handle)
-{
- u8 * s;
- s = format (0, "SCRIPT: lb_add_del_vip ");
- s = format (s, "%U/%d", format_vl_api_address,
- &mp->pfx.address, mp->pfx.len);
- s = format (s, "protocol %u ", mp->protocol);
- s = format (s, "port %u ", mp->port);
-
- FINISH;
-}
-
#include <lb/lb.api.c>
static clib_error_t * lb_api_init (vlib_main_t * vm)
{
diff --git a/src/plugins/lb/lb.api b/src/plugins/lb/lb.api
index 564fe232451..4bf30e76b59 100644
--- a/src/plugins/lb/lb.api
+++ b/src/plugins/lb/lb.api
@@ -12,7 +12,7 @@ import "vnet/interface_types.api";
@param flow_timeout - Time in seconds after which, if no packet is received
for a given flow, the flow is removed from the established flow table.
*/
-autoreply manual_print define lb_conf
+autoreply define lb_conf
{
u32 client_index;
u32 context;
@@ -38,7 +38,7 @@ autoreply manual_print define lb_conf
for this VIP (must be power of 2).
@param is_del - The VIP should be removed.
*/
-autoreply manual_print define lb_add_del_vip {
+autoreply define lb_add_del_vip {
u32 client_index;
u32 context;
vl_api_address_with_prefix_t pfx;
@@ -64,7 +64,7 @@ autoreply manual_print define lb_add_del_vip {
@param is_del - The AS should be removed.
@param is_flush - The sessions related to this AS should be flushed.
*/
-autoreply manual_print define lb_add_del_as {
+autoreply define lb_add_del_as {
u32 client_index;
u32 context;
vl_api_address_with_prefix_t pfx;
@@ -83,7 +83,7 @@ autoreply manual_print define lb_add_del_as {
@param protocol - tcp or udp.
@param port - destination port.
*/
-autoreply manual_print define lb_flush_vip {
+autoreply define lb_flush_vip {
u32 client_index;
u32 context;
vl_api_address_with_prefix_t pfx;