VCL: add session namespace support.
Change-Id: I04f1b63e66260d99c0dd180b0295a55a9b750df7 Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
This commit is contained in:
Dave Wallace
committed by
Florin Coras
Florin Coras
parent
ca514fda11
commit
8af2054b78
@ -1,5 +1,5 @@
|
||||
# Test VPPCOM config file
|
||||
vppcom {
|
||||
vcl {
|
||||
heapsize 1
|
||||
api-prefix daw # this is a comment
|
||||
uid 1020 this is also a comment.
|
||||
@ -22,4 +22,10 @@ vppcom {
|
||||
app-timeout 54.3
|
||||
session-timeout 66.6
|
||||
accept-timeout 0.1
|
||||
session-scope-local
|
||||
session-scope-global
|
||||
namespace-id 0123456789012345678901234567890123456789012345678901234567890123456789
|
||||
namespace-id Oh_Bother!_Said_Winnie-The-Pooh
|
||||
namespace-secret 0x42bada55e5
|
||||
namespace-secret 42
|
||||
}
|
||||
126
src/vcl/vppcom.c
126
src/vcl/vppcom.c
@ -127,6 +127,10 @@ typedef struct vppcom_cfg_t_
|
||||
u32 tx_fifo_size;
|
||||
u32 event_queue_size;
|
||||
u32 listen_queue_size;
|
||||
u8 session_scope_local;
|
||||
u8 session_scope_global;
|
||||
u8 *namespace_id;
|
||||
u64 namespace_secret;
|
||||
f64 app_timeout;
|
||||
f64 session_timeout;
|
||||
f64 accept_timeout;
|
||||
@ -455,6 +459,8 @@ vppcom_app_send_attach (void)
|
||||
{
|
||||
vppcom_main_t *vcm = &vppcom_main;
|
||||
vl_api_application_attach_t *bmp;
|
||||
u8 nsid_len = vec_len (vcm->cfg.namespace_id);
|
||||
|
||||
bmp = vl_msg_api_alloc (sizeof (*bmp));
|
||||
memset (bmp, 0, sizeof (*bmp));
|
||||
|
||||
@ -463,11 +469,18 @@ vppcom_app_send_attach (void)
|
||||
bmp->context = htonl (0xfeedface);
|
||||
bmp->options[APP_OPTIONS_FLAGS] =
|
||||
APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT |
|
||||
APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE | APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE;
|
||||
(vcm->cfg.session_scope_local ? APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE : 0) |
|
||||
(vcm->cfg.session_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0);
|
||||
bmp->options[SESSION_OPTIONS_SEGMENT_SIZE] = vcm->cfg.segment_size;
|
||||
bmp->options[SESSION_OPTIONS_ADD_SEGMENT_SIZE] = vcm->cfg.add_segment_size;
|
||||
bmp->options[SESSION_OPTIONS_RX_FIFO_SIZE] = vcm->cfg.rx_fifo_size;
|
||||
bmp->options[SESSION_OPTIONS_TX_FIFO_SIZE] = vcm->cfg.tx_fifo_size;
|
||||
if (nsid_len)
|
||||
{
|
||||
bmp->namespace_id_len = nsid_len;
|
||||
clib_memcpy (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len);
|
||||
bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret;
|
||||
}
|
||||
vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp);
|
||||
}
|
||||
|
||||
@ -1509,7 +1522,7 @@ vppcom_cfg_read (char *conf_fname)
|
||||
(void) unformat_user (input, unformat_line_input, line_input);
|
||||
unformat_skip_white_space (line_input);
|
||||
|
||||
if (unformat (line_input, "vppcom {"))
|
||||
if (unformat (line_input, "vcl {"))
|
||||
{
|
||||
vc_cfg_input = 1;
|
||||
continue;
|
||||
@ -1548,11 +1561,11 @@ vppcom_cfg_read (char *conf_fname)
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured gid %d", vcm->my_pid, gid);
|
||||
}
|
||||
else if (unformat (line_input, "segment-baseva 0x%llx",
|
||||
else if (unformat (line_input, "segment-baseva 0x%lx",
|
||||
&vcl_cfg->segment_baseva))
|
||||
{
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured segment_baseva 0x%llx",
|
||||
clib_warning ("[%d] configured segment_baseva 0x%lx",
|
||||
vcm->my_pid, vcl_cfg->segment_baseva);
|
||||
}
|
||||
else if (unformat (line_input, "segment-size 0x%lx",
|
||||
@ -1683,6 +1696,57 @@ vppcom_cfg_read (char *conf_fname)
|
||||
clib_warning ("[%d] configured accept_timeout %f",
|
||||
vcm->my_pid, vcl_cfg->accept_timeout);
|
||||
}
|
||||
else if (unformat (line_input, "session-scope-local"))
|
||||
{
|
||||
vcl_cfg->session_scope_local = 1;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured session_scope_local (%d)",
|
||||
vcm->my_pid, vcl_cfg->session_scope_local);
|
||||
}
|
||||
else if (unformat (line_input, "session-scope-global"))
|
||||
{
|
||||
vcl_cfg->session_scope_global = 1;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured session_scope_global (%d)",
|
||||
vcm->my_pid, vcl_cfg->session_scope_global);
|
||||
}
|
||||
else if (unformat (line_input, "namespace-secret 0x%lx",
|
||||
&vcl_cfg->namespace_secret))
|
||||
{
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning
|
||||
("[%d] configured namespace_secret 0x%lx (%lu)",
|
||||
vcm->my_pid, vcl_cfg->namespace_secret,
|
||||
vcl_cfg->namespace_secret);
|
||||
}
|
||||
else if (unformat (line_input, "namespace-secret %lu",
|
||||
&vcl_cfg->namespace_secret))
|
||||
{
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning
|
||||
("[%d] configured namespace_secret %lu (0x%lx)",
|
||||
vcm->my_pid, vcl_cfg->namespace_secret,
|
||||
vcl_cfg->namespace_secret);
|
||||
}
|
||||
else if (unformat (line_input, "namespace-id %v",
|
||||
&vcl_cfg->namespace_id))
|
||||
{
|
||||
vl_api_application_attach_t *mp;
|
||||
u32 max_nsid_vec_len = sizeof (mp->namespace_id) - 1;
|
||||
u32 nsid_vec_len = vec_len (vcl_cfg->namespace_id);
|
||||
if (nsid_vec_len > max_nsid_vec_len)
|
||||
{
|
||||
_vec_len (vcl_cfg->namespace_id) = max_nsid_vec_len;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured namespace_id is too long,"
|
||||
" truncated to %d characters!", vcm->my_pid,
|
||||
max_nsid_vec_len);
|
||||
}
|
||||
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured namespace_id %v",
|
||||
vcm->my_pid, vcl_cfg->namespace_id);
|
||||
}
|
||||
else if (unformat (line_input, "}"))
|
||||
{
|
||||
vc_cfg_input = 0;
|
||||
@ -1726,22 +1790,72 @@ vppcom_app_create (char *app_name)
|
||||
if (!vcm->init)
|
||||
{
|
||||
char *conf_fname;
|
||||
char *env_var_str;
|
||||
|
||||
vcm->init = 1;
|
||||
vcm->my_pid = getpid ();
|
||||
clib_fifo_validate (vcm->client_session_index_fifo,
|
||||
vcm->cfg.listen_queue_size);
|
||||
vppcom_cfg_init (vcl_cfg);
|
||||
conf_fname = getenv (VPPCOM_CONF_ENV);
|
||||
conf_fname = getenv (VPPCOM_ENV_CONF);
|
||||
if (!conf_fname)
|
||||
{
|
||||
conf_fname = VPPCOM_CONF_DEFAULT;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] getenv '%s' failed!", vcm->my_pid,
|
||||
VPPCOM_CONF_ENV);
|
||||
VPPCOM_ENV_CONF);
|
||||
}
|
||||
vppcom_cfg_heapsize (conf_fname);
|
||||
vppcom_cfg_read (conf_fname);
|
||||
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_ID);
|
||||
if (env_var_str)
|
||||
{
|
||||
u32 ns_id_vec_len = strlen (env_var_str);
|
||||
|
||||
vec_reset_length (vcm->cfg.namespace_id);
|
||||
vec_validate (vcm->cfg.namespace_id, ns_id_vec_len - 1);
|
||||
clib_memcpy (vcm->cfg.namespace_id, env_var_str, ns_id_vec_len);
|
||||
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured namespace_id (%v) from "
|
||||
VPPCOM_ENV_APP_NAMESPACE_ID "!", vcm->my_pid,
|
||||
vcm->cfg.namespace_id);
|
||||
}
|
||||
env_var_str = getenv (VPPCOM_ENV_APP_NAMESPACE_SECRET);
|
||||
if (env_var_str)
|
||||
{
|
||||
u64 tmp;
|
||||
if (sscanf (env_var_str, "%lu", &tmp) != 1)
|
||||
clib_warning ("[%d] Invalid namespace secret specified in "
|
||||
"the environment variable "
|
||||
VPPCOM_ENV_APP_NAMESPACE_SECRET
|
||||
" (%s)!\n", vcm->my_pid, env_var_str);
|
||||
else
|
||||
{
|
||||
vcm->cfg.namespace_secret = tmp;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured namespace secret (%lu) from "
|
||||
VPPCOM_ENV_APP_NAMESPACE_ID "!", vcm->my_pid,
|
||||
vcm->cfg.namespace_secret);
|
||||
}
|
||||
}
|
||||
if (getenv (VPPCOM_ENV_SESSION_SCOPE_LOCAL))
|
||||
{
|
||||
vcm->cfg.session_scope_local = 1;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured session_scope_local (%u) from "
|
||||
VPPCOM_ENV_SESSION_SCOPE_LOCAL "!", vcm->my_pid,
|
||||
vcm->cfg.session_scope_local);
|
||||
}
|
||||
if (getenv (VPPCOM_ENV_SESSION_SCOPE_GLOBAL))
|
||||
{
|
||||
vcm->cfg.session_scope_global = 1;
|
||||
if (VPPCOM_DEBUG > 0)
|
||||
clib_warning ("[%d] configured session_scope_global (%u) from "
|
||||
VPPCOM_ENV_SESSION_SCOPE_GLOBAL "!", vcm->my_pid,
|
||||
vcm->cfg.session_scope_global);
|
||||
}
|
||||
|
||||
vcm->bind_session_index = ~0;
|
||||
vcm->main_cpu = os_get_thread_index ();
|
||||
heap = clib_mem_get_per_cpu_heap ();
|
||||
|
||||
@ -23,10 +23,14 @@
|
||||
/*
|
||||
* VPPCOM Public API Definitions, Enums, and Data Structures
|
||||
*/
|
||||
#define INVALID_SESSION_ID (~0)
|
||||
#define VPPCOM_VRF_DEFAULT 0
|
||||
#define VPPCOM_CONF_ENV "VPPCOM_CONF"
|
||||
#define VPPCOM_CONF_DEFAULT "/etc/vpp/vppcom.conf"
|
||||
#define INVALID_SESSION_ID (~0)
|
||||
#define VPPCOM_VRF_DEFAULT 0
|
||||
#define VPPCOM_CONF_DEFAULT "/etc/vpp/vppcom.conf"
|
||||
#define VPPCOM_ENV_CONF "VCL_CONFIG"
|
||||
#define VPPCOM_ENV_APP_NAMESPACE_ID "VCL_APP_NAMESPACE_ID"
|
||||
#define VPPCOM_ENV_APP_NAMESPACE_SECRET "VCL_APP_NAMESPACE_SECRET"
|
||||
#define VPPCOM_ENV_SESSION_SCOPE_LOCAL "VCL_SESSION_SCOPE_LOCAL"
|
||||
#define VPPCOM_ENV_SESSION_SCOPE_GLOBAL "VCL_SESSION_SCOPE_GLOBAL"
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
||||
@ -160,6 +160,7 @@ static clib_error_t *
|
||||
app_ns_fn (vlib_main_t * vm, unformat_input_t * input,
|
||||
vlib_cli_command_t * cmd)
|
||||
{
|
||||
unformat_input_t _line_input, *line_input = &_line_input;
|
||||
u8 is_add = 0, *ns_id = 0, secret_set = 0, sw_if_index_set = 0;
|
||||
u32 sw_if_index, fib_id = APP_NAMESPACE_INVALID_INDEX;
|
||||
u64 secret;
|
||||
@ -167,22 +168,30 @@ app_ns_fn (vlib_main_t * vm, unformat_input_t * input,
|
||||
|
||||
session_cli_return_if_not_enabled ();
|
||||
|
||||
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
|
||||
if (!unformat_user (input, unformat_line_input, line_input))
|
||||
return 0;
|
||||
|
||||
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
|
||||
{
|
||||
if (unformat (input, "add"))
|
||||
if (unformat (line_input, "add"))
|
||||
is_add = 1;
|
||||
else if (unformat (input, "id %_%v%_", &ns_id))
|
||||
else if (unformat (line_input, "id %_%v%_", &ns_id))
|
||||
;
|
||||
else if (unformat (input, "secret %lu", &secret))
|
||||
else if (unformat (line_input, "secret %lu", &secret))
|
||||
secret_set = 1;
|
||||
else if (unformat (input, "sw_if_index %u", &sw_if_index))
|
||||
else if (unformat (line_input, "sw_if_index %u", &sw_if_index))
|
||||
sw_if_index_set = 1;
|
||||
else if (unformat (input, "fib_id", &fib_id))
|
||||
else if (unformat (line_input, "fib_id", &fib_id))
|
||||
;
|
||||
else
|
||||
return clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, input);
|
||||
{
|
||||
error = clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, line_input);
|
||||
unformat_free (line_input);
|
||||
return error;
|
||||
}
|
||||
}
|
||||
unformat_free (line_input);
|
||||
|
||||
if (!ns_id || !secret_set || !sw_if_index_set)
|
||||
{
|
||||
@ -235,13 +244,17 @@ show_app_ns_fn (vlib_main_t * vm, unformat_input_t * input,
|
||||
|
||||
session_cli_return_if_not_enabled ();
|
||||
|
||||
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
|
||||
if (unformat_peek_input (input) != UNFORMAT_END_OF_INPUT)
|
||||
{
|
||||
if (unformat (input, "table %_%v%_", &ns_id))
|
||||
do_table = 1;
|
||||
else
|
||||
return clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, input);
|
||||
{
|
||||
vlib_cli_output (vm, "unknown input [%U]",
|
||||
format_unformat_error, input);
|
||||
return clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, input);
|
||||
}
|
||||
}
|
||||
|
||||
if (do_table)
|
||||
|
||||
@ -322,7 +322,7 @@ vl_api_application_attach_t_handler (vl_api_application_attach_t * mp)
|
||||
|
||||
if (mp->namespace_id_len)
|
||||
{
|
||||
vec_validate (a->namespace_id, mp->namespace_id_len);
|
||||
vec_validate (a->namespace_id, mp->namespace_id_len - 1);
|
||||
clib_memcpy (a->namespace_id, mp->namespace_id, mp->namespace_id_len);
|
||||
}
|
||||
|
||||
|
||||
@ -455,19 +455,29 @@ static clib_error_t *
|
||||
session_enable_disable_fn (vlib_main_t * vm, unformat_input_t * input,
|
||||
vlib_cli_command_t * cmd)
|
||||
{
|
||||
unformat_input_t _line_input, *line_input = &_line_input;
|
||||
u8 is_en = 1;
|
||||
clib_error_t *error;
|
||||
|
||||
while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
|
||||
if (!unformat_user (input, unformat_line_input, line_input))
|
||||
return 0;
|
||||
|
||||
while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
|
||||
{
|
||||
if (unformat (input, "enable"))
|
||||
if (unformat (line_input, "enable"))
|
||||
is_en = 1;
|
||||
else if (unformat (input, "disable"))
|
||||
else if (unformat (line_input, "disable"))
|
||||
is_en = 0;
|
||||
else
|
||||
return clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, input);
|
||||
{
|
||||
error = clib_error_return (0, "unknown input `%U'",
|
||||
format_unformat_error, line_input);
|
||||
unformat_free (line_input);
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
unformat_free (line_input);
|
||||
return vnet_session_enable_disable (vm, is_en);
|
||||
}
|
||||
|
||||
|
||||
@ -24,9 +24,9 @@ sock_srvr_port="22000"
|
||||
iperf_srvr_app="iperf3 -V4d -s"
|
||||
iperf_clnt_app="iperf3 -V4d -c \$srvr_addr"
|
||||
gdb_in_emacs="gdb_in_emacs"
|
||||
vppcom_conf="vppcom.conf"
|
||||
vppcom_conf_dir="$WS_ROOT/src/uri/"
|
||||
docker_vppcom_conf_dir="/etc/vpp/"
|
||||
vcl_config="vcl.conf"
|
||||
vcl_config_dir="$WS_ROOT/src/vcl/"
|
||||
docker_vcl_config_dir="/etc/vpp/"
|
||||
xterm_geom="100x60"
|
||||
bash_header="#! /bin/bash"
|
||||
tmp_cmdfile_prefix="/tmp/socket_test_cmd"
|
||||
@ -66,7 +66,7 @@ OPTIONS:
|
||||
-l Leave ${tmp_cmdfile_prefix}* files after test run.
|
||||
-b Run bash after application exit.
|
||||
-d Run the vpp_debug version of all apps.
|
||||
-c Set VPPCOM_CONF to use the vppcom_test.conf file.
|
||||
-c Set VCL_CONFIG to use the vppcom_test.conf file.
|
||||
-i Run iperf3 for client/server app in native tests.
|
||||
-n Name of ethernet for VPP to use in multi-host cfg.
|
||||
-6 Use ipv6 addressing.
|
||||
@ -96,7 +96,7 @@ OPTIONS passed to client/server:
|
||||
-X Exit client/server after running test.
|
||||
|
||||
Environment variables:
|
||||
VPPCOM_CONF Pathname of vppcom configuration file.
|
||||
VCL_CONFIG Pathname of vppcom configuration file.
|
||||
VPP_GDB_CMDFILE Pathname of gdb command file for vpp.
|
||||
VPPCOM_CLIENT_GDB_CMDFILE Pathname of gdb command file for client.
|
||||
VPPCOM_SERVER_GDB_CMDFILE Pathname of gdb command file for server.
|
||||
@ -132,7 +132,7 @@ while getopts ":hitlbcd6n:m:e:g:p:E:I:N:P:R:S:T:UBVX" opt; do
|
||||
t) xterm_geom="180x40"
|
||||
use_tabs="true"
|
||||
;;
|
||||
c) VPPCOM_CONF="${vppcom_conf_dir}vppcom_test.conf"
|
||||
c) VCL_CONFIG="${vcl_config_dir}vcl_test.conf"
|
||||
;;
|
||||
d) title_dbg="-DEBUG"
|
||||
vpp_dir=$vpp_debug_dir
|
||||
@ -248,6 +248,12 @@ done
|
||||
|
||||
VCL_LDPRELOAD_LIB_DIR="${VCL_LDPRELOAD_LIB_DIR:-$lib64_dir}"
|
||||
|
||||
if [ -n "$multi_host" ] ; then
|
||||
VCL_SESSION_SCOPE_GLOBAL=true
|
||||
else
|
||||
VCL_SESSION_SCOPE_LOCAL=true
|
||||
fi
|
||||
|
||||
if [ -z "$WS_ROOT" ] ; then
|
||||
echo "ERROR: WS_ROOT environment variable not set!" >&2
|
||||
echo " Please set WS_ROOT to VPP workspace root directory." >&2
|
||||
@ -327,23 +333,25 @@ if [ -n "$env_test_failed" ] ; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f "$VPPCOM_CONF" ] ; then
|
||||
vppcom_conf="$(basename $VPPCOM_CONF)"
|
||||
vppcom_conf_dir="$(dirname $VPPCOM_CONF)/"
|
||||
api_prefix="$(egrep -s '^\s*api-prefix \w+' $VPPCOM_CONF | awk -e '{print $2}')"
|
||||
if [ -f "$VCL_CONFIG" ] ; then
|
||||
vcl_config="$(basename $VCL_CONFIG)"
|
||||
vcl_config_dir="$(dirname $VCL_CONFIG)/"
|
||||
api_prefix="$(egrep -s '^\s*api-prefix \w+' $VCL_CONFIG | tail -1 | awk -e '{print $2}')"
|
||||
if [ -n "$api_prefix" ] ; then
|
||||
api_segment=" api-segment { gid $user_gid prefix $api_prefix }"
|
||||
fi
|
||||
namespace_id="$(egrep -s '^\s*namespace-id \w+' $VCL_CONFIG | tail -1 | awk -e '{print $2}')"
|
||||
namespace_secret="$(egrep -s '^\s*namespace-secret \w+' $VCL_CONFIG | tail -1 | awk -e '{print $2}')"
|
||||
fi
|
||||
if [ -n "$VCL_APP_NAMESPACE_ID" ] && [ -n "$VCL_APP_NAMESPACE_SECRET" ] ; then
|
||||
namespace_id="$VCL_APP_NAMESPACE_ID"
|
||||
namespace_secret="$VCL_APP_NAMESPACE_SECRET"
|
||||
fi
|
||||
|
||||
if [ -z "$api_segment" ] ; then
|
||||
api_segment=" api-segment { gid $user_gid }"
|
||||
fi
|
||||
if [ -n "$multi_host" ] ; then
|
||||
sudo modprobe uio_pci_generic
|
||||
vpp_args="unix { interactive exec $tmp_vpp_exec_file}${api_segment}"
|
||||
else
|
||||
vpp_args="unix { interactive }${api_segment}"
|
||||
fi
|
||||
vpp_args="unix { interactive exec $tmp_vpp_exec_file}${api_segment}"
|
||||
|
||||
if [ $iperf3 -eq 1 ] ; then
|
||||
app_dir="$(dirname $(which iperf3))/"
|
||||
@ -440,6 +448,20 @@ set int ip addr $vpp_eth_ifname $vpp_eth_ip4_addr
|
||||
EOF
|
||||
|
||||
fi
|
||||
|
||||
if [ -n "$namespace_id" ] ; then
|
||||
cat <<EOF >> $tmp_vpp_exec_file
|
||||
session enable
|
||||
app ns add id $namespace_id secret $namespace_secret sw_if_index 0
|
||||
EOF
|
||||
fi
|
||||
|
||||
cat <<EOF >> $tmp_vpp_exec_file
|
||||
show version
|
||||
show version verbose
|
||||
show cpu
|
||||
show int
|
||||
EOF
|
||||
}
|
||||
|
||||
verify_no_docker_containers() {
|
||||
@ -495,7 +517,17 @@ write_script_header() {
|
||||
echo "trap \"rm -f $1 $2 $tmp_vpp_exec_file\" $trap_signals" >> $1
|
||||
fi
|
||||
fi
|
||||
echo "export VPPCOM_CONF=${vppcom_conf_dir}${vppcom_conf}" >> $1
|
||||
echo "export VCL_CONFIG=${vcl_config_dir}${vcl_config}" >> $1
|
||||
if [ -n "$namespace_id" ] ; then
|
||||
echo "export VCL_APP_NAMESPACE_ID=\"$namespace_id\"" >> $1
|
||||
echo "export VCL_APP_NAMESPACE_SECRET=\"$namespace_secret\"" >> $1
|
||||
fi
|
||||
if [ -n "$VCL_SESSION_SCOPE_LOCAL" ] ; then
|
||||
echo "export VCL_SESSION_SCOPE_LOCAL=true" >> $1
|
||||
fi
|
||||
if [ -n "$VCL_SESSION_SCOPE_GLOBAL" ] ; then
|
||||
echo "export VCL_SESSION_SCOPE_GLOBAL=true" >> $1
|
||||
fi
|
||||
if [ "$pre_cmd" = "$gdb_in_emacs " ] ; then
|
||||
if [ -n "$multi_host" ] && [[ $3 =~ "VPP".* ]] ; then
|
||||
cat <<EOF >> $1
|
||||
@ -612,7 +644,7 @@ native_preload() {
|
||||
tmp_gdb_cmdfile=$tmp_gdb_cmdfile_client
|
||||
gdb_cmdfile=$VPPCOM_CLIENT_GDB_CMDFILE
|
||||
set_pre_cmd $emacs_client $gdb_client $ld_preload
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 3"
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4"
|
||||
echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd3_file
|
||||
echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file
|
||||
echo "${pre_cmd}${app_dir}${clnt_app}" >> $cmd3_file
|
||||
@ -662,7 +694,7 @@ native_vcl() {
|
||||
if [ "$multi_host" = "client" ] ; then
|
||||
delay="sleep 10"
|
||||
else
|
||||
delay="sleep 2"
|
||||
delay="sleep 4"
|
||||
fi
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "$delay"
|
||||
echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file
|
||||
@ -728,7 +760,7 @@ docker_preload() {
|
||||
gdb_cmdfile=$VPPCOM_SERVER_GDB_CMDFILE
|
||||
set_pre_cmd $emacs_server $gdb_server $docker_ld_preload_lib
|
||||
write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2"
|
||||
echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vppcom_conf_dir:$docker_vppcom_conf_dir -p $sock_srvr_port:$sock_srvr_port -e VPPCOM_CONF=${docker_vppcom_conf_dir}$vppcom_conf -e LD_LIBRARY_PATH=$docker_lib64_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file
|
||||
echo "docker run -it -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir:$docker_ld_preload_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file
|
||||
write_script_footer $cmd2_file $perf_server
|
||||
chmod +x $cmd2_file
|
||||
fi
|
||||
@ -738,9 +770,9 @@ docker_preload() {
|
||||
tmp_gdb_cmdfile=$tmp_gdb_cmdfile_client
|
||||
gdb_cmdfile=$VPPCOM_CLIENT_GDB_CMDFILE
|
||||
set_pre_cmd $emacs_client $gdb_client $docker_ld_preload_lib
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 3"
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 4"
|
||||
echo "$get_docker_server_ip4addr" >> $cmd3_file
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vppcom_conf_dir:$docker_vppcom_conf_dir -e VPPCOM_CONF=${docker_vppcom_conf_dir}$vppcom_conf -e LD_LIBRARY_PATH=$docker_lib64_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $ld_preload_dir:$docker_ld_preload_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir ${docker_ld_preload}$docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file
|
||||
write_script_footer $cmd3_file $perf_client
|
||||
chmod +x $cmd3_file
|
||||
fi
|
||||
@ -769,7 +801,7 @@ docker_vcl() {
|
||||
gdb_cmdfile=$VPPCOM_SERVER_GDB_CMDFILE
|
||||
set_pre_cmd $emacs_server $gdb_server
|
||||
write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2"
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vppcom_conf_dir:$docker_vppcom_conf_dir -p $sock_srvr_port:$sock_srvr_port -e VPPCOM_CONF=${docker_vppcom_conf_dir}/$vppcom_conf -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${srvr_app}" >> $cmd2_file
|
||||
write_script_footer $cmd2_file $perf_server
|
||||
chmod +x $cmd2_file
|
||||
fi
|
||||
@ -781,7 +813,7 @@ docker_vcl() {
|
||||
set_pre_cmd $emacs_client $gdb_client
|
||||
write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "sleep 3"
|
||||
echo "$get_docker_server_ip4addr" >> $cmd3_file
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vppcom_conf_dir:$docker_vppcom_conf_dir -e VPPCOM_CONF=${docker_vppcom_conf_dir}/$vppcom_conf -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file
|
||||
echo "docker run -it --cpuset-cpus='4-7' -v $vpp_shm_dir:$vpp_shm_dir -v $vpp_dir:$docker_vpp_dir -v $lib64_dir:$docker_lib64_dir -v $vcl_config_dir:$docker_vcl_config_dir -e VCL_CONFIG=${docker_vcl_config_dir}/$vcl_config -e LD_LIBRARY_PATH=$docker_lib64_dir $docker_os ${docker_app_dir}${clnt_app}" >> $cmd3_file
|
||||
write_script_footer $cmd3_file $perf_client
|
||||
chmod +x $cmd3_file
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user