diff options
| -rwxr-xr-x | build-root/scripts/checkstyle.sh | 2 | ||||
| -rw-r--r-- | src/plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/vpp-interfaces.c | 22 | ||||
| -rw-r--r-- | src/srvpp/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/srvpp/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/srvpp/tests/CMakeLists.txt | 4 |
6 files changed, 6 insertions, 28 deletions
diff --git a/build-root/scripts/checkstyle.sh b/build-root/scripts/checkstyle.sh index 3a898cb..fb0cb96 100755 --- a/build-root/scripts/checkstyle.sh +++ b/build-root/scripts/checkstyle.sh @@ -142,7 +142,7 @@ if [ ${EXIT_CODE} == 0 ]; then echo "*******************************************************************" else echo "*******************************************************************" - echo "* VPP CHECKSTYLE FAILED" + echo "* SWEETCOMB CHECKSTYLE FAILED" echo "* CONSULT FAILURE LOG ABOVE" echo "* NOTE: Running 'build-root/scripts/checkstyle.sh --fix' *MAY* fix the issue" echo "*******************************************************************" diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index f21d06f..41915a1 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/src/plugins/vpp-interfaces.c b/src/plugins/vpp-interfaces.c index 9525c18..bb1f046 100644 --- a/src/plugins/vpp-interfaces.c +++ b/src/plugins/vpp-interfaces.c @@ -569,25 +569,3 @@ sr_plugin_cleanup_cb(sr_session_ctx_t *session, void *private_ctx) free(ctx); } -/** - * @brief Callback to be called by plugin daemon periodically, to check whether the plugin and managed app is healthy. - */ -/* -int -sr_plugin_health_check_cb(sr_session_ctx_t *session, void *private_ctx) -{ - plugin_ctx_t *ctx = (plugin_ctx_t *) private_ctx; - vl_api_control_ping_t *ping = NULL; - int rc = 0; - - ping = srvpp_alloc_msg(VL_API_CONTROL_PING, sizeof(*ping)); - - rc = srvpp_send_request(ctx->srvpp_ctx, ping, NULL); - - if (0 != rc) { - return SR_ERR_DISCONNECT; - } else { - return SR_ERR_OK; - } -} -*/ diff --git a/src/srvpp/CMakeLists.txt b/src/srvpp/CMakeLists.txt index 20fe6f0..539675d 100644 --- a/src/srvpp/CMakeLists.txt +++ b/src/srvpp/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/src/srvpp/src/CMakeLists.txt b/src/srvpp/src/CMakeLists.txt index 7fec80d..8cc0a04 100644 --- a/src/srvpp/src/CMakeLists.txt +++ b/src/srvpp/src/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: diff --git a/src/srvpp/tests/CMakeLists.txt b/src/srvpp/tests/CMakeLists.txt index 37b8c32..dc14ffb 100644 --- a/src/srvpp/tests/CMakeLists.txt +++ b/src/srvpp/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2016 Cisco and/or its affiliates. +# Copyright (c) 2018 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -26,7 +26,7 @@ macro(ADD_UNIT_TEST TEST_NAME) add_executable(${TEST_NAME} ${TEST_SRC}) target_link_libraries(${TEST_NAME} ${CMOCKA_LIBRARIES} srvpp_a) add_test(${TEST_NAME} ${TEST_NAME}) - + if(valgrind_FOUND) add_test(${TEST_NAME}_valgrind valgrind --error-exitcode=1 --read-var-info=yes |