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

Update test configuration files

Browse Source 
Updated the REST API and MaxCtrl configuration files with new object
names. Updated tests with new object names.
This commit is contained in:
Markus Mäkelä
2018-01-19 09:19:32 +02:00
parent f204650bbb
commit ccebf38bc0
13 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/core/test/rest-api/test/monitor.js
View File

@ -52,8 +52,8 @@ describe("Monitor Relationships", function() {
relationships: {
servers: null
}}}
return request.patch(base_url + "/monitors/MySQL-Monitor", {json: mon})
.then(() => request.get(base_url + "/monitors/MySQL-Monitor", { json: true }))
return request.patch(base_url + "/monitors/MariaDB-Monitor", {json: mon})
.then(() => request.get(base_url + "/monitors/MariaDB-Monitor", { json: true }))
.then((res) => {
res.data.relationships.should.not.have.keys("servers")
})
@ -93,9 +93,9 @@ describe("Monitor Relationships", function() {
{id: "server3", type: "servers"},
{id: "server4", type: "servers"},
]}
return request.patch(base_url + "/monitors/MySQL-Monitor", {json: mon})
return request.patch(base_url + "/monitors/MariaDB-Monitor", {json: mon})
})
.then(() => request.get(base_url + "/monitors/MySQL-Monitor", { json: true }))
.then(() => request.get(base_url + "/monitors/MariaDB-Monitor", { json: true }))
.then((res) => {
res.data.relationships.servers.data.should.have.lengthOf(4)
})
@ -111,9 +111,9 @@ describe("Monitor Relationships", function() {
{ id: "server1", type: "servers" }
]}
return request.patch(base_url + "/monitors/MySQL-Monitor/relationships/servers", {json: old})
return request.patch(base_url + "/monitors/MariaDB-Monitor/relationships/servers", {json: old})
.then(() => request.patch(base_url + "/monitors/" + monitor.data.id + "/relationships/servers", {json: created}))
.then(() => request.get(base_url + "/monitors/MySQL-Monitor", { json: true }))
.then(() => request.get(base_url + "/monitors/MariaDB-Monitor", { json: true }))
.then((res) => {
res.data.relationships.servers.data.should.have.lengthOf(3)
})
@ -138,8 +138,8 @@ describe("Monitor Relationships", function() {
]}
return request.patch(base_url + "/monitors/" + monitor.data.id + "/relationships/servers", {json: {data: []}})
.then(() => request.patch(base_url + "/monitors/MySQL-Monitor/relationships/servers", {json: old}))
.then(() => request.get(base_url + "/monitors/MySQL-Monitor", { json: true }))
.then(() => request.patch(base_url + "/monitors/MariaDB-Monitor/relationships/servers", {json: old}))
.then(() => request.get(base_url + "/monitors/MariaDB-Monitor", { json: true }))
.then((res) => {
res.data.relationships.servers.data.should.have.lengthOf(4)
})
@ -161,9 +161,9 @@ describe("Monitor Actions", function() {
before(startMaxScale)
it("stop monitor", function() {
return request.put(base_url + "/monitors/MySQL-Monitor/stop")
return request.put(base_url + "/monitors/MariaDB-Monitor/stop")
.then(function() {
return request.get(base_url + "/monitors/MySQL-Monitor")
return request.get(base_url + "/monitors/MariaDB-Monitor")
})
.then(function(resp) {
var mon = JSON.parse(resp)
@ -172,9 +172,9 @@ describe("Monitor Actions", function() {
});
it("start monitor", function() {
return request.put(base_url + "/monitors/MySQL-Monitor/start")
return request.put(base_url + "/monitors/MariaDB-Monitor/start")
.then(function() {
return request.get(base_url + "/monitors/MySQL-Monitor")
return request.get(base_url + "/monitors/MariaDB-Monitor")
})
.then(function(resp) {
var mon = JSON.parse(resp)
@ -199,9 +199,9 @@ describe("Monitor Regressions", function() {
}
}
}
return request.patch(base_url + "/monitors/MySQL-Monitor", {json: b})
return request.patch(base_url + "/monitors/MariaDB-Monitor", {json: b})
.then(function() {
return request.get(base_url + "/monitors/MySQL-Monitor")
return request.get(base_url + "/monitors/MariaDB-Monitor")
})
.then(function(resp) {
var mon = JSON.parse(resp)

4
server/core/test/rest-api/test/schema_validation.js
View File

@ -42,7 +42,7 @@ describe("Individual Resources", function() {
"/servers/server2",
"/services/RW-Split-Router",
"/services/RW-Split-Router/listeners",
"/monitors/MySQL-Monitor",
"/monitors/MariaDB-Monitor",
"/filters/Hint",
"/sessions/1",
"/maxscale/",
@ -83,7 +83,7 @@ describe("Resource Self Links", function() {
"/services/RW-Split-Router",
"/services/RW-Split-Router/listeners",
"/services/RW-Split-Router/listeners/RW-Split-Listener",
"/monitors/MySQL-Monitor",
"/monitors/MariaDB-Monitor",
"/filters/Hint",
"/sessions/1",
"/maxscale/",

6
server/core/test/rest-api/test/server.js
View File

@ -8,7 +8,7 @@ var server = {
parameters: {
port: 3003,
address: "127.0.0.1",
protocol: "MySQLBackend"
protocol: "MariaDBBackend"
}
}
}
@ -71,11 +71,11 @@ describe("Server Relationships", function() {
it("add relationships with `relationships` endpoint", function() {
return request.patch(base_url + "/servers/" + rel_server.data.id + "/relationships/monitors",
{ json: { data: [ { "id": "MySQL-Monitor", "type": "monitors" }]}})
{ json: { data: [ { "id": "MariaDB-Monitor", "type": "monitors" }]}})
.then(() => request.get(base_url + "/servers/" + rel_server.data.id, {json: true}))
.then((res) => {
res.data.relationships.monitors.data.should.have.lengthOf(1)
.that.has.deep.include({ "id": "MySQL-Monitor", "type": "monitors" })
.that.has.deep.include({ "id": "MariaDB-Monitor", "type": "monitors" })
})
});

2
server/core/test/rest-api/test/service.js
View File

@ -98,7 +98,7 @@ describe("Service", function() {
"attributes": {
"parameters": {
"port": 4012,
"protocol": "MySQLClient",
"protocol": "MariaDBClient",
"authenticator": "MySQLAuth",
"address": "127.0.0.1"
}