Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rework kube-proxy into LB plugin
[vpp.git]
/
src
/
plugins
/
lb
/
lb_test.c
diff --git
a/src/plugins/lb/lb_test.c
b/src/plugins/lb/lb_test.c
index
9d55e4a
..
fc49870
100644
(file)
--- a/
src/plugins/lb/lb_test.c
+++ b/
src/plugins/lb/lb_test.c
@@
-16,7
+16,7
@@
#include <vat/vat.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
#include <vat/vat.h>
#include <vlibapi/api.h>
#include <vlibmemory/api.h>
-#include <vlibsocket/api.h>
+
#include <vppinfra/error.h>
#include <lb/lb.h>
#include <vppinfra/error.h>
#include <lb/lb.h>
@@
-133,8
+133,8
@@
foreach_standard_reply_retval_handler;
static int api_lb_conf (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
static int api_lb_conf (vat_main_t * vam)
{
unformat_input_t *i = vam->input;
- f64 timeout;
vl_api_lb_conf_t mps, *mp;
vl_api_lb_conf_t mps, *mp;
+ int ret;
if (!unformat(i, "%U %U %u %u",
unformat_ip4_address, &mps.ip4_src_address,
if (!unformat(i, "%U %U %u %u",
unformat_ip4_address, &mps.ip4_src_address,
@@
-145,19
+145,19
@@
static int api_lb_conf (vat_main_t * vam)
return -99;
}
return -99;
}
- M(LB_CONF,
lb_conf); S; W
;
-
- /* NOTREACHED */
- return
0
;
+ M(LB_CONF,
mp)
;
+ S(mp);
+ W (ret);
+ return
ret
;
}
static int api_lb_add_del_vip (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
}
static int api_lb_add_del_vip (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_lb_add_del_vip_t mps, *mp;
vl_api_lb_add_del_vip_t mps, *mp;
+ int ret;
mps.is_del = 0;
mps.is_del = 0;
- mps.
is_gre4 = 0
;
+ mps.
encap = LB_ENCAP_TYPE_GRE4
;
if (!unformat(i, "%U",
unformat_ip46_prefix, mps.ip_prefix, &mps.prefix_length, IP46_TYPE_ANY)) {
if (!unformat(i, "%U",
unformat_ip46_prefix, mps.ip_prefix, &mps.prefix_length, IP46_TYPE_ANY)) {
@@
-166,9
+166,15
@@
static int api_lb_add_del_vip (vat_main_t * vam)
}
if (unformat(i, "gre4")) {
}
if (unformat(i, "gre4")) {
- mps.
is_gre4 = 1
;
+ mps.
encap = LB_ENCAP_TYPE_GRE4
;
} else if (unformat(i, "gre6")) {
} else if (unformat(i, "gre6")) {
- mps.is_gre4 = 0;
+ mps.encap = LB_ENCAP_TYPE_GRE6;
+ } else if (unformat(i, "l3dsr")) {
+ mps.encap = LB_ENCAP_TYPE_L3DSR;
+ } else if (unformat(i, "nat4")) {
+ mps.encap = LB_ENCAP_TYPE_NAT4;
+ } else if (unformat(i, "nat6")) {
+ mps.encap = LB_ENCAP_TYPE_NAT6;
} else {
errmsg ("no encap\n");
return -99;
} else {
errmsg ("no encap\n");
return -99;
@@
-183,16
+189,17
@@
static int api_lb_add_del_vip (vat_main_t * vam)
mps.is_del = 1;
}
mps.is_del = 1;
}
- M(LB_ADD_DEL_VIP, lb_add_del_vip); S; W;
- /* NOTREACHED */
- return 0;
+ M(LB_ADD_DEL_VIP, mp);
+ S(mp);
+ W (ret);
+ return ret;
}
static int api_lb_add_del_as (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
}
static int api_lb_add_del_as (vat_main_t * vam)
{
unformat_input_t * i = vam->input;
- f64 timeout;
vl_api_lb_add_del_as_t mps, *mp;
vl_api_lb_add_del_as_t mps, *mp;
+ int ret;
mps.is_del = 0;
if (!unformat(i, "%U %U",
mps.is_del = 0;
if (!unformat(i, "%U %U",
@@
-206,9
+213,10
@@
static int api_lb_add_del_as (vat_main_t * vam)
mps.is_del = 1;
}
mps.is_del = 1;
}
- M(LB_ADD_DEL_AS, lb_add_del_as); S; W;
- /* NOTREACHED */
- return 0;
+ M(LB_ADD_DEL_AS, mp);
+ S(mp);
+ W (ret);
+ return ret;
}
/*
}
/*
@@
-217,7
+225,9
@@
static int api_lb_add_del_as (vat_main_t * vam)
*/
#define foreach_vpe_api_msg \
_(lb_conf, "<ip4-src-addr> <ip6-src-address> <sticky_buckets_per_core> <flow_timeout>") \
*/
#define foreach_vpe_api_msg \
_(lb_conf, "<ip4-src-addr> <ip6-src-address> <sticky_buckets_per_core> <flow_timeout>") \
-_(lb_add_del_vip, "<ip-prefix> [gre4|gre6] <new_table_len> [del]") \
+_(lb_add_del_vip, "<ip-prefix> [gre4|gre6|l3dsr|nat4|nat6] " \
+ "<dscp> <port> <target_port> <node_port> " \
+ "<new_table_len> [del]") \
_(lb_add_del_as, "<vip-ip-prefix> <address> [del]")
static void
_(lb_add_del_as, "<vip-ip-prefix> <address> [del]")
static void