From fa6bea33fef4ec0db7936fcd03774b670e19c328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 18 Jul 2017 21:18:37 +0300
Subject: [PATCH] MXS-1300: Fix monitor and listener creation

The creation commands for monitors and listeners referred to undefined
variables. Also fixed the test case names being duplicated.
---
 maxctrl/maxctrl_core/lib/create.js |  8 +-------
 maxctrl/package.json               |  2 +-
 maxctrl/test/server.js             | 22 +++++++++++-----------
 maxctrl/test/service.js            |  2 +-
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/maxctrl/maxctrl_core/lib/create.js b/maxctrl/maxctrl_core/lib/create.js
index fd1247604..40a8d3064 100644
--- a/maxctrl/maxctrl_core/lib/create.js
+++ b/maxctrl/maxctrl_core/lib/create.js
@@ -95,7 +95,7 @@ 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'})
+                    _.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) {
                 return doRequest(host, 'services/' + argv.service + '/listeners', null, {method: 'POST', body: listener})
             })
diff --git a/maxctrl/package.json b/maxctrl/package.json
index 6dbae0ee0..f111d7781 100644
--- a/maxctrl/package.json
+++ b/maxctrl/package.json
@@ -5,7 +5,7 @@
   "repository": "https://github.com/mariadb-corporation/MaxScale",
   "main": "maxctrl.js",
   "scripts": {
-    "test": "mocha --timeout 30000 --slow 10000"
+    "test": "mocha --timeout 15000 --slow 10000"
   },
   "keywords": [
     "maxscale"
diff --git a/maxctrl/test/server.js b/maxctrl/test/server.js
index d823e2694..4e1507a90 100644
--- a/maxctrl/test/server.js
+++ b/maxctrl/test/server.js
@@ -1,6 +1,6 @@
 require('../test_utils.js')()
 
-describe("Server states", function() {
+describe("Server Commands", function() {
     before(startMaxScale)
 
     var ctrl = require('maxctrl-core')
@@ -29,16 +29,6 @@ describe("Server states", function() {
             .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() {
         return ctrl.execute('create server server5 bad parameter'.split(' '), opts)
             .should.be.rejected
@@ -49,6 +39,16 @@ describe("Server states", function() {
             .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() {
         return ctrl.execute('alter server server1 port not-a-port'.split(' '), opts)
             .should.be.rejected
diff --git a/maxctrl/test/service.js b/maxctrl/test/service.js
index c9c9b752d..3b86e17c6 100644
--- a/maxctrl/test/service.js
+++ b/maxctrl/test/service.js
@@ -1,6 +1,6 @@
 require('../test_utils.js')()
 
-describe("Server states", function() {
+describe("Service Commands", function() {
     before(startMaxScale)
 
     var ctrl = require('maxctrl-core')