hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add BACKEND_SSL VM type

Browse Source 
This is needed by tests that use add_test_executable_ex and require
backend SSL. Also fixed a problem in disable_ssl where an empty query was
executed instead of the query itself.
This commit is contained in:
Markus Mäkelä
2020-05-27 14:06:51 +03:00
parent c211bf1a21
commit 0907e0f0e5
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/maxtest/src/mariadb_nodes.cc
View File

@ -1175,16 +1175,10 @@ int Mariadb_nodes::configure_ssl(bool require)
int Mariadb_nodes::disable_ssl() int Mariadb_nodes::disable_ssl()
{ {
int local_result = 0; int local_result = connect();
char str[1024]; local_result += execute_query(
nodes[0], "DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
local_result += connect(); user_name, user_name, password);
sprintf(str,
"DROP USER %s; grant all privileges on *.* to '%s'@'%%' identified by '%s';",
user_name,
user_name,
password);
local_result += execute_query(nodes[0], "%s", "");
close_connections(); close_connections();
for (int i = 0; i < N; i++) for (int i = 0; i < N; i++)

2
maxscale-system-test/utilities.cmake
View File

@ -166,7 +166,7 @@ function(add_test_executable_ex)
message(FATAL_ERROR "VMS is not set.") message(FATAL_ERROR "VMS is not set.")
else() else()
# Check that the vms setup is recognized. # Check that the vms setup is recognized.
set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale) set(known_vms_setups none repl_backend galera_backend big_repl_backend columnstore_backend second_maxscale backend_ssl)
foreach(elem ${vms_setup}) foreach(elem ${vms_setup})
list(FIND known_vms_setups ${elem} vms_ind) list(FIND known_vms_setups ${elem} vms_ind)
if (vms_ind GREATER -1) if (vms_ind GREATER -1)