X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fscripts%2Fsocket_test.sh;h=5fd8b5f9db65e8e00a55ade30c3b3f6c358b55fe;hb=ab2f6dbf;hp=96a445eb8155dd8a702bb769cf9f7b1fb336718d;hpb=b5a86eed8bd889f5c8986e5fa569a50b997ccd77;p=vpp.git

diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh
index 96a445eb815..5fd8b5f9db6 100755
--- a/test/scripts/socket_test.sh
+++ b/test/scripts/socket_test.sh
@@ -69,7 +69,7 @@ OPTIONS:
   -c                  Set VCL_CONFIG to use the vcl_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.
+  -f                  Full thru host stack vpp configuration. 
   -m c[lient]         Run client in multi-host cfg (server on remote host)
      s[erver]         Run server in multi-host cfg (client on remote host)
   -e a[ll]            Run all in emacs+gdb.
@@ -83,6 +83,8 @@ OPTIONS:
   -t                  Use tabs in one xterm if available (e.g. xfce4-terminal).
 
 OPTIONS passed to client/server:
+  -6                  Use IPv6.
+  -D                  Use UDP as the transport.
   -S <ip address>     Server IP address.
   -P <server port>    Server Port number.
   -E <data>           Run Echo test.
@@ -117,8 +119,9 @@ declare -i leave_tmp_files=0
 declare -i bash_after_exit=0
 declare -i iperf3=0
 declare -i use_ipv6=0
+declare -i transport_udp=0
 
-while getopts ":hitlbcd6n:m:e:g:p:E:I:N:P:R:S:T:UBVX" opt; do
+while getopts ":hitlbcd6fn:m:e:g:p:E:I:N:P:R:S:T:UBVXD" opt; do
     case $opt in
         h) usage ;;
         l) leave_tmp_files=1
@@ -128,6 +131,11 @@ while getopts ":hitlbcd6n:m:e:g:p:E:I:N:P:R:S:T:UBVX" opt; do
         i) iperf3=1
            ;;
         6) use_ipv6=1
+           sock_srvr_addr="::1"
+           sock_clnt_options="$sock_clnt_options -$opt"
+           sock_srvr_options="$sock_srvr_options -$opt"
+           ;;
+        f) full_thru_host_stack_vpp_cfg=1
            ;;
         t) xterm_geom="180x40"
            use_tabs="true"
@@ -181,9 +189,6 @@ while getopts ":hitlbcd6n:m:e:g:p:E:I:N:P:R:S:T:UBVX" opt; do
                echo "ERROR: Option -g unknown argument \'$OPTARG\'" >&2
                usage
            fi
-           title_dbg="-DEBUG"
-           vpp_dir=$vpp_debug_dir
-           lib64_dir=$lib64_debug_dir
            ;;
         p) if [ $OPTARG = "a" ] || [ $OPTARG = "all" ] ; then
                perf_client=1
@@ -205,6 +210,9 @@ while getopts ":hitlbcd6n:m:e:g:p:E:I:N:P:R:S:T:UBVX" opt; do
            ;;
         P) sock_srvr_port="$OPTARG"
            ;;
+        D) sock_clnt_options="$sock_clnt_options -$opt"
+           sock_srvr_options="$sock_srvr_options -$opt"
+           ;;
 E|I|N|R|T) sock_clnt_options="$sock_clnt_options -$opt \"$OPTARG\""
            ;;
   U|B|V|X) sock_clnt_options="$sock_clnt_options -$opt"
@@ -228,16 +236,16 @@ while ! [[ $run_test ]] && (( $# > 0 )) ; do
         "np" | "native-preload")
             run_test="native_preload" ;;
         "nv" | "native-vcl")
-            sock_srvr_app="vcl_test_server"
-            sock_clnt_app="vcl_test_client"
+            sock_srvr_app="bin/vcl_test_server"
+            sock_clnt_app="bin/vcl_test_client"
             run_test="native_vcl" ;;
         "dk" | "docker-kernel")
             run_test="docker_kernel" ;;
         "dp" | "docker-preload")
             run_test="docker_preload" ;;
         "dv" | "docker-vcl")
-            sock_srvr_app="vcl_test_server"
-            sock_clnt_app="vcl_test_client"
+            sock_srvr_app="bin/vcl_test_server"
+            sock_clnt_app="bin/vcl_test_client"
             run_test="docker_vcl" ;;
         *)
             echo "ERROR: Unknown option '$1'!" >&2
@@ -324,13 +332,19 @@ if [[ $run_test =~ .*"_vcl" ]] && [ $iperf3 -eq 1 ] ; then
     env_test_failed="true"
 fi
 
-if [ -n "$mult_host"] && [ ! -f "$dpdk_devbind" ] ; then
+if [ -n "$multi_host"] && [ ! -f "$dpdk_devbind" ] ; then
     echo "ERROR: Can't find dpdk-devbind.py!"
     echo "       Run \"cd \$WS_ROOT; make dpdk-install-dev\" to install it."
     echo
     env_test_failed="true"
 fi
 
+if [ -n "$full_thru_host_stack_vpp_cfg" ] && [ -n "$multi_host" ] ; then
+    echo "ERROR: Invalid options, cannot specify both \"-f\" and \"-m $multi_host\"!"
+    echo
+    env_test_failed="true"
+fi
+
 if [ -n "$env_test_failed" ] ; then
     exit 1
 fi
@@ -365,7 +379,7 @@ if [ $iperf3 -eq 1 ] ; then
     fi
 else
     app_dir="$vpp_dir"
-    srvr_app="$sock_srvr_app $sock_srvr_port"
+    srvr_app="$sock_srvr_app${sock_srvr_options} $sock_srvr_port"
     clnt_app="$sock_clnt_app${sock_clnt_options} \$srvr_addr $sock_srvr_port"
 fi
 
@@ -398,7 +412,55 @@ verify_no_vpp() {
         sudo mkdir $vpp_run_dir
         sudo chown root:$USER $vpp_run_dir
     fi
-    if [ -n "$multi_host" ] ; then
+    if [ $use_ipv6 -eq 0 ] && [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+        sock_srvr_table=0
+        sock_srvr_addr=172.16.1.1
+        sock_client_table=1
+        sock_client_addr=172.16.2.1
+        client_namespace_id="1"
+        client_namespace_secret="5678"
+        server_namespace_id="0"
+        server_namespace_secret="1234"
+        cat <<EOF >> $tmp_vpp_exec_file
+session enable
+create loop inter
+create loop inter
+set inter state loop0 up 
+set inter ip table loop0 $sock_srvr_table
+set inter ip address loop0 $sock_srvr_addr/24
+set inter state loop1 up
+set inter ip table loop1 $sock_client_table
+set inter ip address loop1 $sock_client_addr/24
+app ns add id 0 secret 1234 sw_if_index 1
+app ns add id 1 secret 5678 sw_if_index 2
+ip route add $sock_srvr_addr/32 table $sock_client_table via lookup in table $sock_srvr_table
+ip route add $sock_client_addr/32 table $sock_srvr_table via lookup in table $sock_client_table
+EOF
+    elif [ $use_ipv6 -eq 1 ] && [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+        sock_srvr_table=1
+        sock_srvr_addr=fd01:1::1
+        sock_client_table=2
+        sock_client_addr=fd01:2::1
+        client_namespace_id="1"
+        client_namespace_secret="5678"
+        server_namespace_id="0"
+        server_namespace_secret="1234"
+        cat <<EOF >> $tmp_vpp_exec_file
+session enable
+create loop inter
+create loop inter
+set inter state loop0 up 
+set inter ip6 table loop0 $sock_srvr_table
+set inter ip address loop0 $sock_srvr_addr/64
+set inter state loop1 up
+set inter ip6 table loop1 $sock_client_table
+set inter ip address loop1 $sock_client_addr/64
+app ns add id 0 secret 1234 sw_if_index 1
+app ns add id 1 secret 5678 sw_if_index 2
+ip route add $sock_srvr_addr/128 table $sock_client_table via lookup in table $sock_srvr_table
+ip route add $sock_client_addr/128 table $sock_srvr_table via lookup in table $sock_client_table
+EOF
+    elif [ -n "$multi_host" ] ; then
         vpp_eth_pci_id="$(ls -ld /sys/class/net/$vpp_eth_name/device | awk '{print $11}' | cut -d/ -f4)"
         if [ -z "$vpp_eth_pci_id" ] ; then
             echo "ERROR: Missing ethernet interface $vpp_eth_name!"
@@ -449,7 +511,7 @@ EOF
 
     fi
 
-    if [ -n "$namespace_id" ] ; then
+    if [ -z "$full_thru_host_stack_vpp_cfg" ] && [ -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
@@ -526,8 +588,8 @@ write_script_header() {
     if [ -n "$VCL_DEBUG" ] ; then
         echo "export VCL_DEBUG=$VCL_DEBUG" >> $1
     fi
-    if [ -n "$VCOM_DEBUG" ] ; then
-        echo "export VCOM_DEBUG=$VCOM_DEBUG" >> $1
+    if [ -n "$LDP_DEBUG" ] ; then
+        echo "export LDP_DEBUG=$LDP_DEBUG" >> $1
     fi
     if [ -n "$VCOM_APP_NAME" ] ; then
         echo "export VCOM_APP_NAME=$VCOM_APP_NAME" >> $1
@@ -539,10 +601,12 @@ write_script_header() {
         echo "export VCL_APP_NAMESPACE_ID=\"$namespace_id\"" >> $1
         echo "export VCL_APP_NAMESPACE_SECRET=\"$namespace_secret\"" >> $1
     fi
-    if [ -n "$VCL_APP_SCOPE_LOCAL" ] || [ -z "$multi_host" ] ; then
+    if [ -n "$VCL_APP_SCOPE_LOCAL" ] || [ -z "$multi_host" ] &&
+           [ -z "$full_thru_host_stack_vpp_cfg" ] ; then
         echo "export VCL_APP_SCOPE_LOCAL=true" >> $1
     fi
-    if [ -n "$VCL_APP_SCOPE_GLOBAL" ] || [ -n "$multi_host" ] ; then
+    if [ -n "$VCL_APP_SCOPE_GLOBAL" ] || [ -n "$multi_host" ] ||
+           [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
         echo "export VCL_APP_SCOPE_GLOBAL=true" >> $1
     fi
     if [ -n "$VCL_APP_PROXY_TRANSPORT_TCP" ] ; then
@@ -655,7 +719,11 @@ native_preload() {
         tmp_gdb_cmdfile=$tmp_gdb_cmdfile_server
         gdb_cmdfile=$VPPCOM_SERVER_GDB_CMDFILE
         set_pre_cmd $emacs_server $gdb_server $ld_preload
-        write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 2"
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$server_namespace_id"
+            namespace_secret="$server_namespace_secret"
+        fi
+        write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "sleep 3"
         echo "export LD_LIBRARY_PATH=\"$lib64_dir:$VCL_LDPRELOAD_LIB_DIR:$LD_LIBRARY_PATH\"" >> $cmd2_file
         echo "${pre_cmd}${app_dir}${srvr_app}" >> $cmd2_file
         write_script_footer $cmd2_file $perf_server
@@ -667,6 +735,10 @@ native_preload() {
         tmp_gdb_cmdfile=$tmp_gdb_cmdfile_client
         gdb_cmdfile=$VPPCOM_CLIENT_GDB_CMDFILE
         set_pre_cmd $emacs_client $gdb_client $ld_preload
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$client_namespace_id"
+            namespace_secret="$client_namespace_secret"
+        fi
         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
@@ -700,7 +772,11 @@ native_vcl() {
         if [ "$multi_host" = "server" ] ; then
             delay="sleep 10"
         else
-            delay="sleep 2"
+            delay="sleep 3"
+        fi
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$server_namespace_id"
+            namespace_secret="$server_namespace_secret"
         fi
         write_script_header $cmd2_file $tmp_gdb_cmdfile "$title2" "$delay"
         echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd2_file
@@ -719,6 +795,10 @@ native_vcl() {
         else
             delay="sleep 4"
         fi
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$client_namespace_id"
+            namespace_secret="$client_namespace_secret"
+        fi
         write_script_header $cmd3_file $tmp_gdb_cmdfile "$title3" "$delay"
         echo "export LD_LIBRARY_PATH=\"$lib64_dir:$LD_LIBRARY_PATH\"" >> $cmd3_file
         echo "srvr_addr=\"$sock_srvr_addr\"" >> $cmd3_file
@@ -782,6 +862,10 @@ docker_preload() {
         tmp_gdb_cmdfile=$tmp_gdb_cmdfile_server
         gdb_cmdfile=$VPPCOM_SERVER_GDB_CMDFILE
         set_pre_cmd $emacs_server $gdb_server $docker_ld_preload_lib
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$server_namespace_id"
+            namespace_secret="$server_namespace_secret"
+        fi
         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 $vcl_config_dir:$docker_vcl_config_dir -p $sock_srvr_port:$sock_srvr_port -e VCL_DEBUG=$VCL_DEBUG -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
@@ -793,6 +877,10 @@ 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
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$client_namespace_id"
+            namespace_secret="$client_namespace_secret"
+        fi
         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 $vcl_config_dir:$docker_vcl_config_dir -e VCL_DEBUG=$VCL_DEBUG -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
@@ -823,6 +911,10 @@ docker_vcl() {
         tmp_gdb_cmdfile=$tmp_gdb_cmdfile_server
         gdb_cmdfile=$VPPCOM_SERVER_GDB_CMDFILE
         set_pre_cmd $emacs_server $gdb_server
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$server_namespace_id"
+            namespace_secret="$server_namespace_secret"
+        fi
         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 $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
@@ -834,6 +926,10 @@ docker_vcl() {
         tmp_gdb_cmdfile=$tmp_gdb_cmdfile_client
         gdb_cmdfile=$VPPCOM_CLIENT_GDB_CMDFILE
         set_pre_cmd $emacs_client $gdb_client
+        if [ -n "$full_thru_host_stack_vpp_cfg" ] ; then
+            namespace_id="$client_namespace_id"
+            namespace_secret="$client_namespace_secret"
+        fi
         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 $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