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

Rename Clustrix to Xpand in the tests

Browse Source
This commit is contained in:
Timofey Turenko
2020-10-22 15:28:10 +03:00
parent 3546b716c5
commit 7680c9ce11
18 changed files with 134 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system-test/maxtest/include/maxtest/testconnections.hh
View File

@ -10,7 +10,7 @@
#include <sys/time.h>
#include <maxbase/ccdefs.hh>
#include <maxtest/clustrix_nodes.hh>
#include <maxtest/xpand_nodes.hh>
#include <maxtest/mariadb_nodes.hh>
#include <maxtest/maxscales.hh>
#include <maxtest/test_dir.hh>
@ -95,7 +95,7 @@ public:
*/
Mariadb_nodes* repl {nullptr};
Clustrix_nodes * clustrix;
Xpand_nodes * xpand;
/**
* @brief maxscales Maxscale object containing referebces to all Maxscale machines
@ -148,9 +148,9 @@ public:
bool binlog_slave_gtid {false};
/**
* @brief no_clustrix Do not check, restart and use Clustrix setup
* @brief no_xpand Do not check, restart and use Xpand setup
*/
bool no_clustrix;
bool no_xpand;
/**
* @brief timeout seconds until test termination

16
system-test/maxtest/include/maxtest/clustrix_nodes.hh → system-test/maxtest/include/maxtest/xpand_nodes.hh
View File

@ -13,7 +13,7 @@
#pragma once
/**
* @file clustrix_nodes.h - work with Clustrix setup
* @file xpand_nodes.h - work with Xpand setup
*
*/
@ -23,35 +23,35 @@
#include <maxtest/nodes.hh>
class Clustrix_nodes : public Mariadb_nodes
class Xpand_nodes : public Mariadb_nodes
{
public:
Clustrix_nodes(const char* pref, const char* test_cwd, bool verbose, std::string network_config)
Xpand_nodes(const char* pref, const char* test_cwd, bool verbose, std::string network_config)
: Mariadb_nodes(pref, test_cwd, verbose, network_config)
{
}
/**
* @brief start_cluster Intstalls Clustrix on all nodes, configure license, form cluster
* @brief start_cluster Intstalls Xpand on all nodes, configure license, form cluster
* @return 0 in case of success
*/
int start_replication();
/**
* @brief cnf_servers Generate Clustrix servers description for maxscale.cnf
* @brief cnf_servers Generate Xpand servers description for maxscale.cnf
* @return text for maxscale.cnf
*/
std::string cnf_servers();
/**
* @brief check_replication Checks if Clustrix Cluster is up and running
* @return 0 if Clustrix Cluster is ok
* @brief check_replication Checks if Xpand Cluster is up and running
* @return 0 if Xpand Cluster is ok
*/
int check_replication();
/**
* @brief install_clustrix
* @brief perpare_server configurs Xpand on the node
* @param m node index
* @return 0 in case of success
*/