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

MXS-1220: Unify resource member naming

Browse Source 
All resoures now use the `state` member to describe their internal
state. This includes servers, services and monitors. This means that the
`status` keyword can be reserved for something else and it can be removed
until it is needed again.

Changed the module maturity field to `maturity` to better describe its
purpose.
This commit is contained in:
Markus Mäkelä
2017-06-30 16:56:49 +03:00
parent a8bfdac49c
commit c7b9b7ac4a
13 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ describe("Server Relationships", function() {
after(stopMaxScale)
});
describe("Server Status", function() {
describe("Server State", function() {
before(startMaxScale)
it("create new server", function() {
@ -90,34 +90,34 @@ describe("Server Status", function() {
});
it("set server into maintenance", function() {
return request.put(base_url + "/servers/" + server.data.id + "/set?status=maintenance")
return request.put(base_url + "/servers/" + server.data.id + "/set?state=maintenance")
.then(function(resp) {
return request.get(base_url + "/servers/" + server.data.id)
})
.then(function(resp) {
var srv = JSON.parse(resp)
srv.data.attributes.status.should.match(/Maintenance/)
srv.data.attributes.state.should.match(/Maintenance/)
})
});
it("clear maintenance", function() {
return request.put(base_url + "/servers/" + server.data.id + "/clear?status=maintenance")
return request.put(base_url + "/servers/" + server.data.id + "/clear?state=maintenance")
.then(function(resp) {
return request.get(base_url + "/servers/" + server.data.id)
})
.then(function(resp) {
var srv = JSON.parse(resp)
srv.data.attributes.status.should.not.match(/Maintenance/)
srv.data.attributes.state.should.not.match(/Maintenance/)
})
});
it("set invalid status value", function() {
return request.put(base_url + "/servers/" + server.data.id + "/set?status=somethingstrange")
it("set invalid state value", function() {
return request.put(base_url + "/servers/" + server.data.id + "/set?state=somethingstrange")
.should.be.rejected
});
it("clear invalid status value", function() {
return request.put(base_url + "/servers/" + server.data.id + "/clear?status=somethingstrange")
it("clear invalid state value", function() {
return request.put(base_url + "/servers/" + server.data.id + "/clear?state=somethingstrange")
.should.be.rejected
});