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

MXS-1300: Fix monitor and listener creation

Browse Source 
The creation commands for monitors and listeners referred to undefined
variables. Also fixed the test case names being duplicated.
This commit is contained in:
Markus Mäkelä
2017-07-18 21:18:37 +03:00
parent 2411288388
commit fa6bea33fe
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
maxctrl/maxctrl_core/lib/create.js
View File

@ -95,7 +95,7 @@ exports.builder = function(yargs) {
if (argv.servers) { if (argv.servers) {
for (i = 0; i < argv.servers.length; i++) { for (i = 0; i < argv.servers.length; i++) {
_.set(server, 'data.relationships.servers.data[' + i + ']', {id: argv.monitors[i], type: 'servers'}) _.set(monitor, 'data.relationships.servers.data[' + i + ']', {id: argv.servers[i], type: 'servers'})
} }
} }
@ -155,12 +155,6 @@ exports.builder = function(yargs) {
} }
} }
if (argv.servers) {
for (i = 0; i < argv.servers.length; i++) {
_.set(server, 'data.relationships.servers.data[' + i + ']', {id: argv.monitors[i], type: 'servers'})
}
}
maxctrl(argv, function(host) { maxctrl(argv, function(host) {
return doRequest(host, 'services/' + argv.service + '/listeners', null, {method: 'POST', body: listener}) return doRequest(host, 'services/' + argv.service + '/listeners', null, {method: 'POST', body: listener})
}) })

2
maxctrl/package.json
View File

@ -5,7 +5,7 @@
"repository": "https://github.com/mariadb-corporation/MaxScale", "repository": "https://github.com/mariadb-corporation/MaxScale",
"main": "maxctrl.js", "main": "maxctrl.js",
"scripts": { "scripts": {
"test": "mocha --timeout 30000 --slow 10000" "test": "mocha --timeout 15000 --slow 10000"
}, },
"keywords": [ "keywords": [
"maxscale" "maxscale"

22
maxctrl/test/server.js
View File

@ -1,6 +1,6 @@
require('../test_utils.js')() require('../test_utils.js')()
describe("Server states", function() { describe("Server Commands", function() {
before(startMaxScale) before(startMaxScale)
var ctrl = require('maxctrl-core') var ctrl = require('maxctrl-core')
@ -29,16 +29,6 @@ describe("Server states", function() {
.should.be.fulfilled .should.be.fulfilled
}) })
it('create server with options', function() {
return ctrl.execute('create server server5 127.0.0.1 3003 --authenticator GSSAPIBackendAuth'.split(' '), opts)
.then(function() {
return request.get(host + 'servers/server5', {json: true})
})
.then(function(res) {
res.data.attributes.parameters.authenticator.should.equal("GSSAPIBackendAuth")
})
})
it('create server with bad parameters', function() { it('create server with bad parameters', function() {
return ctrl.execute('create server server5 bad parameter'.split(' '), opts) return ctrl.execute('create server server5 bad parameter'.split(' '), opts)
.should.be.rejected .should.be.rejected
@ -49,6 +39,16 @@ describe("Server states", function() {
.should.be.rejected .should.be.rejected
}) })
it('create server with options', function() {
return ctrl.execute('create server server5 127.0.0.1 3003 --authenticator GSSAPIBackendAuth'.split(' '), opts)
.then(function() {
return request.get(host + 'servers/server5', {json: true})
})
.then(function(res) {
res.data.attributes.parameters.authenticator.should.equal("GSSAPIBackendAuth")
})
})
it('alter server with bad parameters', function() { it('alter server with bad parameters', function() {
return ctrl.execute('alter server server1 port not-a-port'.split(' '), opts) return ctrl.execute('alter server server1 port not-a-port'.split(' '), opts)
.should.be.rejected .should.be.rejected

2
maxctrl/test/service.js
View File

@ -1,6 +1,6 @@
require('../test_utils.js')() require('../test_utils.js')()
describe("Server states", function() { describe("Service Commands", function() {
before(startMaxScale) before(startMaxScale)
var ctrl = require('maxctrl-core') var ctrl = require('maxctrl-core')