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

MXS-2481 Rename MaxCtrl to MaxRest

Browse Source 
So as not to believe that the program depends upon or uses
maxctrl.
This commit is contained in:
Johan Wikman
2019-05-21 13:07:43 +03:00
parent 97ad45125d
commit 5a26bd8ce5
4 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
maxscale-system-test/clustrix_basics.cpp
View File

@ -10,7 +10,7 @@
#include <maxbase/string.hh>
#include <maxscale/jansson.hh>
#include "testconnections.h"
#include "maxctrl.hh"
#include "maxrest.hh"
using namespace std;
@ -28,11 +28,11 @@ const set<string> bootstrap_servers =
const std::string monitor_name = "Clustrix-Monitor";
void check_for_servers(const MaxCtrl& maxctrl)
void check_for_servers(const MaxRest& maxrest)
{
TestConnections& test = maxctrl.test();
TestConnections& test = maxrest.test();
auto servers = maxctrl.list_servers();
auto servers = maxrest.list_servers();
test.expect(servers.size() >= bootstrap_servers.size(),
"Expected at least %d servers.", (int)bootstrap_servers.size());
@ -78,9 +78,9 @@ void check_for_servers(const MaxCtrl& maxctrl)
void run_test(TestConnections& test)
{
MaxCtrl maxctrl(&test);
MaxRest maxrest(&test);
check_for_servers(maxctrl);
check_for_servers(maxrest);
}
}