summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2019-06-25 12:55:15 -0700
committerDave Wallace <dwallacelf@gmail.com>2019-06-26 02:15:20 +0000
commit00dd74cee7ef8c1c5265daf01db13891ed68507f (patch)
tree6fc40cb4cbd01cc993d75fba81a8b86850b32274
parent33cd4823d67bb30d39a4bd5af50449b072c6354a (diff)
hsa: move vcl test apps to hsa
Type: refactor Change-Id: I352975585c1091bfc5b85d7f8fe985f9059820a7 Signed-off-by: Florin Coras <fcoras@cisco.com>
-rw-r--r--MAINTAINERS3
-rw-r--r--src/plugins/hs_apps/CMakeLists.txt37
-rw-r--r--src/plugins/hs_apps/sapi/quic_echo.c (renamed from src/plugins/hs_apps/quic_echo.c)0
-rw-r--r--src/plugins/hs_apps/sapi/tcp_echo.c (renamed from src/plugins/hs_apps/tcp_echo.c)0
-rw-r--r--src/plugins/hs_apps/sapi/udp_echo.c (renamed from src/plugins/hs_apps/udp_echo.c)0
-rw-r--r--src/plugins/hs_apps/vcl/sock_test.h (renamed from src/vcl/sock_test.h)2
-rw-r--r--src/plugins/hs_apps/vcl/sock_test_client.c (renamed from src/vcl/sock_test_client.c)2
-rw-r--r--src/plugins/hs_apps/vcl/sock_test_server.c (renamed from src/vcl/sock_test_server.c)2
-rw-r--r--src/plugins/hs_apps/vcl/vcl_test.h (renamed from src/vcl/vcl_test.h)0
-rw-r--r--src/plugins/hs_apps/vcl/vcl_test_client.c (renamed from src/vcl/vcl_test_client.c)2
-rw-r--r--src/plugins/hs_apps/vcl/vcl_test_server.c (renamed from src/vcl/vcl_test_server.c)2
-rw-r--r--src/vcl/CMakeLists.txt21
12 files changed, 40 insertions, 31 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e6ccd0bdbf..573a1b5fb9b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -411,6 +411,9 @@ F: extras/vom/vom/
Plugin - Host Stack Applications
I: hsa
M: Florin Coras <fcoras@cisco.com>
+M: Dave Wallace <dwallacelf@gmail.com>
+M: Aloys Augustin <aloaugus@cisco.com>
+M: Nathan Skrzypczak <nathan.skrzypczak@gmail.com>
F: src/plugins/hs_apps/
THE REST
diff --git a/src/plugins/hs_apps/CMakeLists.txt b/src/plugins/hs_apps/CMakeLists.txt
index e7885c3d1bf..bf1f49cfa42 100644
--- a/src/plugins/hs_apps/CMakeLists.txt
+++ b/src/plugins/hs_apps/CMakeLists.txt
@@ -11,6 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+##############################################################################
+# vpp builtin hs apps
+##############################################################################
add_vpp_plugin(hs_apps
SOURCES
echo_client.c
@@ -20,24 +23,46 @@ add_vpp_plugin(hs_apps
proxy.c
)
-option(VPP_BUILD_SESSION_ECHO_APPS "Build session echo apps." ON)
-if(VPP_BUILD_SESSION_ECHO_APPS)
+##############################################################################
+# vpp external hs apps that use the "raw" session layer api
+##############################################################################
+option(VPP_BUILD_HS_SAPI_APPS "Build hs apps that use the session api." ON)
+if(VPP_BUILD_HS_SAPI_APPS)
add_vpp_executable(tcp_echo
- SOURCES tcp_echo.c
+ SOURCES sapi/tcp_echo.c
LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
DEPENDS api_headers
NO_INSTALL
)
add_vpp_executable(quic_echo
- SOURCES quic_echo.c
+ SOURCES sapi/quic_echo.c
LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
DEPENDS api_headers
NO_INSTALL
)
add_vpp_executable(udp_echo
- SOURCES udp_echo.c
+ SOURCES sapi/udp_echo.c
LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
DEPENDS api_headers
NO_INSTALL
)
-endif(VPP_BUILD_SESSION_ECHO_APPS)
+endif(VPP_BUILD_HS_SAPI_APPS)
+
+##############################################################################
+# vcl tests
+##############################################################################
+option(VPP_BUILD_VCL_TESTS "Build vcl tests." ON)
+if(VPP_BUILD_VCL_TESTS)
+ foreach(test
+ vcl_test_server
+ vcl_test_client
+ sock_test_server
+ sock_test_client
+ )
+ add_vpp_executable(${test}
+ SOURCES "vcl/${test}.c"
+ LINK_LIBRARIES vppcom pthread
+ NO_INSTALL
+ )
+ endforeach()
+endif(VPP_BUILD_VCL_TESTS)
diff --git a/src/plugins/hs_apps/quic_echo.c b/src/plugins/hs_apps/sapi/quic_echo.c
index a62af642b2f..a62af642b2f 100644
--- a/src/plugins/hs_apps/quic_echo.c
+++ b/src/plugins/hs_apps/sapi/quic_echo.c
diff --git a/src/plugins/hs_apps/tcp_echo.c b/src/plugins/hs_apps/sapi/tcp_echo.c
index 6c3ce928490..6c3ce928490 100644
--- a/src/plugins/hs_apps/tcp_echo.c
+++ b/src/plugins/hs_apps/sapi/tcp_echo.c
diff --git a/src/plugins/hs_apps/udp_echo.c b/src/plugins/hs_apps/sapi/udp_echo.c
index c9992befe98..c9992befe98 100644
--- a/src/plugins/hs_apps/udp_echo.c
+++ b/src/plugins/hs_apps/sapi/udp_echo.c
diff --git a/src/vcl/sock_test.h b/src/plugins/hs_apps/vcl/sock_test.h
index 082c72e38f5..9f7f4379ce7 100644
--- a/src/vcl/sock_test.h
+++ b/src/plugins/hs_apps/vcl/sock_test.h
@@ -20,7 +20,7 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <vcl/vcl_test.h>
+#include <hs_apps/vcl/vcl_test.h>
#define SOCK_TEST_AF_UNIX_FILENAME "/tmp/ldp_server_af_unix_socket"
#define SOCK_TEST_MIXED_EPOLL_DATA "Hello, world! (over an AF_UNIX socket)"
diff --git a/src/vcl/sock_test_client.c b/src/plugins/hs_apps/vcl/sock_test_client.c
index a28feee674f..ea89987f325 100644
--- a/src/vcl/sock_test_client.c
+++ b/src/plugins/hs_apps/vcl/sock_test_client.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <time.h>
#include <arpa/inet.h>
-#include <vcl/sock_test.h>
+#include <hs_apps/vcl/sock_test.h>
#include <fcntl.h>
#ifndef VCL_TEST
#include <sys/un.h>
diff --git a/src/vcl/sock_test_server.c b/src/plugins/hs_apps/vcl/sock_test_server.c
index 2e678c3899a..59dae179cd8 100644
--- a/src/vcl/sock_test_server.c
+++ b/src/plugins/hs_apps/vcl/sock_test_server.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <time.h>
#include <ctype.h>
-#include <vcl/sock_test.h>
+#include <hs_apps/vcl/sock_test.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
diff --git a/src/vcl/vcl_test.h b/src/plugins/hs_apps/vcl/vcl_test.h
index ab05f7ae9cf..ab05f7ae9cf 100644
--- a/src/vcl/vcl_test.h
+++ b/src/plugins/hs_apps/vcl/vcl_test.h
diff --git a/src/vcl/vcl_test_client.c b/src/plugins/hs_apps/vcl/vcl_test_client.c
index 42476ffbe01..1ead146aef5 100644
--- a/src/vcl/vcl_test_client.c
+++ b/src/plugins/hs_apps/vcl/vcl_test_client.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <time.h>
#include <arpa/inet.h>
-#include <vcl/vcl_test.h>
+#include <hs_apps/vcl/vcl_test.h>
#include <pthread.h>
typedef struct
diff --git a/src/vcl/vcl_test_server.c b/src/plugins/hs_apps/vcl/vcl_test_server.c
index 173bada2315..62292adae5f 100644
--- a/src/vcl/vcl_test_server.c
+++ b/src/plugins/hs_apps/vcl/vcl_test_server.c
@@ -23,7 +23,7 @@
#include <ctype.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <vcl/vcl_test.h>
+#include <hs_apps/vcl/vcl_test.h>
#include <sys/epoll.h>
#include <vppinfra/mem.h>
#include <pthread.h>
diff --git a/src/vcl/CMakeLists.txt b/src/vcl/CMakeLists.txt
index 2578a37bf42..ab0a6ad6a2d 100644
--- a/src/vcl/CMakeLists.txt
+++ b/src/vcl/CMakeLists.txt
@@ -40,27 +40,8 @@ add_vpp_library(vcl_ldpreload
add_vpp_headers(vcl
ldp.h
- sock_test.h
ldp_glibc_socket.h
- vcl_test.h
vppcom.h
vcl_locked.h
ldp_socket_wrapper.h
-)
-
-##############################################################################
-# vcl tests
-##############################################################################
-option(VPP_BUILD_VCL_TESTS "Build vcl tests." ON)
-if(VPP_BUILD_VCL_TESTS)
- foreach(test
- vcl_test_server
- vcl_test_client
- sock_test_server
- sock_test_client
- )
- add_vpp_executable(${test} SOURCES ${test}.c LINK_LIBRARIES vppcom pthread
- NO_INSTALL)
- endforeach()
-endif(VPP_BUILD_VCL_TESTS)
-
+) \ No newline at end of file