Merge lp:~frankban/juju-gui/bug-1168308-add-unit into lp:juju-gui/experimental

[Francesco Banconi]

Implement add_unit in GoEnvironment.

https://codereview.appspot.com/8706043/

[Francesco Banconi (frankban)]

Reviewers: mp+158573_code.launchpad.net,

Message:
Please take a look.

Description:
Implement add_unit in GoEnvironment.

https://code.launchpad.net/~frankban/juju-gui/bug-1168308-add-unit/+merge/158573

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8706043/

Affected files:
   A [revision details]
   M app/store/env/go.js
   M test/test_env_go.js

[Gary Poster (gary)]

LGTM. Thank you for doing this, and especially for finding the need.

https://codereview.appspot.com/8706043/diff/1/app/store/env/go.js
File app/store/env/go.js (right):

https://codereview.appspot.com/8706043/diff/1/app/store/env/go.js#newcode403
app/store/env/go.js:403: * @method handleAddUnit
Trivial: add @static? <shrug>

https://codereview.appspot.com/8706043/

[lp:~frankban/juju-gui/bug-1168308-add-unit]

543. By Francesco Banconi on 2013-04-12

Changes as per review.

544. By Francesco Banconi on 2013-04-12

Merged trunk.

[Francesco Banconi (frankban)]

*** Submitted:

Implement add_unit in GoEnvironment.

R=gary.poster, benji
CC=
https://codereview.appspot.com/8706043

https://codereview.appspot.com/8706043/diff/1/app/store/env/go.js
File app/store/env/go.js (right):

https://codereview.appspot.com/8706043/diff/1/app/store/env/go.js#newcode403
app/store/env/go.js:403: * @method handleAddUnit
On 2013/04/12 12:13:26, gary.poster wrote:
> Trivial: add @static? <shrug>

Done.

https://codereview.appspot.com/8706043/

[Francesco Banconi (frankban)]

Hi Gary and Benji, thanks for the reviews.

https://codereview.appspot.com/8706043/

=== modified file 'app/store/env/go.js'
--- app/store/env/go.js	2013-04-10 15:08:53 +0000
+++ app/store/env/go.js	2013-04-12 14:38:41 +0000
@@ -368,6 +368,65 @@
     },
 
     /**
+     * Add units to the provided service.
+     *
+     * @method add_unit
+     * @param {String} service The service to be scaled up.
+     * @param {Integer} numUnits The number of units to be added.
+     * @param {Function} callback A callable that must be called once the
+     *  operation is performed. It will receive an object with an "err"
+     *  attribute containing a string describing the problem (if an error
+     *  occurred), or with the following attributes if everything went well:
+     *    - service_name: the name of the service;
+     *    - num_units: the number of units added;
+     *    - result: a list containing the names of the added units.
+     * @return {undefined} Sends a message to the server only.
+     */
+    add_unit: function(service, numUnits, callback) {
+      var intermediateCallback;
+      if (callback) {
+        // Curry the callback, service and numUnits.  No context is passed.
+        intermediateCallback = Y.bind(this.handleAddUnit, null,
+            callback, service, numUnits);
+      }
+      this._send_rpc({
+        Type: 'Client',
+        Request: 'AddServiceUnits',
+        Params: {ServiceName: service, NumUnits: numUnits}
+      }, intermediateCallback);
+    },
+
+    /**
+     * Transform the data returned from the juju-core add_unit call into that
+     * suitable for the user callback.
+     *
+     * @method handleAddUnit
+     * @static
+     * @param {Function} userCallback The callback originally submitted by the
+     * call site.
+     * @param {String} service The name of the service.  Passed in since it
+     * is not part of the response.
+     * @param {Integer} numUnits The number of added units.
+     * @param {Object} data The response returned by the server.
+     * @return {undefined} Nothing.
+     */
+    handleAddUnit: function(userCallback, service, numUnits, data) {
+      var transformedData = {
+        err: data.Error,
+        service_name: service
+      };
+      if (data.Error) {
+        transformedData.num_units = numUnits;
+      } else {
+        var units = data.Response.Units;
+        transformedData.result = units;
+        transformedData.num_units = units.length;
+      }
+      // Call the original user callback.
+      userCallback(transformedData);
+    },
+
+    /**
      * Expose the given service.
      *
      * @method expose

=== modified file 'test/test_env_go.js'
--- test/test_env_go.js	2013-04-10 15:08:53 +0000
+++ test/test_env_go.js	2013-04-12 14:38:41 +0000
@@ -206,6 +206,47 @@
       assert.equal('envname', env.get('environmentName'));
     });
 
+    it('sends the correct AddServiceUnits message', function() {
+      env.add_unit('django', 3);
+      var last_message = conn.last_message();
+      var expected = {
+        Type: 'Client',
+        Request: 'AddServiceUnits',
+        RequestId: 1,
+        Params: {ServiceName: 'django', NumUnits: 3}
+      };
+      assert.deepEqual(expected, last_message);
+    });
+
+    it('successfully adds units to a service', function(done) {
+      env.add_unit('django', 2, function(data) {
+        assert.strictEqual('django', data.service_name);
+        assert.strictEqual(2, data.num_units);
+        assert.deepEqual(['django/2', 'django/3'], data.result);
+        assert.isUndefined(data.err);
+        done();
+      });
+      // Mimic response.
+      conn.msg({
+        RequestId: 1,
+        Response: {Units: ['django/2', 'django/3']}
+      });
+    });
+
+    it('handles failures adding units to a service', function(done) {
+      env.add_unit('django', 0, function(data) {
+        assert.strictEqual('django', data.service_name);
+        assert.strictEqual(0, data.num_units);
+        assert.strictEqual('must add at least one unit', data.err);
+        done();
+      });
+      // Mimic response.
+      conn.msg({
+        RequestId: 1,
+        Error: 'must add at least one unit'
+      });
+    });
+
     it('sends the correct expose message', function() {
       env.expose('apache');
       var last_message = conn.last_message();