Merge lp:~hatch/juju-gui/default-bundle-unit into lp:juju-gui/experimental

[Jeff Pihach]

Handle unit numbers properly with subordinates

https://codereview.appspot.com/20040043/

[Jeff Pihach (hatch)]

Reviewers: mp+193341_code.launchpad.net,

Message:
Please take a look.

Description:
Handle unit numbers properly with subordinates

https://code.launchpad.net/~hatch/juju-gui/default-bundle-unit/+merge/193341

(do not edit description out of merge proposal)

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

Affected files (+17, -2 lines):
   A [revision details]
   M app/store/env/fakebackend.js
   M test/test_fakebackend.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: test/test_fakebackend.js
=== modified file 'test/test_fakebackend.js'
--- test/test_fakebackend.js 2013-10-23 05:23:16 +0000
+++ test/test_fakebackend.js 2013-10-30 21:58:08 +0000
@@ -1102,6 +1102,13 @@
        assert.equal(result.machines[0].agent_state, 'running');
      });

+ it('deploys subordinates without adding units', function() {
+ fakebackend.deploy('cs:precise/puppet-5', callback);
+ assert.equal(deployResult.service.get('name'), 'puppet');
+ assert.equal(deployResult.units.length, 0);
+ assert.equal(deployResult.service.get('units').size(), 0);
+ });
+
      it('adds multiple units', function() {
        fakebackend.deploy('cs:precise/wordpress-15', callback);
        assert.isUndefined(deployResult.error);

Index: app/store/env/fakebackend.js
=== modified file 'app/store/env/fakebackend.js'
--- app/store/env/fakebackend.js 2013-10-23 05:17:56 +0000
+++ app/store/env/fakebackend.js 2013-10-30 21:58:08 +0000
@@ -444,7 +444,13 @@
          })()
        });
        this.changes.services[service.get('id')] = [service, true];
- var response = this.addUnit(options.name, options.unitCount);
+
+ var unitCount = options.unitCount;
+ if (!Y.Lang.isValue(unitCount) && !charm.get('is_subordinate')) {
+ // This is the current behavior in both implementations.
+ unitCount = 1;
+ }
+ var response = this.addUnit(options.name, unitCount);
        response.service = service;
        callback(response);
      },
@@ -1495,7 +1501,7 @@
          // Map the argument name from the deployer format
          // name for unit count.
          if (!serviceData.unitCount) {
- serviceData.unitCount = serviceData.num_units || 1;
+ serviceData.unitCount = serviceData.num_units;
          }
          if (serviceData.options) {
            serviceData.config = serviceData.options;

[Gary Poster (gary)]

LGTM. :-) thank you

https://codereview.appspot.com/20040043/

[Jeff Pihach (hatch)]

*** Submitted:

Handle unit numbers properly with subordinates

R=gary.poster
CC=
https://codereview.appspot.com/20040043

https://codereview.appspot.com/20040043/

=== modified file 'app/store/env/fakebackend.js'
--- app/store/env/fakebackend.js	2013-10-23 05:17:56 +0000
+++ app/store/env/fakebackend.js	2013-10-30 22:04:36 +0000
@@ -444,7 +444,13 @@
         })()
       });
       this.changes.services[service.get('id')] = [service, true];
-      var response = this.addUnit(options.name, options.unitCount);
+
+      var unitCount = options.unitCount;
+      if (!Y.Lang.isValue(unitCount) && !charm.get('is_subordinate')) {
+        // This is the current behavior in both implementations.
+        unitCount = 1;
+      }
+      var response = this.addUnit(options.name, unitCount);
       response.service = service;
       callback(response);
     },
@@ -1495,7 +1501,7 @@
         // Map the argument name from the deployer format
         // name for unit count.
         if (!serviceData.unitCount) {
-          serviceData.unitCount = serviceData.num_units || 1;
+          serviceData.unitCount = serviceData.num_units;
         }
         if (serviceData.options) {
           serviceData.config = serviceData.options;

=== modified file 'test/test_fakebackend.js'
--- test/test_fakebackend.js	2013-10-23 05:23:16 +0000
+++ test/test_fakebackend.js	2013-10-30 22:04:36 +0000
@@ -1102,6 +1102,13 @@
       assert.equal(result.machines[0].agent_state, 'running');
     });
 
+    it('deploys subordinates without adding units', function() {
+      fakebackend.deploy('cs:precise/puppet-5', callback);
+      assert.equal(deployResult.service.get('name'), 'puppet');
+      assert.equal(deployResult.units.length, 0);
+      assert.equal(deployResult.service.get('units').size(), 0);
+    });
+
     it('adds multiple units', function() {
       fakebackend.deploy('cs:precise/wordpress-15', callback);
       assert.isUndefined(deployResult.error);