hsa vperf: move and rename vcl/builtin perf client apps

Type: refactor

Change-Id: Ib8bbd4f3deb17b3a59bd839f18c97699569c56cf
Signed-off-by: Florin Coras <fcoras@cisco.com>

Author: florincoras

MAINTAINERS

@@ -755,6 +755,13 @@ M:	Aloys Augustin <aloaugus@cisco.com>
 M:	Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
 F:	src/plugins/hs_apps/
 
+Plugin - VPP Perf
+I:	vperf
+M:	Florin Coras <fcoras@cisco.com>
+M:	Matus Fabian <matfabia@cisco.com>
+M:	Dave Wallace <dwallacelf@gmail.com>
+F:	src/plugins/hs_apps/
+
 Python binding for the VPP API
 I:	papi
 M:	Ole Troan <otroan@employees.org>

docs/spelling_wordlist.txt

@@ -1341,6 +1341,7 @@ vnet
 Vnet
 vom
 vpe
+vperf
 vpn
 vpp
 Vpp

extras/kube-test/docker/Dockerfile.vpp

@@ -12,6 +12,7 @@ ENV DIR=vpp-data/lib/vpp_plugins
 COPY \
    $DIR/af_packet_plugin.so \
    $DIR/hs_apps_plugin.so \
+   $DIR/vperf_plugin.so \
    $DIR/http_plugin.so \
    $DIR/http_static_plugin.so \
    $DIR/ping_plugin.so \
@@ -23,6 +24,7 @@ COPY \
 COPY vpp-data/bin/vpp /usr/bin/
 COPY vpp-data/bin/vppctl /usr/bin/
 COPY vpp-data/bin/vpp_echo /usr/bin/
+COPY vpp-data/bin/vperf_* /usr/bin/
 COPY vpp-data/bin/vcl_* /usr/bin/
 COPY vpp-data/lib/*.so /usr/lib/
 

extras/kube-test/infra/vpp.go

@@ -44,6 +44,7 @@ plugins {
 
   plugin af_packet_plugin.so { enable }
   plugin hs_apps_plugin.so { enable }
+  plugin vperf_plugin.so { enable }
   plugin http_plugin.so { enable }
   plugin http_static_plugin.so { enable }
   plugin ping_plugin.so { enable }

extras/kube-test/kube_test.go

@@ -192,10 +192,10 @@ func EchoBuiltinEchobytesTest(s *KubeSuite) {
 	vppCln := s.Pods.ClientGeneric.InitVpp()
 	vppSrv := s.Pods.ServerGeneric.InitVpp()
 
-	o, err := vppSrv.VppctlBackground(ctx, "test echo server uri tcp://"+s.Pods.ServerGeneric.IpAddress+"/1234")
+	o, err := vppSrv.VppctlBackground(ctx, "vperf server uri tcp://"+s.Pods.ServerGeneric.IpAddress+"/1234")
 	Log(o)
 	AssertNil(err)
-	o, err = vppCln.Vppctl(ctx, "test echo client echo-bytes run-time 10 verbose uri tcp://"+s.Pods.ServerGeneric.IpAddress+"/1234")
+	o, err = vppCln.Vppctl(ctx, "vperf client echo-bytes run-time 10 verbose uri tcp://"+s.Pods.ServerGeneric.IpAddress+"/1234")
 	Log(o)
 	AssertContains(o, "Test started")
 	AssertContains(o, "Test finished")

extras/rpm/vpp.spec

@@ -376,8 +376,8 @@ fi
 /usr/bin/vat2
 /usr/bin/vpp*
 /usr/bin/svm*
-/usr/bin/vcl_test_client
-/usr/bin/vcl_test_server
+/usr/bin/vperf_client
+/usr/bin/vperf_server
 %config(noreplace) /etc/sysctl.d/80-vpp.conf
 %config(noreplace) /etc/vpp/startup.conf
 /usr/share/vpp/api/*

extras/scripts/host-stack/perf-tests/vcl_client

@@ -5,7 +5,7 @@
 
 VPP_WS=${VPP_WS:-/scratch/fcoras/vpp}
 CFG_WS=$VPP_WS/extras/scripts/host-stack/perf-tests
-BIN=$VPP_WS/build-root/build-vpp-native/vpp/bin/vcl_test_client
+BIN=$VPP_WS/build-root/build-vpp-native/vpp/bin/vperf_client
 GDB_ENV=$CFG_WS/gdb_vcl_env
 VCL_CFG=$CFG_WS/vcl_perf.conf
 PARAMS=$@

extras/scripts/host-stack/perf-tests/vcl_server

@@ -5,7 +5,7 @@
 
 VPP_WS=${VPP_WS:-/scratch/fcoras/vpp}
 CFG_WS=$VPP_WS/extras/scripts/host-stack/perf-tests
-BIN=$VPP_WS/build-root/build-vpp-native/vpp/bin/vcl_test_server
+BIN=$VPP_WS/build-root/build-vpp-native/vpp/bin/vperf_server
 GDB_ENV=$CFG_WS/gdb_init_tls
 VCL_CFG=$CFG_WS/vcl_perf.conf
 PARAMS=$@

src/plugins/hs_apps/CMakeLists.txt

@@ -22,11 +22,6 @@ add_vpp_plugin(hs_apps
   SOURCES
   tls_client.c
   tls_server.c
-  builtin_echo/echo_cli.c
-  builtin_echo/echo_client.c
-  builtin_echo/echo_server.c
-  builtin_echo/echo_stats.c
-  builtin_echo/echo_test_protos.c
   hs_apps.c
   http_cli.c
   http_client_cli.c
@@ -79,23 +74,6 @@ if(VPP_BUILD_VCL_TESTS)
     NO_INSTALL
   )
 
-  foreach(test
-    vcl_test_server
-    vcl_test_client
-  )
-    add_vpp_test(${test}
-      SOURCES
-      "vcl/${test}.c"
-      vcl/vcl_test_protos.c
-      LINK_LIBRARIES vppcom pthread ${EPOLL_LIB}
-    )
-  endforeach()
-
-  add_vpp_test(vcl_test_cl_udp SOURCES "vcl/vcl_test_cl_udp.c"
-    LINK_LIBRARIES vppcom pthread ${EPOLL_LIB}
-    NO_INSTALL
-  )
-
   add_vpp_test(vcl_cfg_test SOURCES "vcl/vcl_cfg_test.c"
     LINK_LIBRARIES vppcom pthread ${EPOLL_LIB}
     NO_INSTALL