Merge lp:~bcsaller/juju-gui/export-improvements into lp:juju-gui/experimental
Proposed by
Benjamin Saller
Status: | Merged |
---|---|
Merged at revision: | 829 |
Proposed branch: | lp:~bcsaller/juju-gui/export-improvements |
Merge into: | lp:juju-gui/experimental |
Diff against target: |
127 lines (+67/-9) 2 files modified
app/models/models.js (+33/-5) test/test_model.js (+34/-4) |
To merge this branch: | bzr merge lp:~bcsaller/juju-gui/export-improvements |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Description of the change
Many deployer export format fixes
Export Annotations
Skip export of default service options.
Services is a dict, not an array
Use qualified charm names
To post a comment you must log in.
Reviewers: mp+174485_ code.launchpad. net,
Message:
Please take a look.
Description:
Many deployer export format fixes
Export Annotations
Skip export of default service options.
Services is a dict, not an array
Use qualified charm names
https:/ /code.launchpad .net/~bcsaller/ juju-gui/ export- improvements/ +merge/ 174485
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/11227043/
Affected files: models. js
A [revision details]
M app/models/
M test/test_model.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_model.js model.js' add({id: 'mysql', charm: 'precise/ mysql-1' }); wordpress- 1'}); wordpress- 1', environment. set('defaultSer ies', 'precise');
=== modified file 'test/test_
--- test/test_model.js 2013-07-11 23:21:42 +0000
+++ test/test_model.js 2013-07-12 19:16:17 +0000
@@ -808,7 +808,10 @@
var mysql = db.services.
var wordpress = db.services.add({
id: 'wordpress',
- charm: 'precise/
+ charm: 'precise/
+ config: {debug: 'no', username: 'admin'},
+ annotations: {'gui-x': 100, 'gui-y': 200, 'ignored': true}
+ });
var rel0 = db.relations.add({
id: 'relation-0',
endpoints: [
@@ -820,13 +823,40 @@
db.
// Add the charms so we can resolve them in the export. wordpress- 1'}]); wordpress- 1', er().envExport; relations[ 0];
- db.charms.add([{id: 'precise/mysql-1'}, {id: 'precise/
+ db.charms.add([{id: 'precise/mysql-1'},
+ {id: 'precise/
+ config: {
+ options: {
+ debug: {
+ 'default': 'no'
+ },
+ username: {
+ 'default': 'root'
+ }
+ }
+ }
+ }
+ ]);
var result = db.exportDeploy
var relation = result.
assert. equal(result. series, 'precise'); equal(result. services[ 0].charm, 'mysql'); equal(result. services[ 1].charm, 'wordpress'); equal(result. services. mysql.charm, 'precise/mysql-1'); equal(result. services. wordpress. charm, 'precise/ wordpress- 1'); equal(result. services. wordpress. options. debug, undefined); equal(result. services. wordpress. options. username, 'admin'); equal(result. services. mysql.options, undefined); equal(result. services. wordpress. annotations[ 'gui-x' ], 100); equal(result. services. wordpress. annotations[ 'gui-y' ], 200); equal(result. services. wordpress. annotations. ignored, undefined);
- assert.
- assert.
+ assert.
+ assert.
+
+ // A default config value is skipped
+ assert.
+ // A value changed from the default is exported
+ assert.
+ // Ensure that mysql has no options object in the export as no
+ // non-default options are defined
+ assert.
+
+ // Export position annotations.
+ assert.
+ assert.
+ // Note that ignored wasn't exported.
+ assert.
assert. equal(relation[ 0], 'mysql:db'); equal(relation[ 1], 'w...
assert.