Merge lp:~gary/juju-gui/fakebackend-1 into lp:juju-gui/experimental

[Gary Poster]

First components of in-memory juju environment

This branch adds the first part of an in-memory juju environment. Next steps include machine generation to addUnit, adding configFile support to deploy (js-yaml has made some big strides), adding code that can report changes (for the delta stream/watcher protocols), writing a first cut of the Python wire protocol, and writing a first cut of the Go protocol. After that we should be able to just add in remaining commands.

This was driven by a prototype by Kapil, and with Benji's help.

https://codereview.appspot.com/7641051/

[Gary Poster (gary)]

Reviewers: mp+152696_code.launchpad.net,

Message:
Please take a look.

Description:
First components of in-memory juju environment

This branch adds the first part of an in-memory juju environment. Next
steps include machine generation to addUnit, adding configFile support
to deploy (js-yaml has made some big strides), adding code that can
report changes (for the delta stream/watcher protocols), writing a first
cut of the Python wire protocol, and writing a first cut of the Go
protocol. After that we should be able to just add in remaining
commands.

This was driven by a prototype by Kapil, and with Benji's help.

https://code.launchpad.net/~gary/juju-gui/fakebackend-1/+merge/152696

(do not edit description out of merge proposal)

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

Affected files:
   A .lbox
   A [revision details]
   M app/models/charm.js
   M app/modules-debug.js
   A app/store/env/fakebackend.js
   A test/data/wordpress-charmdata.json
   M test/index.html
   A test/test_fakebackend.js
   M test/test_service_view.js

[Benjamin Saller (bcsaller)]

LGTM

I don't love the name 'fakebackend', juju-improv or juju-memory-env or
something make read better, but its really up to you.

The env is simple to follow and a nicely captures the rules around these
first juju interactions. Given that you started with the most involved
call (I think) it should be easy to get the rest working.

Thanks

https://codereview.appspot.com/7641051/diff/1/app/models/charm.js
File app/models/charm.js (right):

https://codereview.appspot.com/7641051/diff/1/app/models/charm.js#newcode45
app/models/charm.js:45: };
Nice cleanup

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

https://codereview.appspot.com/7641051/diff/1/app/store/env/fakebackend.js#newcode42
app/store/env/fakebackend.js:42: this.db = new models.Database();
It took some thinking to convince me that we don't want to be able to
inject the database from outside, but I think I've come around now.

https://codereview.appspot.com/7641051/diff/1/test/test_fakebackend.js
File test/test_fakebackend.js (right):

https://codereview.appspot.com/7641051/diff/1/test/test_fakebackend.js#newcode42
test/test_fakebackend.js:42: 'data/' + name + '-charmdata.json', {sync:
true}).responseText });
There is a method for this in test endpoints that should most likely be
migrated to test/utils. loadFixture.

   function loadFixture(url) {
         return Y.JSON.parse(Y.io(url, {sync: true}).responseText);
       }
       sample_env = loadFixture('data/large_stream.json');
       sample_endpoints = loadFixture('data/large_endpoints.json');

I think its better to reuse this even if its a line or two.

https://codereview.appspot.com/7641051/

[Madison Scott-Clary (makyo)]

LGTM

Thanks for this, really good addition.

https://codereview.appspot.com/7641051/

[Gary Poster (gary)]

On 2013/03/11 16:05:18, bcsaller wrote:
> LGTM

> I don't love the name 'fakebackend', juju-improv or juju-memory-env or
something
> make read better, but its really up to you.

I agree that it is not fantastic, but I felt "fakebackend" conveyed the
intent better than these or other options I came up with.

My thought is that we can go back and revise this later if desired. If
you made the argument that "memory-env" or similar gave people a better
idea of intended usage then I'd be happy to come around behind and
change it. ("improv" has never conveyed the right meaning to me, tbh.
PlaygroundEnv? SandboxEnv?)

Argue passionately for a name and I'll make a separate branch with the
change. :-)

> The env is simple to follow and a nicely captures the rules around
these first
> juju interactions. Given that you started with the most involved call
(I think)
> it should be easy to get the rest working.

> Thanks

> https://codereview.appspot.com/7641051/diff/1/app/models/charm.js
> File app/models/charm.js (right):

https://codereview.appspot.com/7641051/diff/1/app/models/charm.js#newcode45
> app/models/charm.js:45: };
> Nice cleanup

Thanks.

https://codereview.appspot.com/7641051/diff/1/app/store/env/fakebackend.js
> File app/store/env/fakebackend.js (right):

https://codereview.appspot.com/7641051/diff/1/app/store/env/fakebackend.js#newcode42
> app/store/env/fakebackend.js:42: this.db = new models.Database();
> It took some thinking to convince me that we don't want to be able to
inject the
> database from outside, but I think I've come around now.

Cool.

https://codereview.appspot.com/7641051/diff/1/test/test_fakebackend.js
> File test/test_fakebackend.js (right):

https://codereview.appspot.com/7641051/diff/1/test/test_fakebackend.js#newcode42
> test/test_fakebackend.js:42: 'data/' + name + '-charmdata.json',
{sync:
> true}).responseText });
> There is a method for this in test endpoints that should most likely
be migrated
> to test/utils. loadFixture.

> function loadFixture(url) {
> return Y.JSON.parse(Y.io(url, {sync: true}).responseText);
> }
> sample_env = loadFixture('data/large_stream.json');
> sample_endpoints = loadFixture('data/large_endpoints.json');

> I think its better to reuse this even if its a line or two.

Yes, I looked at that. The reason why I didn't reuse it was that I was
really only reusing the Y.io sync call: you parse JSON and pull the
responseText out, and I actually need the full responseText string,
because that's what the charm store expects. That said, as I was
considering your suggestion, I realized that I could simplify. If you
look at my new branch, you should see a smaller function that more
clearly shows the differences.

Thank you, to both you and Matt!

Gary

https://codereview.appspot.com/7641051/

[Gary Poster (gary)]

*** Submitted:

First components of in-memory juju environment

This branch adds the first part of an in-memory juju environment. Next
steps include machine generation to addUnit, adding configFile support
to deploy (js-yaml has made some big strides), adding code that can
report changes (for the delta stream/watcher protocols), writing a first
cut of the Python wire protocol, and writing a first cut of the Go
protocol. After that we should be able to just add in remaining
commands.

This was driven by a prototype by Kapil, and with Benji's help.

R=bcsaller, matthew.scott
CC=
https://codereview.appspot.com/7641051

https://codereview.appspot.com/7641051/

=== added file '.lbox'
--- .lbox	1970-01-01 00:00:00 +0000
+++ .lbox	2013-03-11 15:03:24 +0000
@@ -0,0 +1,1 @@
+propose -cr -for lp:juju-gui

=== modified file 'app/models/charm.js'
--- app/models/charm.js	2013-02-08 17:36:58 +0000
+++ app/models/charm.js	2013-03-11 15:03:24 +0000
@@ -12,6 +12,37 @@
   var models = Y.namespace('juju.models');
   var charmIdRe = /^(?:(\w+):)?(?:~(\S+)\/)?(\w+)\/(\S+?)-(\d+)$/;
   var idElements = ['scheme', 'owner', 'series', 'package_name', 'revision'];
+  var simpleCharmIdRe = /^(?:(\w+):)?(?!:~)(\w+)$/;
+  var simpleIdElements = ['scheme', 'package_name'];
+  var parseCharmId = models.parseCharmId = function(charmId, defaultSeries) {
+    if (Y.Lang.isString(charmId)) {
+      var parts = charmIdRe.exec(charmId);
+      var pairs;
+      if (parts) {
+        parts.shift(); // Get rid of the first, full string.
+        pairs = Y.Array.zip(idElements, parts);
+      } else if (defaultSeries) {
+        parts = simpleCharmIdRe.exec(charmId);
+        if (parts) {
+          parts.shift(); // Get rid of the first, full string.
+          pairs = Y.Array.zip(simpleIdElements, parts);
+          pairs.push(['series', defaultSeries]);
+        }
+      }
+      if (parts) {
+        var result = {};
+        Y.Array.map(pairs, function(pair) { result[pair[0]] = pair[1]; });
+        result.charm_store_path = [
+          (result.owner ? '~' + result.owner : 'charms'),
+          result.series,
+          result.package_name + (
+              result.revision ? '-' + result.revision : ''),
+          'json'
+        ].join('/');
+        return result;
+      }
+    }
+  };
 
   /**
    * Charms, once instantiated and loaded with data from their respective
@@ -49,32 +80,23 @@
 
     initializer: function() {
       var id = this.get('id'),
-              parts = id && charmIdRe.exec(id),
+              parts = parseCharmId(id),
               self = this;
-      if (!Y.Lang.isValue(id) || !parts) {
+      if (!parts) {
         throw 'Developers must initialize charms with a well-formed id.';
       }
       this.loaded = false;
       this.on('load', function() { this.loaded = true; });
-      parts.shift();
-      Y.each(
-          Y.Array.zip(idElements, parts),
-          function(pair) { self.set(pair[0], pair[1]); });
+      Y.Object.each(
+          parts,
+          function(value, key) { self.set(key, value); });
       // full_name
       var tmp = [this.get('series'), this.get('package_name')],
-              owner = this.get('owner');
+          owner = this.get('owner');
       if (owner) {
         tmp.unshift('~' + owner);
       }
       this.set('full_name', tmp.join('/'));
-      // charm_store_path
-      this.set(
-          'charm_store_path',
-          [(owner ? '~' + owner : 'charms'),
-           this.get('series'),
-           (this.get('package_name') + '-' + this.get('revision')),
-           'json'
-          ].join('/'));
     },
 
     sync: function(action, options, callback) {
@@ -120,8 +142,8 @@
       data.is_subordinate = data.subordinate;
       Y.each(data, function(value, key) {
         if (!value ||
-                !self.attrAdded(key) ||
-                Y.Lang.isValue(self.get(key))) {
+            !self.attrAdded(key) ||
+            Y.Lang.isValue(self.get(key))) {
           delete data[key];
         }
       });

=== modified file 'app/modules-debug.js'
--- app/modules-debug.js	2013-03-08 20:55:42 +0000
+++ app/modules-debug.js	2013-03-11 15:03:24 +0000
@@ -189,6 +189,10 @@
           fullpath: '/juju-ui/store/env/python.js'
         },
 
+        'juju-env-fakebackend': {
+          fullpath: '/juju-ui/store/env/fakebackend.js'
+        },
+
         'juju-notification-controller': {
           fullpath: '/juju-ui/store/notifications.js'
         },

=== added file 'app/store/env/fakebackend.js'
--- app/store/env/fakebackend.js	1970-01-01 00:00:00 +0000
+++ app/store/env/fakebackend.js	2013-03-11 15:03:24 +0000
@@ -0,0 +1,336 @@
+'use strict';
+
+/**
+ * An in-memory fake Juju backend and supporting elements.
+ *
+ * @module env
+ * @submodule env.fakebackend
+ */
+
+YUI.add('juju-env-fakebackend', function(Y) {
+
+  var models = Y.namespace('juju.models');
+  var UNAUTHENTICATEDERROR = {error: 'Please log in.'};
+  /**
+   * An in-memory fake Juju backend.
+   *
+   * @class FakeBackend
+   */
+  function FakeBackend(config) {
+    // Invoke Base constructor, passing through arguments.
+    FakeBackend.superclass.constructor.apply(this, arguments);
+  }
+
+  FakeBackend.NAME = 'fake-backend';
+  FakeBackend.ATTRS = {
+    authorizedUsers: {value: {'admin': 'password'}},
+    authenticated: {value: false},
+    charmStore: {}, // Required.
+    defaultSeries: {value: 'precise'},
+    providerType: {value: 'demonstration'}
+  };
+
+  Y.extend(FakeBackend, Y.Base, {
+
+    /**
+      Initializes.
+
+      @method initializer
+      @return {undefined} Nothing.
+     */
+    initializer: function() {
+      this.db = new models.Database();
+    },
+
+    /**
+      Attempt to log a user in.
+
+      @method login
+      @param {String} username The id of the user.
+      @param {String} submittedPassword The user-submitted password.
+      @return {Bool} True if the authentication was successful.
+     */
+    login: function(username, submittedPassword) {
+      var password = this.get('authorizedUsers')[username],
+          authenticated = password === submittedPassword;
+      this.set('authenticated', authenticated);
+      return authenticated;
+    },
+
+    /**
+      Log out.  If already logged out, no error is raised.
+     */
+    logout: function() {
+      this.set('authenticated', false);
+    },
+
+    /**
+      Deploy a charm.  Uses a callback for response!
+
+      @method deploy
+      @param {String} charmUrl The URL of the charm.
+      @param {Function} callback A call that will receive an object either
+        with an "error" attribute containing a string describing the problem,
+        or with a "service" attribute containing the new service, a "charm"
+        attribute containing the charm used, and a "units" attribute
+        containing a list of the added units.  This is asynchronous because we
+        often must go over the network to the charm store.
+      @param {Object} options An options object.
+        name: The name of the service to be deployed, defaulting to the charm
+          name.
+        config: The charm configuration options, defaulting to none.
+        unitCount: The number of units to be deployed.
+      @return {undefined} Get the result from the callback.
+     */
+    deploy: function(charmId, callback, options) {
+      if (!this.get('authenticated')) {
+        return callback(UNAUTHENTICATEDERROR);
+      }
+      if (!options) {
+        options = {};
+      }
+      var self = this;
+      this._loadCharm(
+          charmId,
+          {
+            /**
+              Deploy the successfully-obtained charm.
+             */
+            success: function(charm) {
+              self._deployFromCharm(charm, callback, options);
+            },
+            failure: callback
+          }
+      );
+    },
+
+    /**
+      Get a charm from a URL, via charmStore and/or db.  Uses callbacks.
+
+      @method _loadCharm
+      @param {String} charmUrl The URL of the charm.
+      @param {Function} callbacks An optional object with optional success and
+        failure callables.  This is asynchronous because we
+        often must go over the network to the charm store.  The success
+        callable receives the fully loaded charm, and the failure callable
+        receives an object with an explanatory "error" attribute.
+      @return {undefined} Use the callbacks to handle success or failure.
+     */
+    _loadCharm: function(charmId, callbacks) {
+      var charmIdParts = models.parseCharmId(
+          charmId, this.get('defaultSeries'));
+      if (!callbacks) {
+        callbacks = {};
+      }
+      if (!charmIdParts) {
+        return (
+            callbacks.failure &&
+            callbacks.failure({error: 'Invalid charm id.'}));
+      }
+      var charm = this.db.charms.getById(charmId);
+      if (charm) {
+        callbacks.success(charm);
+      } else {
+        // Get the charm data.
+        var self = this;
+        this.get('charmStore').loadByPath(
+            charmIdParts.charm_store_path,
+            {
+              /**
+                Convert the charm data to a charm and use the success callback.
+               */
+              success: function(data) {
+                var charm = self._getCharmFromData(data);
+                if (callbacks.success) {
+                  callbacks.success(charm);
+                }
+              },
+              /**
+                Inform the caller of an error using the charm store.
+               */
+              failure: function(e) {
+                if (callbacks.failure) {
+                  callbacks.failure({error: 'Could not contact charm store.'});
+                }
+              }
+            }
+        );
+      }
+
+    },
+
+    /**
+      Convert charm data as returned by the charmStore into a charm.
+      The charm might be pre-existing or might need to be created, but
+      after this method it will be within the db.
+
+      @method _getCharmFromData
+      @param {Object} data The raw charm information as delivered by the
+        charmStore's loadByPath method.
+      @return {Object} A matching charm from the db.
+     */
+    _getCharmFromData: function(data) {
+      var charm = this.db.charms.getById(data.store_url);
+      if (!charm) {
+        delete data.store_revision;
+        delete data.bzr_branch;
+        delete data.last_change;
+        data.id = data.store_url;
+        charm = this.db.charms.add(data);
+      }
+      return charm;
+    },
+
+    /**
+      Deploy a charm, given the charm, a callback, and options.
+
+      @param {Object} charm The charm to be deployed, from the db.
+      @param {Function} callback A call that will receive an object either
+        with an "error" attribute containing a string describing the problem,
+        or with a "service" attribute containing the new service, a "charm"
+        attribute containing the charm used, and a "units" attribute
+        containing a list of the added units.  This is asynchronous because we
+        often must go over the network to the charm store.
+      @param {Object} options An options object.
+        name: The name of the service to be deployed, defaulting to the charm
+          name.
+        config: The charm configuration options, defaulting to none.
+        unitCount: The number of units to be deployed.
+      @return {undefined} Get the result from the callback.
+     */
+    _deployFromCharm: function(charm, callback, options) {
+      if (!options.name) {
+        options.name = charm.get('package_name');
+      }
+      if (this.db.services.getById(options.name)) {
+        return callback({error: 'A service with this name already exists.'});
+      }
+      var service = this.db.services.add({
+        id: options.name,
+        name: options.name,
+        charm: charm.get('id'),
+        exposed: false,
+        subordinate: charm.get('is_subordinate'),
+        config: options.config
+      });
+      var response = this.addUnit(options.name, options.unitCount);
+      response.service = service;
+      callback(response);
+    },
+
+    // destroyService: function() {
+
+    // },
+
+    // getService: function() {
+
+    // },
+
+    // getCharm: function() {
+
+    // },
+
+    /**
+      Add units to the given service.
+
+      @method addUnit
+      @param {String} serviceName The name of the service to be scaled up.
+      @param {Integer} numUnits The number of units to be added, defaulting
+        to 1.
+      @return {Object} Returns an object either with an "error" attribute
+        containing a string describing the problem, or with a "units"
+        attribute containing a list of the added units.
+     */
+    addUnit: function(serviceName, numUnits) {
+      if (!this.get('authenticated')) {
+        return UNAUTHENTICATEDERROR;
+      }
+      if (Y.Lang.isUndefined(numUnits)) {
+        numUnits = 1;
+      }
+      if (!Y.Lang.isNumber(numUnits) || numUnits < 1) {
+        return {error: 'Invalid number of units.'};
+      }
+      var service = this.db.services.getById(serviceName);
+      if (!service) {
+        return {error: 'Service "' + serviceName + '" does not exist.'};
+      }
+      if (!service.unitSequence) {
+        service.unitSequence = 0;
+      }
+      var result = [];
+      // var unitMachines = this._getUnitMachines(numUnits);
+
+      for (var i = 0; i < numUnits; i += 1) {
+        var unitId = service.unitSequence += 1;
+        result.push(
+            this.db.units.add({
+              'id': serviceName + '/' + unitId,
+              //'machine': unit_machines.shift(),
+              // The models use underlines, not hyphens (see
+              // app/models/models.js in _process_delta.)
+              'agent_state': 'started'
+            })
+        );
+      }
+      return {units: result};
+    } // ,
+
+    // removeUnit: function() {
+
+    // },
+
+    // getEndpoints: function() {
+
+    // },
+
+    // updateAnnotations: function() {
+
+    // },
+
+    // getAnnotations: function() {
+
+    // },
+
+    // removeAnnotations: function() {
+
+    // },
+
+    // addRelation: function() {
+
+    // },
+
+    // removeRelation: function() {
+
+    // },
+
+    // expose: function() {
+
+    // },
+
+    // unexpose: function() {
+
+    // },
+
+    // setConfig: function() {
+
+    // },
+
+    // setConstraints: function() {
+
+    // },
+
+    // resolved: function() {
+
+    // }
+
+  });
+
+  Y.namespace('juju.environments').FakeBackend = FakeBackend;
+
+}, '0.1.0', {
+  requires: [
+    'base',
+    'juju-models'
+  ]
+});

=== added file 'test/data/wordpress-charmdata.json'
--- test/data/wordpress-charmdata.json	1970-01-01 00:00:00 +0000
+++ test/data/wordpress-charmdata.json	2013-03-11 15:03:24 +0000
@@ -0,0 +1,63 @@
+{
+  "maintainer": "Marco Ceppi <[e-mail]>", 
+  "owner": "charmers", 
+  "series": "precise", 
+  "provides": {
+    "website": {
+      "interface": "http"
+    }
+  }, 
+  "config": {
+    "options": {
+      "debug": {
+        "default": "no", 
+        "type": "string", 
+        "description": "Setting this option to \"yes\" will expose /_debug on all instances over HTTP. In the _debug folder are two scripts, info.php and apc.php. info.php will display the phpinfo information for that server while the apc.php will provide APC cache stats (as well as additional administrative options for APC).\n"
+      }, 
+      "engine": {
+        "default": "nginx", 
+        "type": "string", 
+        "description": "Currently two web server engines are supported: nginx and apache. For the majority of deployments nginx will be the prefered choice. See the Readme for more details"
+      }, 
+      "tuning": {
+        "default": "single", 
+        "type": "string", 
+        "description": "This is the tuning level for the WordPress setup. There are three options: \"bare\", \"single\", and \"optimized\". \"bare\" will give you a nearly un-altered WordPress setup, as if you'd downloaded and set it up yourself. \"single\" will provide you with everything you need to run a singlular unit of WordPress. This doesn't take in to consideration that you'll be scaling at all. However, it will allow you to use WordPress free of any troubles and pesky limitations that typically happen during \"optimized\". While you _can_ scale out with this setting I encourage you read the README \"optimized\" will give you a hardened WordPress setup. Some of the features in the Admin panel will be locked down and theme edits/plugins can only be updated through he charm. This is the recommended setup for those who are in serious need of constant scaling. \n"
+      }, 
+      "wp-content": {
+        "default": "", 
+        "type": "string", 
+        "description": "This is a full repository path to where the WordPress wp-contents can be found. At this time Git, BZR, SVN, and HG are supported. An example of what a wp-content repository should look like can be found at http://github.com/jujutools/wordpress-site.\n"
+      }
+    }
+  }, 
+  "description": "This will install and setup WordPress optimized to run in the cloud. This install, in particular, will \nplace Ngnix and php-fpm configured to scale horizontally with Nginx's reverse proxy\n", 
+  "store_url": "cs:precise/wordpress-10", 
+  "last_change": {
+    "committer": "Marco Ceppi <[e-mail]>", 
+    "message": "# Changes\n\n* Add Apache2 support via engine config\n* Add VCS bash charm helper for wp-content\n* Fix defaults in configuration\n* Fix secret key scale-out\n* Add copyright headers to files\n\n# Commits\n\n  Marco Ceppi 2012-12-13 Fix for secrety key and cookies\n  Marco Ceppi 2012-12-13 Make sure apache respects the canonical name for cookies and the like\n  Marco Ceppi 2012-12-13 Preserve host\n  Marco Ceppi 2012-12-13 Set the request header to make sure assets work properly\n  Marco Ceppi 2012-12-13 [merge] proxy_http\n  Marco Ceppi 2012-12-12 proxy_http needs to be enabled\n  Marco Ceppi 2012-12-12 Include proxy_http\n  Marco Ceppi 2012-12-12 Enable proxy_balancer\n  Marco Ceppi 2012-12-12 Fix to balancermember lines and conditional for nginx only memcached configuration\n  Marco Ceppi 2012-12-12 Fix to loadbalancer conf name for apache2\n  Marco Ceppi 2012-12-11 Server lines need a ';' and when loading from cache need to strip() results\n  Marco Ceppi 2012-12-11 Use the restart hook\n  Marco Ceppi 2012-12-11 Backwards compat fix\n  Marco Ceppi 2012-12-11 Enable multiverse for the apache2 stuff\n  Marco Ceppi 2012-12-11 Make sure sed expands shell variable\n  Marco Ceppi 2012-12-11 Don't need to listen on 80\n  Marco Ceppi 2012-12-11 Final changes to make apache2 switches work properly in the charm\n  Marco Ceppi 2012-12-11 Added default apache files\n  Marco Ceppi 2012-12-11 Updates to fix linting issues, added Apache template\n  Marco Ceppi 2012-12-11 Changes to website relation\n  Marco Ceppi 2012-11-21 Updated files with copyright headers, adding in all apache stuff, new loadbalancer-rebuild sym, apache files, etc\n  Marco Ceppi 2012-11-21 Now we use charm-helper\n", 
+    "revno": 61, 
+    "created": 1355429822.709
+  }, 
+  "store_revision": 10, 
+  "peers": {
+    "loadbalancer": {
+      "interface": "reversenginx"
+    }
+  }, 
+  "name": "wordpress", 
+  "summary": "WordPress is a full featured web blogging tool, this charm deploys it.", 
+  "bzr_branch": "lp:~charmers/charms/precise/wordpress/trunk", 
+  "requires": {
+    "nfs": {
+      "interface": "mount"
+    }, 
+    "cache": {
+      "interface": "memcache"
+    }, 
+    "db": {
+      "interface": "mysql"
+    }
+  }, 
+  "proof": {}
+}
\ No newline at end of file

=== modified file 'test/index.html'
--- test/index.html	2013-03-07 22:40:42 +0000
+++ test/index.html	2013-03-11 15:03:24 +0000
@@ -49,6 +49,7 @@
   <script src="test_env_go.js"></script>
   <script src="test_env_python.js"></script>
   <script src="test_environment_view.js"></script>
+  <script src="test_fakebackend.js"></script>
   <script src="test_landscape.js"></script>
   <script src="test_login.js"></script>
   <script src="test_model.js"></script>

=== added file 'test/test_fakebackend.js'
--- test/test_fakebackend.js	1970-01-01 00:00:00 +0000
+++ test/test_fakebackend.js	2013-03-11 15:03:24 +0000
@@ -0,0 +1,292 @@
+'use strict';
+
+(function() {
+
+  describe('FakeBackend.login', function() {
+    var requires = ['node', 'juju-env-fakebackend'];
+    var Y, environmentsModule, fakebackend;
+
+    before(function(done) {
+      Y = YUI(GlobalConfig).use(requires, function(Y) {
+        environmentsModule = Y.namespace('juju.environments');
+        done();
+      });
+    });
+
+    afterEach(function() {
+      fakebackend.destroy();
+    });
+
+    it('authenticates', function() {
+      fakebackend = new environmentsModule.FakeBackend();
+      assert.equal(fakebackend.get('authenticated'), false);
+      assert.equal(fakebackend.login('admin', 'password'), true);
+      assert.equal(fakebackend.get('authenticated'), true);
+    });
+
+    it('refuses to authenticate', function() {
+      fakebackend = new environmentsModule.FakeBackend();
+      assert.equal(fakebackend.get('authenticated'), false);
+      assert.equal(fakebackend.login('admin', 'not my password'), false);
+      assert.equal(fakebackend.get('authenticated'), false);
+    });
+  });
+
+  var makeFakeBackendWithCharmStore = function(Y, juju, module) {
+    var data = [];
+    var charmStore = new juju.CharmStore(
+        {datasource: new Y.DataSource.Local({source: data})});
+    var setCharm = function(name) {
+      data[0] = (
+          { responseText: Y.io(
+              'data/' + name + '-charmdata.json', {sync: true}).responseText });
+    };
+    setCharm('wordpress');
+    var fakebackend = new module.FakeBackend(
+        {charmStore: charmStore});
+    fakebackend.login('admin', 'password');
+    return {fakebackend: fakebackend, setCharm: setCharm};
+  };
+
+  describe('FakeBackend.deploy', function() {
+    var requires = [
+      'node', 'juju-env-fakebackend', 'datasource-local', 'io',
+      'juju-charm-store', 'juju-models', 'juju-charm-models'];
+    var Y, fakebackend, environmentsModule, setCharm, juju, result, callback;
+
+    before(function(done) {
+      Y = YUI(GlobalConfig).use(requires, function(Y) {
+        environmentsModule = Y.namespace('juju.environments');
+        juju = Y.namespace('juju');
+        done();
+      });
+    });
+
+    beforeEach(function() {
+      var setupData = makeFakeBackendWithCharmStore(
+          Y, juju, environmentsModule);
+      fakebackend = setupData.fakebackend;
+      setCharm = setupData.setCharm;
+      result = undefined;
+      callback = function(response) { result = response; };
+    });
+
+    afterEach(function() {
+      fakebackend.destroy();
+    });
+
+    it('rejects unauthenticated calls', function() {
+      fakebackend.logout();
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.equal(result.error, 'Please log in.');
+    });
+
+    it('rejects poorly formed charm ids', function() {
+      fakebackend.deploy('shazam!!!!!!', callback);
+      assert.equal(result.error, 'Invalid charm id.');
+    });
+
+    it('deploys a charm', function() {
+      // Defaults service name to charm name; defaults unit count to 1.
+      assert.isNull(
+          fakebackend.db.charms.getById('cs:precise/wordpress-10'));
+      assert.isUndefined(fakebackend.deploy('cs:wordpress', callback));
+      assert.isUndefined(result.error);
+      assert.isObject(
+          fakebackend.db.charms.getById('cs:precise/wordpress-10'));
+      var service = fakebackend.db.services.getById('wordpress');
+      assert.isObject(service);
+      assert.strictEqual(service, result.service);
+      var attrs = service.getAttrs();
+      // clientId varies.
+      assert.isTrue(Y.Lang.isString(attrs.clientId));
+      delete attrs.clientId;
+      assert.deepEqual(attrs, {
+        charm: 'cs:precise/wordpress-10',
+        config: undefined,
+        destroyed: false,
+        exposed: false,
+        id: 'wordpress',
+        initialized: true,
+        name: 'wordpress',
+        subordinate: undefined
+      });
+      var units = fakebackend.db.units.get_units_for_service(service);
+      assert.lengthOf(units, 1);
+      assert.lengthOf(result.units, 1);
+      assert.strictEqual(units[0], result.units[0]);
+      assert.equal(units[0].service, 'wordpress');
+    });
+
+    it('rejects names that duplicate an existing service', function() {
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.isUndefined(result.error);
+      // The service name is provided explicitly.
+      fakebackend.deploy('cs:haproxy', callback, {name: 'wordpress'});
+      assert.equal(result.error, 'A service with this name already exists.');
+      // The service name is derived from charm.
+      result = undefined;
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.equal(result.error, 'A service with this name already exists.');
+    });
+
+    it('reuses already-loaded charms with the same explicit id.', function() {
+      fakebackend._loadCharm('cs:wordpress');
+      assert.isObject(
+          fakebackend.db.charms.getById('cs:precise/wordpress-10'));
+      // Eliminate the charmStore to show we reuse the pre-loaded charm.
+      fakebackend.set('charmStore', undefined);
+      fakebackend.deploy('cs:precise/wordpress-10', callback);
+      assert.isUndefined(result.error);
+      assert.isObject(result.service);
+      assert.equal(result.service.get('charm'), 'cs:precise/wordpress-10');
+    });
+
+    it('reuses already-loaded charms with the same id.', function() {
+      fakebackend._loadCharm('cs:wordpress');
+      var charm = fakebackend.db.charms.getById('cs:precise/wordpress-10');
+      assert.equal(fakebackend.db.charms.size(), 1);
+      // The charm data shows that this is not a subordinate charm.  We will
+      // change this in the db, to show that the db data is used within the
+      // deploy code.
+      assert.isUndefined(charm.get('is_subordinate'));
+      // The _set forces a change to a writeOnly attribute.
+      charm._set('is_subordinate', true);
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.isUndefined(result.error);
+      assert.strictEqual(
+          fakebackend.db.charms.getById('cs:precise/wordpress-10'), charm);
+      assert.equal(fakebackend.db.charms.size(), 1);
+      assert.equal(result.service.get('charm'), 'cs:precise/wordpress-10');
+      // This is the clearest indication that we used the db version, as
+      // opposed to the charmStore version, per the comments above.
+      assert.isTrue(result.service.get('subordinate'));
+    });
+
+    it('accepts a config.', function() {
+      fakebackend.deploy(
+          'cs:wordpress', callback, {config: {funny: 'business'}});
+      assert.deepEqual(result.service.get('config'), {funny: 'business'});
+    });
+
+    it('deploys multiple units.', function() {
+      fakebackend.deploy('cs:wordpress', callback, {unitCount: 3});
+      var units = fakebackend.db.units.get_units_for_service(result.service);
+      assert.lengthOf(units, 3);
+      assert.lengthOf(result.units, 3);
+      assert.deepEqual(units, result.units);
+    });
+
+    it('reports when the charm store is inaccessible.', function() {
+      fakebackend.get('charmStore').loadByPath = function(path, options) {
+        options.failure({boo: 'hiss'});
+      };
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.equal(result.error, 'Could not contact charm store.');
+    });
+
+    it('honors the optional service name', function() {
+      assert.isUndefined(
+          fakebackend.deploy('cs:wordpress', callback, {name: 'kumquat'}));
+      assert.equal(result.service.get('id'), 'kumquat');
+    });
+
+    // it('accepts a config file.');
+
+    // it('does not accept both a config and config file.');
+
+    // it('records when services and units are added.');
+
+  });
+
+  describe('FakeBackend.addUnit', function() {
+    var requires = [
+      'node', 'juju-env-fakebackend', 'datasource-local', 'io',
+      'juju-charm-store', 'juju-models', 'juju-charm-models'];
+    var Y, fakebackend, environmentsModule, setCharm, juju,
+        deployResult, callback;
+
+    before(function(done) {
+      Y = YUI(GlobalConfig).use(requires, function(Y) {
+        environmentsModule = Y.namespace('juju.environments');
+        juju = Y.namespace('juju');
+        done();
+      });
+    });
+
+    beforeEach(function() {
+      var setupData = makeFakeBackendWithCharmStore(
+          Y, juju, environmentsModule);
+      fakebackend = setupData.fakebackend;
+      setCharm = setupData.setCharm;
+      deployResult = undefined;
+      callback = function(response) { deployResult = response; };
+    });
+
+    afterEach(function() {
+      fakebackend.destroy();
+    });
+
+    it('rejects unauthenticated calls', function() {
+      fakebackend.logout();
+      var result = fakebackend.addUnit('wordpress');
+      assert.equal(result.error, 'Please log in.');
+    });
+
+    it('returns an error for an invalid number of units', function() {
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.isUndefined(deployResult.error);
+      assert.equal(
+          fakebackend.addUnit('wordpress', 'goyesca').error,
+          'Invalid number of units.');
+      assert.equal(
+          fakebackend.addUnit('wordpress', 0).error,
+          'Invalid number of units.');
+      assert.equal(
+          fakebackend.addUnit('wordpress', -1).error,
+          'Invalid number of units.');
+    });
+
+    it('returns an error if the service does not exist.', function() {
+      assert.equal(
+          fakebackend.addUnit('foo').error,
+          'Service "foo" does not exist.');
+    });
+
+    it('defaults to adding just one unit', function() {
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.isUndefined(deployResult.error);
+      assert.lengthOf(
+          fakebackend.db.units.get_units_for_service(deployResult.service), 1);
+      var result = fakebackend.addUnit('wordpress');
+      assert.lengthOf(result.units, 1);
+      assert.lengthOf(
+          fakebackend.db.units.get_units_for_service(deployResult.service), 2);
+      // Units are simple objects, not models.
+      assert.equal(result.units[0].id, 'wordpress/2');
+      assert.equal(result.units[0].agent_state, 'started');
+      assert.deepEqual(
+          result.units[0], fakebackend.db.units.getById('wordpress/2'));
+      // TODO Verify that machines exist.
+    });
+
+    it('adds multiple units', function() {
+      fakebackend.deploy('cs:wordpress', callback);
+      assert.isUndefined(deployResult.error);
+      assert.lengthOf(
+          fakebackend.db.units.get_units_for_service(deployResult.service), 1);
+      var result = fakebackend.addUnit('wordpress', 5);
+      assert.lengthOf(result.units, 5);
+      assert.lengthOf(
+          fakebackend.db.units.get_units_for_service(deployResult.service), 6);
+      assert.equal(result.units[0].id, 'wordpress/2');
+      assert.equal(result.units[1].id, 'wordpress/3');
+      assert.equal(result.units[2].id, 'wordpress/4');
+      assert.equal(result.units[3].id, 'wordpress/5');
+      assert.equal(result.units[4].id, 'wordpress/6');
+    });
+
+    // it('records when services and units are added.');
+
+  });
+})();

=== modified file 'test/test_service_view.js'
--- test/test_service_view.js	2013-02-27 22:25:50 +0000
+++ test/test_service_view.js	2013-03-11 15:03:24 +0000
@@ -82,7 +82,8 @@
     });
 
     it('should not show controls if the charm is subordinate', function() {
-      charm.set('is_subordinate', true);
+      // The _set forces a change to a writeOnly attribute.
+      charm._set('is_subordinate', true);
       var view = makeServiceView();
       // "var _ =" makes the linter happy.
       var _ = expect(container.one('#num-service-units')).to.not.exist;