Merge pull request #225 from smartdevicelink/develop

Release 7.1.0

Author: ShobhitAd

README.md

@@ -29,15 +29,15 @@ $ git clone https://github.com/smartdevicelink/sdl_atf_test_scripts.git
 ```
 
 ## Compilation
-**1.** Install 3d-parties developers libraries
+**1.** Install 3rd-parties developers libraries
 - Run the following commands:
 ```
 $ sudo apt-get install lua5.2 liblua5.2-dev libxml2-dev lua-lpeg-dev
-$ sudo apt-get install openssl libssl1.0-dev
+$ sudo apt-get install openssl libssl-dev net-tools
 ```
 
 **2.** Install Qt5.9+
-- For Ubuntu `18.04`:
+- For Ubuntu `18.04+`:
     - Run the following command:
 ```
 $ sudo apt-get install libqt5websockets5 libqt5websockets5-dev
@@ -83,7 +83,7 @@ $ ln -s ../../sdl_atf_test_scripts/user_modules
 **5.** Install dependencies for local parallel mode
 
 Steps below are required only in case if local parallel mode is going to be used.
-- Install Docker, e.g. [how-to](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-18-04)
+- Install Docker, e.g. [how-to](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-20-04)
 - Install additional tools:
 ```
 $ sudo apt-get install screen rsync
@@ -93,8 +93,8 @@ $ sudo apt-get install screen rsync
 $ cd atf_parallels/docker
 $ ./build.sh <ubuntu_version>
 ```
-<b>Note:</b> accepted values are `16` and `18` (will be processed as `16.04` and `18.04` correspondingly).
-If version is not specified `18` will be used by default.
+<b>Note:</b> accepted values are `16`, `18`, and `20` (will be processed as `16.04`, `18.04`, and `20.04` correspondingly).
+If version is not specified `20` will be used by default.
 
 ## Settings
 
@@ -231,6 +231,7 @@ The best approach is to use predefined configuration (e.g. `remote_linux`) as ba
 
 1. For a big tests sets (>1000 scripts) Report and Logs can be very huge (>10Gb). Most of the space is occupied by SDL logs. In order to turn them off `--sdl-log` or `--sdl-core-dump` options with `no` or `fail` value can be specified.
 2. Some scripts (old policy ones) create the same temporary files inside `files`, `test_scripts` or `user_modules` folders. In case of parallel mode the same temporary file can be used by different scripts at the same time. This leads to incorrect results or even aborts. In order to mitigate this issue `--copy-atf-ts` option can be specified. It tells ATF to copy mentioned folders for each job instead of creating symlinks.
+3. By default scripts for vehicle data executed for all available parameters. However there is possibility to restrict parameters to be tested by defining `VD_PARAMS` environment variable. E.g. `export VD_PARAMS=gps,speed` will allow to run the tests only for `gps` and `speed` vehicle data parameters.
 
 ## Documentation generation
 

atf_parallels/docker/Dockerfile

@@ -4,13 +4,17 @@ FROM ubuntu:${ubuntu_ver}
 
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
+ARG openssl_lib_ver
+
 RUN apt-get update && apt-get -q -y install \
-  locales sudo libssl1.0.0 libusb-1.0-0 libbluetooth3 openssl liblua5.2-0 psmisc \
+  locales sudo libssl${openssl_lib_ver} libssl-dev libusb-1.0-0 libbluetooth3 openssl liblua5.2-0 psmisc \
   libexpat1 sqlite3 libqt5websockets5 net-tools iproute2 \
-  libssl-doc- libusb-1.0-doc- autotools-dev- binutils- build-essential- bzip2- cpp- cpp-5- \
+  libssl-doc- libusb-1.0-doc- autotools-dev- binutils- build-essential- bzip2- cpp- \
   dpkg-dev- fakeroot- manpages- manpages-dev- qttranslations5-l10n- xdg-user-dirs- xml-core- dbus-
 
-RUN ln -s /lib/x86_64-linux-gnu/libexpat.so.1.6.7 /usr/lib/x86_64-linux-gnu/libexpat.so
+ARG expat_lib_ver
+
+RUN ln -s /lib/x86_64-linux-gnu/libexpat.so.${expat_lib_ver} /usr/lib/x86_64-linux-gnu/libexpat.so
 
 RUN locale-gen en_US.UTF-8 && update-locale LANG=en_US.UTF-8
 

atf_parallels/docker/build.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 
 _ubuntu_ver=$1
-_ubuntu_ver_default=18
+_ubuntu_ver_default=20
 _hosted_ubuntu_ver=$(lsb_release -sr 2>/dev/null)
+_openssl_lib_ver=1.1
+_expat_lib_ver=1.6.11
 
 function warning {
   echo "--WARNING!"
@@ -16,8 +18,19 @@ if [ -z $_ubuntu_ver ]; then
 fi
 
 case $_ubuntu_ver in
-  16|18)
+  16|18|20)
+    case $_ubuntu_ver in
+      16)
+        _openssl_lib_ver=1.0.0
+        _expat_lib_ver=1.6.0;;
+      18)
+        _expat_lib_ver=1.6.7;;
+      *)
+        ;;
+    esac
+
     _ubuntu_ver=$_ubuntu_ver.04
+
     if [ ! -z $_hosted_ubuntu_ver ]; then
       if [ ! $_hosted_ubuntu_ver = $_ubuntu_ver ]; then
         warning "Specified Ubuntu version '$_ubuntu_ver' does not match the hosted Ubuntu version '$_hosted_ubuntu_ver'"
@@ -28,8 +41,8 @@ case $_ubuntu_ver in
 
     echo "Ubuntu version: "$_ubuntu_ver;;
   *)
-    warning "Specified Ubuntu version '$_ubuntu_ver' is unexpected. Allowed versions: 16 or 18";
+    warning "Specified Ubuntu version '$_ubuntu_ver' is unexpected. Allowed versions: 16, 18, or 20";
     exit 1;;
 esac
 
-docker build --build-arg ubuntu_ver=$_ubuntu_ver -f Dockerfile -t atf_worker .
+docker build --build-arg ubuntu_ver=$_ubuntu_ver --build-arg openssl_lib_ver=$_openssl_lib_ver --build-arg expat_lib_ver=$_expat_lib_ver -f Dockerfile -t atf_worker .

atf_parallels/loop.sh

@@ -24,6 +24,7 @@ function docker_run {
         --cap-add NET_ADMIN \
         --privileged \
         -e LOCAL_USER_ID=`id -u $USER` \
+        -e VD_PARAMS=$VD_PARAMS \
         -v $_atf_ts_dir:/home/developer/atf_ts \
         -v $_tmpdirname:/home/developer/sdl \
         -v $_sdl_prepared:/home/developer/sdl_ext \

modules/configuration/app_config.lua

@@ -16,7 +16,7 @@ config.application1 =
     syncMsgVersion =
     {
       majorVersion = 7,
-      minorVersion = 0
+      minorVersion = 1
     },
     appName = "Test Application",
     isMediaApplication = true,
@@ -44,7 +44,7 @@ config.application2 =
     syncMsgVersion =
     {
       majorVersion = 7,
-      minorVersion = 0
+      minorVersion = 1
     },
     appName = "Test Application2",
     isMediaApplication = true,
@@ -72,7 +72,7 @@ config.application3 =
     syncMsgVersion =
     {
       majorVersion = 7,
-      minorVersion = 0
+      minorVersion = 1
     },
     appName = "Test Application3",
     isMediaApplication = true,
@@ -100,7 +100,7 @@ config.application4 =
     syncMsgVersion =
     {
       majorVersion = 7,
-      minorVersion = 0
+      minorVersion = 1
     },
     appName = "Test Application4",
     isMediaApplication = true,
@@ -128,7 +128,7 @@ config.application5 =
     syncMsgVersion =
     {
       majorVersion = 7,
-      minorVersion = 0
+      minorVersion = 1
     },
     appName = "Test Application5",
     isMediaApplication = true,

src/luaopenssl/lua_openssl.cc

@@ -13,6 +13,8 @@ extern "C" {
 #include <openssl/engine.h>
 }
 
+#define OPENSSL1_1_VERSION 0x10100000L
+
 /**
 * @brief Definition of function pointer type info_callback
 * @param OpenSSL SSL
@@ -54,13 +56,8 @@ namespace {
 	* @brief OpenSSL library cleanup
 	**/
 	void cleanupOpensslLib() {
-		ERR_remove_state(0);
-		ENGINE_cleanup();
-		CONF_modules_unload(1);
-		ERR_free_strings();
 		EVP_cleanup();
-		sk_SSL_COMP_free(SSL_COMP_get_compression_methods());
-		CRYPTO_cleanup_all_ex_data();
+		ERR_free_strings();
 	}
 
 	/**
@@ -75,13 +72,19 @@ namespace {
 				method = SSLv23_method();
 				break;
 			case SP_TLS:
+#if OPENSSL_VERSION_NUMBER < OPENSSL1_1_VERSION
 				method = TLSv1_2_method();
+#else
+				method = TLS_method();
+#endif
 				break;
+#ifndef OPENSSL_NO_SSL3
 			case SP_SSL:
 				method = SSLv3_method();
 				break;
+#endif
 			case SP_DTLS:
-				method = DTLSv1_method();
+				method = DTLS_method();
 				break;
 			default:
 				printf("Error: Can not create SSL context with security protocol %d\n", type);
@@ -275,20 +278,19 @@ namespace {
 	* @return OpenSSL BIO structure
 	**/
 	BIO* newBIO(const int type) {
-		BIO_METHOD* methodType;
+		BIO* bio = NULL;
 		switch ((BIOTypes)type) {
 			case BIO_SOURCE:
-				methodType = BIO_s_mem();
+				bio = BIO_new(BIO_s_mem());
 				break;
 			case BIO_FILTER:
-				methodType = BIO_f_ssl();
+				bio = BIO_new(BIO_f_ssl());
 				break;
 			default:
 				printf("Error: Can not create BIO with type %d\n", type);
 				return NULL;
 		}
 
-		BIO* bio = BIO_new(methodType);
 		if (bio && type == BIO_SOURCE) {
 			BIO_set_mem_eof_return(bio, -1);
 		}

src/remote_adapter/remote_adapter_server/BOOST.cmake

@@ -24,10 +24,14 @@ if(QNXNTO)
     set(CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}" "${BOOST_ROOT}")
 endif()
 
-find_package(Boost 1.68.0 COMPONENTS system filesystem)
+find_package(Boost 1.72.0 COMPONENTS system filesystem)
 
 if (NOT ${Boost_FOUND})
-    message(STATUS "Did not find boost. Downloading and installing boost 1.68")
+    message(STATUS "Did not find boost. Downloading and installing boost 1.72")
+    set(BOOST_ROOT ${CMAKE_CURRENT_BINARY_DIR}/third_party/boost)
+    set(BOOST_INSTALL ${BOOST_ROOT})
+    set(BOOST_INCLUDE_DIRS ${BOOST_INSTALL}/include)
+    set(BOOST_LIBRARY_DIRS ${BOOST_INSTALL}/lib)
     if(NOT QNXNTO)
         set(BOOST_GCC_JAM "")
         set(BOOST_FILESYSTEM_OPERATION "")
@@ -59,14 +63,17 @@ if (NOT ${Boost_FOUND})
     endif()
     set(BOOST_INSTALL_COMMAND ${BOOST_BUILD_COMMAND} install)
     ExternalProject_Add(Boost
-        URL https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz https://newcontinuum.dl.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.tar.gz
+        URL https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz https://newcontinuum.dl.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.gz
         DOWNLOAD_DIR ${BOOST_LIB_SOURCE_DIRECTORY}
         SOURCE_DIR ${BOOST_LIB_SOURCE_DIRECTORY}
         CONFIGURE_COMMAND  ${BOOST_GCC_JAM} COMMAND ${BOOST_FILESYSTEM_OPERATION} COMMAND ${BOOTSTRAP}
         BUILD_COMMAND echo ${BOOST_PROJECT_CONFIG_JAM} >> ./project-config.jam COMMAND ${BOOST_BUILD_COMMAND}
         INSTALL_COMMAND ${BOOST_INSTALL_COMMAND}
         INSTALL_DIR ${BOOST_INSTALL}
         BUILD_IN_SOURCE true)
+else()
+    set(BOOST_INCLUDE_DIRS ${Boost_INCLUDE_DIRS})
+    set(BOOST_LIBRARY_DIRS ${Boost_LIBRARY_DIRS})
 endif()
 
 set(BOOST_LIBRARIES

src/remote_adapter/remote_adapter_server/plugins/transport/message_broker.cpp

@@ -78,7 +78,7 @@ void Fail(boost::system::error_code ec, char const *what) {
 
 // //------------------------------------------------------------------------------
 WebsocketSession::WebsocketSession(tcp::socket socket)
-    : ws_(std::move(socket)), strand_(ws_.get_executor()) {
+    : ws_(std::move(socket)) {
   LOG_INFO("{0}", __func__);
 }
 
@@ -100,9 +100,8 @@ void WebsocketSession::AsyncRead() {
 
   ws_.async_read(
       read_buffer_,
-      boost::asio::bind_executor(
-          strand_, std::bind(&WebsocketSession::OnRead, shared_from_this(),
-                             std::placeholders::_1, std::placeholders::_2)));
+      std::bind(&WebsocketSession::OnRead, shared_from_this(),
+                std::placeholders::_1, std::placeholders::_2));
 }
 
 void WebsocketSession::OnRead(boost::system::error_code ec,
@@ -199,7 +198,7 @@ template <class Session> void WebsocketListener<Session>::Run() {
 
 template <class Session> void WebsocketListener<Session>::Stop() {
   LOG_INFO("{0}", __func__);
-  resolver_.get_io_context().stop();
+  resolver_.cancel();
   if (session_.use_count()) {
     session_->Close();
   }
@@ -229,9 +228,6 @@ void WebsocketListener<Session>::OnResolve(
   if (er) {
     Fail(er, "WebsocketListener::OnResolve connect");
     resolver_.cancel();
-    if (resolver_.get_io_context().stopped()) {
-      return;
-    }
     return DoResolve();
   }
 
@@ -570,7 +566,7 @@ MessageBroker<TCPListener>::MakeEndpoint(const std::string &address,
 
   auto const ip_address = boost::asio::ip::make_address(address.c_str());
 
-  return tcp::endpoint{ip_address, port};
+  return tcp::endpoint{ip_address, static_cast<unsigned short>(port)};
 }
 
 #define LIBRARY_API extern "C"

src/remote_adapter/remote_adapter_server/plugins/transport/message_broker.h

@@ -4,7 +4,6 @@
 #include "rpc/detail/log.h"
 #include <boost/asio/bind_executor.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/strand.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/websocket.hpp>
 #include <future>
@@ -126,7 +125,6 @@ class WebsocketSession : public std::enable_shared_from_this<WebsocketSession> {
   void OnClose(boost::system::error_code ec);
 
   websocket::stream<tcp::socket> ws_;
-  boost::asio::strand<boost::asio::io_context::executor_type> strand_;
   boost::beast::multi_buffer read_buffer_;
   std::queue<std::string> msg_queue_;
   std::mutex msg_queue_lock_;

start.sh

@@ -21,6 +21,7 @@ P="\033[0;32m" # GREEN
 F="\033[0;31m" # RED
 A="\033[0;35m" # MAGENTA
 S="\033[0;33m" # YELLOW
+B="\033[0;34m" # BLUE
 N="\033[0m"    # NONE
 
 dbg() {