Merge lp:~frankban/juju-quickstart/jujubundlelib into lp:juju-quickstart
- jujubundlelib
- Merge into trunk
Proposed by
Francesco Banconi
Status: | Merged |
---|---|
Merged at revision: | 125 |
Proposed branch: | lp:~frankban/juju-quickstart/jujubundlelib |
Merge into: | lp:juju-quickstart |
Diff against target: |
908 lines (+27/-639) 13 files modified
quickstart/app.py (+1/-1) quickstart/charmstore.py (+3/-3) quickstart/jujutools.py (+5/-4) quickstart/manage.py (+2/-1) quickstart/models/bundles.py (+4/-3) quickstart/models/references.py (+0/-215) quickstart/tests/models/test_bundles.py (+2/-4) quickstart/tests/models/test_references.py (+0/-400) quickstart/tests/test_app.py (+2/-4) quickstart/tests/test_charmstore.py (+2/-2) quickstart/tests/test_jujutools.py (+1/-1) quickstart/tests/test_manage.py (+1/-1) tox.ini (+4/-0) |
To merge this branch: | bzr merge lp:~frankban/juju-quickstart/jujubundlelib |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju GUI Hackers | Pending | ||
Review via email:
|
Commit message
Description of the change
Introduce jujubundlelib dependency.
Use the Reference model defined there.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Francesco Banconi (frankban) wrote : | # |
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Madison Scott-Clary (makyo) wrote : | # |
LGTM, thanks for the work - we'll need to update tox.ini with versions
as tasks shake out from jujubundlelib, but that's fine.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Francesco Banconi (frankban) wrote : | # |
On 2015/04/22 15:34:12, matthew.scott wrote:
> LGTM, thanks for the work - we'll need to update tox.ini with versions
as tasks
> shake out from jujubundlelib, but that's fine.
Indeed, I'll update the bundlelib version in follow up branches.
Thanks for the review Madison!
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Francesco Banconi (frankban) wrote : | # |
*** Submitted:
Introduce jujubundlelib dependency.
Use the Reference model defined there.
R=matthew.scott
CC=
https:/
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'quickstart/app.py' | |||
2 | --- quickstart/app.py 2015-03-09 17:50:28 +0000 | |||
3 | +++ quickstart/app.py 2015-04-21 10:32:19 +0000 | |||
4 | @@ -411,7 +411,7 @@ | |||
5 | 411 | Return a tuple including the following values: | 411 | Return a tuple including the following values: |
6 | 412 | - charm_ref: the entity reference of the charm that will be used to | 412 | - charm_ref: the entity reference of the charm that will be used to |
7 | 413 | deploy the service, as an instance of | 413 | deploy the service, as an instance of |
9 | 414 | "quickstart.models.references.Reference"; | 414 | "jujubundlelib.references.Reference"; |
10 | 415 | - machine: the machine where to deploy to (e.g. "0") or None if a new | 415 | - machine: the machine where to deploy to (e.g. "0") or None if a new |
11 | 416 | machine must be created; | 416 | machine must be created; |
12 | 417 | - service_data: the service info as returned by the mega-watcher for | 417 | - service_data: the service info as returned by the mega-watcher for |
13 | 418 | 418 | ||
14 | === modified file 'quickstart/charmstore.py' | |||
15 | --- quickstart/charmstore.py 2015-03-10 10:18:58 +0000 | |||
16 | +++ quickstart/charmstore.py 2015-04-21 10:32:19 +0000 | |||
17 | @@ -59,7 +59,7 @@ | |||
18 | 59 | """Retrieve the charm store contents for the given reference and path. | 59 | """Retrieve the charm store contents for the given reference and path. |
19 | 60 | 60 | ||
20 | 61 | The reference argument identifies a charm or bundle entity and must be an | 61 | The reference argument identifies a charm or bundle entity and must be an |
22 | 62 | instance of "quickstart.models.references.Reference". | 62 | instance of "jujubundlelib.references.Reference". |
23 | 63 | 63 | ||
24 | 64 | For instance, to retrieve the hash of a charm reference, use the following: | 64 | For instance, to retrieve the hash of a charm reference, use the following: |
25 | 65 | 65 | ||
26 | @@ -101,7 +101,7 @@ | |||
27 | 101 | 101 | ||
28 | 102 | The bundle data is returned as a YAML decoded value. | 102 | The bundle data is returned as a YAML decoded value. |
29 | 103 | The reference argument identifies a bundle entity and must be an instance | 103 | The reference argument identifies a bundle entity and must be an instance |
31 | 104 | of "quickstart.models.references.Reference". | 104 | of "jujubundlelib.references.Reference". |
32 | 105 | 105 | ||
33 | 106 | Raise a ValueError if the returned content is not a valid YAML, or if the | 106 | Raise a ValueError if the returned content is not a valid YAML, or if the |
34 | 107 | given reference does not represent a bundle. | 107 | given reference does not represent a bundle. |
35 | @@ -119,7 +119,7 @@ | |||
36 | 119 | The bundle data is returned as a YAML decoded value and represents the | 119 | The bundle data is returned as a YAML decoded value and represents the |
37 | 120 | legacy bundle with a top level bundle name node. | 120 | legacy bundle with a top level bundle name node. |
38 | 121 | The reference argument identifies a bundle entity and must be an instance | 121 | The reference argument identifies a bundle entity and must be an instance |
40 | 122 | of "quickstart.models.references.Reference". | 122 | of "jujubundlelib.references.Reference". |
41 | 123 | 123 | ||
42 | 124 | Raise a ValueError if the returned content is not a valid YAML, or if the | 124 | Raise a ValueError if the returned content is not a valid YAML, or if the |
43 | 125 | given reference does not represent a bundle. | 125 | given reference does not represent a bundle. |
44 | 126 | 126 | ||
45 | === modified file 'quickstart/jujutools.py' | |||
46 | --- quickstart/jujutools.py 2015-02-26 11:02:57 +0000 | |||
47 | +++ quickstart/jujutools.py 2015-04-21 10:32:19 +0000 | |||
48 | @@ -23,11 +23,12 @@ | |||
49 | 23 | 23 | ||
50 | 24 | import logging | 24 | import logging |
51 | 25 | 25 | ||
52 | 26 | from jujubundlelib import references | ||
53 | 27 | |||
54 | 26 | from quickstart import ( | 28 | from quickstart import ( |
55 | 27 | serializers, | 29 | serializers, |
56 | 28 | settings, | 30 | settings, |
57 | 29 | ) | 31 | ) |
58 | 30 | from quickstart.models import references | ||
59 | 31 | 32 | ||
60 | 32 | 33 | ||
61 | 33 | def get_api_url( | 34 | def get_api_url( |
62 | @@ -40,8 +41,8 @@ | |||
63 | 40 | Optionally receive a prefix to be used in the path. | 41 | Optionally receive a prefix to be used in the path. |
64 | 41 | 42 | ||
65 | 42 | Optionally also receive the Juju GUI charm reference as an instance of | 43 | Optionally also receive the Juju GUI charm reference as an instance of |
68 | 43 | "quickstart.models.references.Reference". If provided, the function checks | 44 | "jujubundlelib.references.Reference". If provided, the function checks that |
69 | 44 | that the corresponding Juju GUI charm supports the new Juju API endpoint. | 45 | the corresponding Juju GUI charm supports the new Juju API endpoint. |
70 | 45 | If not supported, the old endpoint is returned. | 46 | If not supported, the old endpoint is returned. |
71 | 46 | 47 | ||
72 | 47 | The environment UUID can be None, in which case the old-style API URL | 48 | The environment UUID can be None, in which case the old-style API URL |
73 | @@ -104,7 +105,7 @@ | |||
74 | 104 | Print (to stdout or to logs) info and warnings about the charm URL. | 105 | Print (to stdout or to logs) info and warnings about the charm URL. |
75 | 105 | 106 | ||
76 | 106 | Return the parsed charm reference object as an instance of | 107 | Return the parsed charm reference object as an instance of |
78 | 107 | "quickstart.models.references.Reference". | 108 | "jujubundlelib.references.Reference". |
79 | 108 | """ | 109 | """ |
80 | 109 | print('charm URL: {}'.format(charm_url)) | 110 | print('charm URL: {}'.format(charm_url)) |
81 | 110 | ref = references.Reference.from_fully_qualified_url(charm_url) | 111 | ref = references.Reference.from_fully_qualified_url(charm_url) |
82 | 111 | 112 | ||
83 | === modified file 'quickstart/manage.py' | |||
84 | --- quickstart/manage.py 2015-03-09 18:53:52 +0000 | |||
85 | +++ quickstart/manage.py 2015-04-21 10:32:19 +0000 | |||
86 | @@ -28,6 +28,8 @@ | |||
87 | 28 | import sys | 28 | import sys |
88 | 29 | import webbrowser | 29 | import webbrowser |
89 | 30 | 30 | ||
90 | 31 | from jujubundlelib import references | ||
91 | 32 | |||
92 | 31 | import quickstart | 33 | import quickstart |
93 | 32 | from quickstart import ( | 34 | from quickstart import ( |
94 | 33 | app, | 35 | app, |
95 | @@ -45,7 +47,6 @@ | |||
96 | 45 | bundles, | 47 | bundles, |
97 | 46 | envs, | 48 | envs, |
98 | 47 | jenv, | 49 | jenv, |
99 | 48 | references, | ||
100 | 49 | ) | 50 | ) |
101 | 50 | 51 | ||
102 | 51 | 52 | ||
103 | 52 | 53 | ||
104 | === modified file 'quickstart/models/bundles.py' | |||
105 | --- quickstart/models/bundles.py 2015-03-10 13:13:42 +0000 | |||
106 | +++ quickstart/models/bundles.py 2015-04-21 10:32:19 +0000 | |||
107 | @@ -22,7 +22,7 @@ | |||
108 | 22 | 22 | ||
109 | 23 | Published bundles are identified by a charm store id and by the corresponding | 23 | Published bundles are identified by a charm store id and by the corresponding |
110 | 24 | URL in jujucharms.com, just like regular charms. The reference object in | 24 | URL in jujucharms.com, just like regular charms. The reference object in |
112 | 25 | "quickstart.models.references.Reference" can be used to identify a bundle. | 25 | "jujubundlelib.references.Reference" can be used to identify a bundle. |
113 | 26 | 26 | ||
114 | 27 | In this module, the Bundle class represents a bundle that may or may not have | 27 | In this module, the Bundle class represents a bundle that may or may not have |
115 | 28 | a specific reference id. For instance, a reference is not set on a bundle if | 28 | a specific reference id. For instance, a reference is not set on a bundle if |
116 | @@ -46,13 +46,14 @@ | |||
117 | 46 | import os | 46 | import os |
118 | 47 | import re | 47 | import re |
119 | 48 | 48 | ||
120 | 49 | from jujubundlelib import references | ||
121 | 50 | |||
122 | 49 | from quickstart import ( | 51 | from quickstart import ( |
123 | 50 | charmstore, | 52 | charmstore, |
124 | 51 | netutils, | 53 | netutils, |
125 | 52 | serializers, | 54 | serializers, |
126 | 53 | settings, | 55 | settings, |
127 | 54 | ) | 56 | ) |
128 | 55 | from quickstart.models import references | ||
129 | 56 | 57 | ||
130 | 57 | 58 | ||
131 | 58 | class Bundle(object): | 59 | class Bundle(object): |
132 | @@ -63,7 +64,7 @@ | |||
133 | 63 | 64 | ||
134 | 64 | The data argument is the bundle YAML decoded content. | 65 | The data argument is the bundle YAML decoded content. |
135 | 65 | An optional entity reference can be provided as an instance of | 66 | An optional entity reference can be provided as an instance of |
137 | 66 | "quickstart.models.references.Reference". | 67 | "jujubundlelib.references.Reference". |
138 | 67 | """ | 68 | """ |
139 | 68 | self.data = data | 69 | self.data = data |
140 | 69 | self.reference = reference | 70 | self.reference = reference |
141 | 70 | 71 | ||
142 | === removed file 'quickstart/models/references.py' | |||
143 | --- quickstart/models/references.py 2015-03-06 17:55:40 +0000 | |||
144 | +++ quickstart/models/references.py 1970-01-01 00:00:00 +0000 | |||
145 | @@ -1,215 +0,0 @@ | |||
146 | 1 | # This file is part of the Juju Quickstart Plugin, which lets users set up a | ||
147 | 2 | # Juju environment in very few steps (https://launchpad.net/juju-quickstart). | ||
148 | 3 | # Copyright (C) 2013 Canonical Ltd. | ||
149 | 4 | # | ||
150 | 5 | # This program is free software: you can redistribute it and/or modify it under | ||
151 | 6 | # the terms of the GNU Affero General Public License version 3, as published by | ||
152 | 7 | # the Free Software Foundation. | ||
153 | 8 | # | ||
154 | 9 | # This program is distributed in the hope that it will be useful, but WITHOUT | ||
155 | 10 | # ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, | ||
156 | 11 | # SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
157 | 12 | # Affero General Public License for more details. | ||
158 | 13 | # | ||
159 | 14 | # You should have received a copy of the GNU Affero General Public License | ||
160 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
161 | 16 | |||
162 | 17 | """Juju Quickstart charm and bundle references management.""" | ||
163 | 18 | |||
164 | 19 | from __future__ import unicode_literals | ||
165 | 20 | |||
166 | 21 | import re | ||
167 | 22 | |||
168 | 23 | from quickstart import settings | ||
169 | 24 | |||
170 | 25 | |||
171 | 26 | # The following regular expressions are the same used in juju-core: see | ||
172 | 27 | # http://bazaar.launchpad.net/~go-bot/juju-core/trunk/view/head:/charm/url.go. | ||
173 | 28 | USER_PATTERN = r'[a-z0-9][a-zA-Z0-9+.-]+' | ||
174 | 29 | SERIES_PATTERN = r'[a-z]+(?:[a-z-]+[a-z])?' | ||
175 | 30 | NAME_PATTERN = r'[a-z][a-z0-9]*(?:-[a-z0-9]*[a-z][a-z0-9]*)*' | ||
176 | 31 | |||
177 | 32 | # Define the callables used to check if entity reference components are valid. | ||
178 | 33 | _valid_user = re.compile(r'^{}$'.format(USER_PATTERN)).match | ||
179 | 34 | _valid_series = re.compile(r'^{}$'.format(SERIES_PATTERN)).match | ||
180 | 35 | _valid_name = re.compile(r'^{}$'.format(NAME_PATTERN)).match | ||
181 | 36 | |||
182 | 37 | # Compile the regular expression used to parse new jujucharms entity URLs. | ||
183 | 38 | _jujucharms_url_expression = re.compile(r""" | ||
184 | 39 | ^ # Beginning of the line. | ||
185 | 40 | (?: | ||
186 | 41 | (?:{jujucharms})? # Optional jujucharms.com URL. | ||
187 | 42 | | | ||
188 | 43 | /? # Optional leading slash. | ||
189 | 44 | )? | ||
190 | 45 | (?:u/({user_pattern})/)? # Optional user name. | ||
191 | 46 | ({name_pattern}) # Bundle name. | ||
192 | 47 | (?:/({series_pattern}))? # Optional series. | ||
193 | 48 | (?:/(\d+))? # Optional bundle revision number. | ||
194 | 49 | /? # Optional trailing slash. | ||
195 | 50 | $ # End of the line. | ||
196 | 51 | """.format( | ||
197 | 52 | jujucharms=settings.JUJUCHARMS_URL, | ||
198 | 53 | name_pattern=NAME_PATTERN, | ||
199 | 54 | series_pattern=SERIES_PATTERN, | ||
200 | 55 | user_pattern=USER_PATTERN, | ||
201 | 56 | ), re.VERBOSE) | ||
202 | 57 | |||
203 | 58 | |||
204 | 59 | class Reference(object): | ||
205 | 60 | """Represent a charm or bundle URL reference.""" | ||
206 | 61 | |||
207 | 62 | def __init__(self, schema, user, series, name, revision): | ||
208 | 63 | """Initialize the reference. Receives the URL fragments.""" | ||
209 | 64 | self.schema = schema | ||
210 | 65 | self.user = user | ||
211 | 66 | self.series = series | ||
212 | 67 | self.name = name | ||
213 | 68 | if revision is not None: | ||
214 | 69 | revision = int(revision) | ||
215 | 70 | self.revision = revision | ||
216 | 71 | # XXX frankban 2015-02-26: remove the following attribute when | ||
217 | 72 | # switching to the new bundle format, and when we have a better way | ||
218 | 73 | # to increase bundle deployments count. | ||
219 | 74 | self.charmworld_id = None | ||
220 | 75 | |||
221 | 76 | @classmethod | ||
222 | 77 | def from_fully_qualified_url(cls, url): | ||
223 | 78 | """Given an entity URL as a string, create and return a Reference. | ||
224 | 79 | |||
225 | 80 | Fully qualified URLs represent the regular entity reference | ||
226 | 81 | representation in Juju, e.g.: "cs:`~who/vivid/django-42" or | ||
227 | 82 | "local:bundle/wordpress-0". | ||
228 | 83 | |||
229 | 84 | Raise a ValueError if the provided value is not a valid and fully | ||
230 | 85 | qualified URL, also including the schema and the revision. | ||
231 | 86 | """ | ||
232 | 87 | return cls(*_parse_fully_qualified_url(url)) | ||
233 | 88 | |||
234 | 89 | @classmethod | ||
235 | 90 | def from_jujucharms_url(cls, url): | ||
236 | 91 | """Create and return a Reference from the given jujucharms.com URL. | ||
237 | 92 | |||
238 | 93 | These are the preferred way to refer to a charm or bundle in Juju | ||
239 | 94 | Quickstart. They basically look like the URL paths in jujucharms.com, | ||
240 | 95 | e.g. "u/who/django", "mediawiki/42" or just "mediawiki". The full HTTP | ||
241 | 96 | URL can be also provided, for instance "https://jujucharms.com/django". | ||
242 | 97 | |||
243 | 98 | Raise a ValueError if the provided URL is not valid. | ||
244 | 99 | """ | ||
245 | 100 | match = _jujucharms_url_expression.match(url) | ||
246 | 101 | if match is None: | ||
247 | 102 | msg = 'invalid bundle URL: {}'.format(url) | ||
248 | 103 | raise ValueError(msg.encode('utf-8')) | ||
249 | 104 | user, name, series, revision = match.groups() | ||
250 | 105 | return cls('cs', user, series or 'bundle', name, revision) | ||
251 | 106 | |||
252 | 107 | def __str__(self): | ||
253 | 108 | """The string representation of a reference is its URL string.""" | ||
254 | 109 | return self.__unicode__().encode('utf-8') | ||
255 | 110 | |||
256 | 111 | def __unicode__(self): | ||
257 | 112 | """The unicode representation of a reference is its URL string.""" | ||
258 | 113 | return self.id() | ||
259 | 114 | |||
260 | 115 | def __repr__(self): | ||
261 | 116 | return b'<Reference: {}>'.format(bytes(self)) | ||
262 | 117 | |||
263 | 118 | def __eq__(self, other): | ||
264 | 119 | """Two refs are equal if they have the same string representation.""" | ||
265 | 120 | return isinstance(other, self.__class__) and self.id() == other.id() | ||
266 | 121 | |||
267 | 122 | def path(self): | ||
268 | 123 | """Return the reference as a string without the schema.""" | ||
269 | 124 | user_part = '~{}/'.format(self.user) if self.user else '' | ||
270 | 125 | revision_part = '' | ||
271 | 126 | if self.revision is not None: | ||
272 | 127 | revision_part = '-{}'.format(self.revision) | ||
273 | 128 | return '{}{}/{}{}'.format( | ||
274 | 129 | user_part, self.series, self.name, revision_part) | ||
275 | 130 | |||
276 | 131 | def id(self): | ||
277 | 132 | """Return the reference URL as a string.""" | ||
278 | 133 | return '{}:{}'.format(self.schema, self.path()) | ||
279 | 134 | |||
280 | 135 | def jujucharms_id(self): | ||
281 | 136 | """Return the identifier of this reference in jujucharms.com.""" | ||
282 | 137 | user_part = 'u/{}/'.format(self.user) if self.user else '' | ||
283 | 138 | series_part = '' if self.is_bundle() else '/{}'.format(self.series) | ||
284 | 139 | revision_part = '' | ||
285 | 140 | if self.revision is not None: | ||
286 | 141 | revision_part = '/{}'.format(self.revision) | ||
287 | 142 | return '{}{}{}{}'.format( | ||
288 | 143 | user_part, self.name, series_part, revision_part) | ||
289 | 144 | |||
290 | 145 | def jujucharms_url(self): | ||
291 | 146 | """Return the URL where this entity lives in jujucharms.com.""" | ||
292 | 147 | return settings.JUJUCHARMS_URL + self.jujucharms_id() | ||
293 | 148 | |||
294 | 149 | def is_bundle(self): | ||
295 | 150 | """Report whether this reference refers to a bundle entity.""" | ||
296 | 151 | return self.series == 'bundle' | ||
297 | 152 | |||
298 | 153 | def is_local(self): | ||
299 | 154 | """Return True if this refers to a local entity, False otherwise.""" | ||
300 | 155 | return self.schema == 'local' | ||
301 | 156 | |||
302 | 157 | |||
303 | 158 | def _parse_fully_qualified_url(url): | ||
304 | 159 | """Parse the given charm or bundle URL, provided as a string. | ||
305 | 160 | |||
306 | 161 | Return a tuple containing the entity reference fragments: schema, user, | ||
307 | 162 | series, name and revision. Each fragment is a string except revision (int). | ||
308 | 163 | |||
309 | 164 | Raise a ValueError with a descriptive message if the given URL is not a | ||
310 | 165 | valid and fully qualified entity URL. | ||
311 | 166 | """ | ||
312 | 167 | # Retrieve the schema. | ||
313 | 168 | try: | ||
314 | 169 | schema, remaining = url.split(':', 1) | ||
315 | 170 | except ValueError: | ||
316 | 171 | msg = 'URL has no schema: {}'.format(url) | ||
317 | 172 | raise ValueError(msg.encode('utf-8')) | ||
318 | 173 | if schema not in ('cs', 'local'): | ||
319 | 174 | msg = 'URL has invalid schema: {}'.format(schema) | ||
320 | 175 | raise ValueError(msg.encode('utf-8')) | ||
321 | 176 | # Retrieve the optional user, the series, name and revision. | ||
322 | 177 | parts = remaining.split('/') | ||
323 | 178 | parts_length = len(parts) | ||
324 | 179 | if parts_length == 3: | ||
325 | 180 | user, series, name_revision = parts | ||
326 | 181 | if not user.startswith('~'): | ||
327 | 182 | msg = 'URL has invalid user name form: {}'.format(user) | ||
328 | 183 | raise ValueError(msg.encode('utf-8')) | ||
329 | 184 | user = user[1:] | ||
330 | 185 | if not _valid_user(user): | ||
331 | 186 | msg = 'URL has invalid user name: {}'.format(user) | ||
332 | 187 | raise ValueError(msg.encode('utf-8')) | ||
333 | 188 | if schema == 'local': | ||
334 | 189 | msg = 'local entity URL with user name: {}'.format(url) | ||
335 | 190 | raise ValueError(msg.encode('utf-8')) | ||
336 | 191 | elif parts_length == 2: | ||
337 | 192 | user = '' | ||
338 | 193 | series, name_revision = parts | ||
339 | 194 | else: | ||
340 | 195 | msg = 'URL has invalid form: {}'.format(url) | ||
341 | 196 | raise ValueError(msg.encode('utf-8')) | ||
342 | 197 | # Validate the series. | ||
343 | 198 | if not _valid_series(series): | ||
344 | 199 | msg = 'URL has invalid series: {}'.format(series) | ||
345 | 200 | raise ValueError(msg.encode('utf-8')) | ||
346 | 201 | # Validate name and revision. | ||
347 | 202 | try: | ||
348 | 203 | name, revision = name_revision.rsplit('-', 1) | ||
349 | 204 | except ValueError: | ||
350 | 205 | msg = 'URL has no revision: {}'.format(url) | ||
351 | 206 | raise ValueError(msg.encode('utf-8')) | ||
352 | 207 | if not _valid_name(name): | ||
353 | 208 | msg = 'URL has invalid name: {}'.format(name) | ||
354 | 209 | raise ValueError(msg.encode('utf-8')) | ||
355 | 210 | try: | ||
356 | 211 | revision = int(revision) | ||
357 | 212 | except ValueError: | ||
358 | 213 | msg = 'URL has invalid revision: {}'.format(revision) | ||
359 | 214 | raise ValueError(msg.encode('utf-8')) | ||
360 | 215 | return schema, user, series, name, revision | ||
361 | 216 | 0 | ||
362 | === modified file 'quickstart/tests/models/test_bundles.py' | |||
363 | --- quickstart/tests/models/test_bundles.py 2015-03-10 13:13:42 +0000 | |||
364 | +++ quickstart/tests/models/test_bundles.py 2015-04-21 10:32:19 +0000 | |||
365 | @@ -21,6 +21,7 @@ | |||
366 | 21 | import json | 21 | import json |
367 | 22 | import unittest | 22 | import unittest |
368 | 23 | 23 | ||
369 | 24 | from jujubundlelib import references | ||
370 | 24 | import mock | 25 | import mock |
371 | 25 | import yaml | 26 | import yaml |
372 | 26 | 27 | ||
373 | @@ -28,10 +29,7 @@ | |||
374 | 28 | netutils, | 29 | netutils, |
375 | 29 | settings, | 30 | settings, |
376 | 30 | ) | 31 | ) |
381 | 31 | from quickstart.models import ( | 32 | from quickstart.models import bundles |
378 | 32 | bundles, | ||
379 | 33 | references, | ||
380 | 34 | ) | ||
382 | 35 | from quickstart.tests import helpers | 33 | from quickstart.tests import helpers |
383 | 36 | 34 | ||
384 | 37 | 35 | ||
385 | 38 | 36 | ||
386 | === removed file 'quickstart/tests/models/test_references.py' | |||
387 | --- quickstart/tests/models/test_references.py 2015-03-09 17:50:28 +0000 | |||
388 | +++ quickstart/tests/models/test_references.py 1970-01-01 00:00:00 +0000 | |||
389 | @@ -1,400 +0,0 @@ | |||
390 | 1 | # This file is part of the Juju Quickstart Plugin, which lets users set up a | ||
391 | 2 | # Juju environment in very few steps (https://launchpad.net/juju-quickstart). | ||
392 | 3 | # Copyright (C) 2013 Canonical Ltd. | ||
393 | 4 | # | ||
394 | 5 | # This program is free software: you can redistribute it and/or modify it under | ||
395 | 6 | # the terms of the GNU Affero General Public License version 3, as published by | ||
396 | 7 | # the Free Software Foundation. | ||
397 | 8 | # | ||
398 | 9 | # This program is distributed in the hope that it will be useful, but WITHOUT | ||
399 | 10 | # ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, | ||
400 | 11 | # SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
401 | 12 | # Affero General Public License for more details. | ||
402 | 13 | # | ||
403 | 14 | # You should have received a copy of the GNU Affero General Public License | ||
404 | 15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
405 | 16 | |||
406 | 17 | """Tests for the Juju Quickstart charm and bundle references management.""" | ||
407 | 18 | |||
408 | 19 | from __future__ import unicode_literals | ||
409 | 20 | |||
410 | 21 | import unittest | ||
411 | 22 | |||
412 | 23 | from quickstart import settings | ||
413 | 24 | from quickstart.models import references | ||
414 | 25 | from quickstart.tests import helpers | ||
415 | 26 | |||
416 | 27 | |||
417 | 28 | def make_reference( | ||
418 | 29 | schema='cs', user='myuser', series='precise', name='juju-gui', | ||
419 | 30 | revision=42): | ||
420 | 31 | """Create and return a Reference instance.""" | ||
421 | 32 | return references.Reference(schema, user, series, name, revision) | ||
422 | 33 | |||
423 | 34 | |||
424 | 35 | class TestReference(unittest.TestCase): | ||
425 | 36 | |||
426 | 37 | def test_attributes(self): | ||
427 | 38 | # All reference attributes are correctly stored. | ||
428 | 39 | ref = make_reference() | ||
429 | 40 | self.assertEqual('cs', ref.schema) | ||
430 | 41 | self.assertEqual('myuser', ref.user) | ||
431 | 42 | self.assertEqual('precise', ref.series) | ||
432 | 43 | self.assertEqual('juju-gui', ref.name) | ||
433 | 44 | self.assertEqual(42, ref.revision) | ||
434 | 45 | |||
435 | 46 | def test_revision_as_string(self): | ||
436 | 47 | # The reference revision is converted to an int. | ||
437 | 48 | ref = make_reference(revision='47') | ||
438 | 49 | self.assertEqual(47, ref.revision) | ||
439 | 50 | |||
440 | 51 | def test_string(self): | ||
441 | 52 | # The string representation of a reference is its URL. | ||
442 | 53 | tests = ( | ||
443 | 54 | (make_reference(), | ||
444 | 55 | 'cs:~myuser/precise/juju-gui-42'), | ||
445 | 56 | (make_reference(schema='local'), | ||
446 | 57 | 'local:~myuser/precise/juju-gui-42'), | ||
447 | 58 | (make_reference(user=''), | ||
448 | 59 | 'cs:precise/juju-gui-42'), | ||
449 | 60 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
450 | 61 | 'cs:~dalek/bundle/juju-gui'), | ||
451 | 62 | (make_reference(name='django', series='vivid', revision=0), | ||
452 | 63 | 'cs:~myuser/vivid/django-0'), | ||
453 | 64 | (make_reference(user='', revision=None), | ||
454 | 65 | 'cs:precise/juju-gui'), | ||
455 | 66 | ) | ||
456 | 67 | for ref, expected_value in tests: | ||
457 | 68 | self.assertEqual(expected_value, bytes(ref)) | ||
458 | 69 | |||
459 | 70 | def test_repr(self): | ||
460 | 71 | # A reference is correctly represented. | ||
461 | 72 | tests = ( | ||
462 | 73 | (make_reference(), | ||
463 | 74 | '<Reference: cs:~myuser/precise/juju-gui-42>'), | ||
464 | 75 | (make_reference(schema='local'), | ||
465 | 76 | '<Reference: local:~myuser/precise/juju-gui-42>'), | ||
466 | 77 | (make_reference(user=''), | ||
467 | 78 | '<Reference: cs:precise/juju-gui-42>'), | ||
468 | 79 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
469 | 80 | '<Reference: cs:~dalek/bundle/juju-gui>'), | ||
470 | 81 | (make_reference(name='django', series='vivid', revision=0), | ||
471 | 82 | '<Reference: cs:~myuser/vivid/django-0>'), | ||
472 | 83 | (make_reference(user='', revision=None), | ||
473 | 84 | '<Reference: cs:precise/juju-gui>'), | ||
474 | 85 | ) | ||
475 | 86 | for ref, expected_value in tests: | ||
476 | 87 | self.assertEqual(expected_value, repr(ref)) | ||
477 | 88 | |||
478 | 89 | def test_path(self): | ||
479 | 90 | # The reference path is properly returned as a URL string without the | ||
480 | 91 | # schema. | ||
481 | 92 | tests = ( | ||
482 | 93 | (make_reference(), | ||
483 | 94 | '~myuser/precise/juju-gui-42'), | ||
484 | 95 | (make_reference(schema='local'), | ||
485 | 96 | '~myuser/precise/juju-gui-42'), | ||
486 | 97 | (make_reference(user=''), | ||
487 | 98 | 'precise/juju-gui-42'), | ||
488 | 99 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
489 | 100 | '~dalek/bundle/juju-gui'), | ||
490 | 101 | (make_reference(name='django', series='vivid', revision=0), | ||
491 | 102 | '~myuser/vivid/django-0'), | ||
492 | 103 | (make_reference(user='', revision=None), | ||
493 | 104 | 'precise/juju-gui'), | ||
494 | 105 | ) | ||
495 | 106 | for ref, expected_value in tests: | ||
496 | 107 | self.assertEqual(expected_value, ref.path()) | ||
497 | 108 | |||
498 | 109 | def test_id(self): | ||
499 | 110 | # The reference id is correctly returned. | ||
500 | 111 | tests = ( | ||
501 | 112 | (make_reference(), | ||
502 | 113 | 'cs:~myuser/precise/juju-gui-42'), | ||
503 | 114 | (make_reference(schema='local'), | ||
504 | 115 | 'local:~myuser/precise/juju-gui-42'), | ||
505 | 116 | (make_reference(user=''), | ||
506 | 117 | 'cs:precise/juju-gui-42'), | ||
507 | 118 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
508 | 119 | 'cs:~dalek/bundle/juju-gui'), | ||
509 | 120 | (make_reference(name='django', series='vivid', revision=0), | ||
510 | 121 | 'cs:~myuser/vivid/django-0'), | ||
511 | 122 | (make_reference(user='', revision=None), | ||
512 | 123 | 'cs:precise/juju-gui'), | ||
513 | 124 | ) | ||
514 | 125 | for ref, expected_value in tests: | ||
515 | 126 | self.assertEqual(expected_value, ref.id()) | ||
516 | 127 | |||
517 | 128 | def test_jujucharms_id(self): | ||
518 | 129 | # It is possible to return the reference identifier in jujucharms.com. | ||
519 | 130 | tests = ( | ||
520 | 131 | (make_reference(), | ||
521 | 132 | 'u/myuser/juju-gui/precise/42'), | ||
522 | 133 | (make_reference(schema='local'), | ||
523 | 134 | 'u/myuser/juju-gui/precise/42'), | ||
524 | 135 | (make_reference(user=''), | ||
525 | 136 | 'juju-gui/precise/42'), | ||
526 | 137 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
527 | 138 | 'u/dalek/juju-gui'), | ||
528 | 139 | (make_reference(name='django', series='vivid', revision=0), | ||
529 | 140 | 'u/myuser/django/vivid/0'), | ||
530 | 141 | (make_reference(user='', revision=None), | ||
531 | 142 | 'juju-gui/precise'), | ||
532 | 143 | (make_reference(user='', series='bundle', revision=None), | ||
533 | 144 | 'juju-gui'), | ||
534 | 145 | ) | ||
535 | 146 | for ref, expected_value in tests: | ||
536 | 147 | self.assertEqual(expected_value, ref.jujucharms_id()) | ||
537 | 148 | |||
538 | 149 | def test_jujucharms_url(self): | ||
539 | 150 | # The corresponding charm or bundle page in jujucharms.com is correctly | ||
540 | 151 | # returned. | ||
541 | 152 | tests = ( | ||
542 | 153 | (make_reference(), | ||
543 | 154 | 'u/myuser/juju-gui/precise/42'), | ||
544 | 155 | (make_reference(schema='local'), | ||
545 | 156 | 'u/myuser/juju-gui/precise/42'), | ||
546 | 157 | (make_reference(user=''), | ||
547 | 158 | 'juju-gui/precise/42'), | ||
548 | 159 | (make_reference(user='dalek', revision=None, series='bundle'), | ||
549 | 160 | 'u/dalek/juju-gui'), | ||
550 | 161 | (make_reference(name='django', series='vivid', revision=0), | ||
551 | 162 | 'u/myuser/django/vivid/0'), | ||
552 | 163 | (make_reference(user='', revision=None), | ||
553 | 164 | 'juju-gui/precise'), | ||
554 | 165 | (make_reference(user='', series='bundle', revision=None), | ||
555 | 166 | 'juju-gui'), | ||
556 | 167 | ) | ||
557 | 168 | for ref, expected_value in tests: | ||
558 | 169 | expected_url = settings.JUJUCHARMS_URL + expected_value | ||
559 | 170 | self.assertEqual(expected_url, ref.jujucharms_url()) | ||
560 | 171 | |||
561 | 172 | def test_charm_entity(self): | ||
562 | 173 | # The is_bundle method returns False for charm references. | ||
563 | 174 | ref = make_reference(series='vivid') | ||
564 | 175 | self.assertFalse(ref.is_bundle()) | ||
565 | 176 | |||
566 | 177 | def test_bundle_entity(self): | ||
567 | 178 | # The is_bundle method returns True for bundle references. | ||
568 | 179 | ref = make_reference(series='bundle') | ||
569 | 180 | self.assertTrue(ref.is_bundle()) | ||
570 | 181 | |||
571 | 182 | def test_charm_store_entity(self): | ||
572 | 183 | # The is_local method returns False for charm store references. | ||
573 | 184 | ref = make_reference(schema='cs') | ||
574 | 185 | self.assertFalse(ref.is_local()) | ||
575 | 186 | |||
576 | 187 | def test_local_entity(self): | ||
577 | 188 | # The is_local method returns True for local references. | ||
578 | 189 | ref = make_reference(schema='local') | ||
579 | 190 | self.assertTrue(ref.is_local()) | ||
580 | 191 | |||
581 | 192 | def test_equality(self): | ||
582 | 193 | # Two references are equal if they have the same URL. | ||
583 | 194 | self.assertEqual(make_reference(), make_reference()) | ||
584 | 195 | self.assertEqual(make_reference(user=''), make_reference(user='')) | ||
585 | 196 | self.assertEqual( | ||
586 | 197 | make_reference(revision=None), make_reference(revision=None)) | ||
587 | 198 | |||
588 | 199 | def test_equality_different_references(self): | ||
589 | 200 | # Two references with different attributes are not equal. | ||
590 | 201 | tests = ( | ||
591 | 202 | (make_reference(schema='cs'), | ||
592 | 203 | make_reference(schema='local')), | ||
593 | 204 | (make_reference(user=''), | ||
594 | 205 | make_reference(user='who')), | ||
595 | 206 | (make_reference(series='trusty'), | ||
596 | 207 | make_reference(series='vivid')), | ||
597 | 208 | (make_reference(name='django'), | ||
598 | 209 | make_reference(name='rails')), | ||
599 | 210 | (make_reference(revision=0), | ||
600 | 211 | make_reference(revision=1)), | ||
601 | 212 | (make_reference(revision=None), | ||
602 | 213 | make_reference(revision=42)), | ||
603 | 214 | ) | ||
604 | 215 | for ref1, ref2 in tests: | ||
605 | 216 | self.assertNotEqual(ref1, ref2) | ||
606 | 217 | |||
607 | 218 | def test_equality_different_types(self): | ||
608 | 219 | # A reference never equals a non-reference object. | ||
609 | 220 | self.assertNotEqual(make_reference(), 42) | ||
610 | 221 | self.assertNotEqual(make_reference(), True) | ||
611 | 222 | self.assertNotEqual(make_reference(), 'oranges') | ||
612 | 223 | |||
613 | 224 | def test_charmworld_id(self): | ||
614 | 225 | # By default, the reference id in charmworld is set to None. | ||
615 | 226 | # XXX frankban 2015-02-26: remove this test once we get rid of the | ||
616 | 227 | # charmworld id concept. | ||
617 | 228 | ref = make_reference() | ||
618 | 229 | self.assertIsNone(ref.charmworld_id) | ||
619 | 230 | |||
620 | 231 | |||
621 | 232 | class TestReferenceFromFullyQualifiedUrl( | ||
622 | 233 | helpers.ValueErrorTestsMixin, unittest.TestCase): | ||
623 | 234 | |||
624 | 235 | def test_no_schema_error(self): | ||
625 | 236 | # A ValueError is raised if the URL schema is missing. | ||
626 | 237 | expected_error = 'URL has no schema: precise/juju-gui' | ||
627 | 238 | with self.assert_value_error(expected_error): | ||
628 | 239 | references.Reference.from_fully_qualified_url('precise/juju-gui') | ||
629 | 240 | |||
630 | 241 | def test_invalid_schema_error(self): | ||
631 | 242 | # A ValueError is raised if the URL schema is not valid. | ||
632 | 243 | expected_error = 'URL has invalid schema: http' | ||
633 | 244 | with self.assert_value_error(expected_error): | ||
634 | 245 | references.Reference.from_fully_qualified_url( | ||
635 | 246 | 'http:precise/juju-gui') | ||
636 | 247 | |||
637 | 248 | def test_invalid_user_form_error(self): | ||
638 | 249 | # A ValueError is raised if the user form is not valid. | ||
639 | 250 | expected_error = 'URL has invalid user name form: jean-luc' | ||
640 | 251 | with self.assert_value_error(expected_error): | ||
641 | 252 | references.Reference.from_fully_qualified_url( | ||
642 | 253 | 'cs:jean-luc/precise/juju-gui') | ||
643 | 254 | |||
644 | 255 | def test_invalid_user_name_error(self): | ||
645 | 256 | # A ValueError is raised if the user name is not valid. | ||
646 | 257 | expected_error = 'URL has invalid user name: jean:luc' | ||
647 | 258 | with self.assert_value_error(expected_error): | ||
648 | 259 | references.Reference.from_fully_qualified_url( | ||
649 | 260 | 'cs:~jean:luc/precise/juju-gui') | ||
650 | 261 | |||
651 | 262 | def test_local_user_name_error(self): | ||
652 | 263 | # A ValueError is raised if a user is specified on a local entity. | ||
653 | 264 | expected_error = ( | ||
654 | 265 | 'local entity URL with user name: ' | ||
655 | 266 | 'local:~jean-luc/precise/juju-gui') | ||
656 | 267 | with self.assert_value_error(expected_error): | ||
657 | 268 | references.Reference.from_fully_qualified_url( | ||
658 | 269 | 'local:~jean-luc/precise/juju-gui') | ||
659 | 270 | |||
660 | 271 | def test_invalid_form_error(self): | ||
661 | 272 | # A ValueError is raised if the URL is not valid. | ||
662 | 273 | expected_error = 'URL has invalid form: cs:~user/series/name/what-?' | ||
663 | 274 | with self.assert_value_error(expected_error): | ||
664 | 275 | references.Reference.from_fully_qualified_url( | ||
665 | 276 | 'cs:~user/series/name/what-?') | ||
666 | 277 | |||
667 | 278 | def test_invalid_series_error(self): | ||
668 | 279 | # A ValueError is raised if the series is not valid. | ||
669 | 280 | expected_error = 'URL has invalid series: boo!' | ||
670 | 281 | with self.assert_value_error(expected_error): | ||
671 | 282 | references.Reference.from_fully_qualified_url( | ||
672 | 283 | 'cs:boo!/juju-gui-42') | ||
673 | 284 | |||
674 | 285 | def test_no_revision_error(self): | ||
675 | 286 | # A ValueError is raised if the entity revision is missing. | ||
676 | 287 | expected_error = 'URL has no revision: cs:series/name' | ||
677 | 288 | with self.assert_value_error(expected_error): | ||
678 | 289 | references.Reference.from_fully_qualified_url('cs:series/name') | ||
679 | 290 | |||
680 | 291 | def test_invalid_revision_error(self): | ||
681 | 292 | # A ValueError is raised if the charm or bundle revision is not valid. | ||
682 | 293 | expected_error = 'URL has invalid revision: revision' | ||
683 | 294 | with self.assert_value_error(expected_error): | ||
684 | 295 | references.Reference.from_fully_qualified_url( | ||
685 | 296 | 'cs:series/name-revision') | ||
686 | 297 | |||
687 | 298 | def test_invalid_name_error(self): | ||
688 | 299 | # A ValueError is raised if the entity name is not valid. | ||
689 | 300 | expected_error = 'URL has invalid name: not:valid' | ||
690 | 301 | with self.assert_value_error(expected_error): | ||
691 | 302 | references.Reference.from_fully_qualified_url( | ||
692 | 303 | 'cs:precise/not:valid-42') | ||
693 | 304 | |||
694 | 305 | def test_success(self): | ||
695 | 306 | # References are correctly instantiated by parsing the fully qualified | ||
696 | 307 | # URL. | ||
697 | 308 | tests = ( | ||
698 | 309 | ('cs:~myuser/precise/juju-gui-42', | ||
699 | 310 | make_reference()), | ||
700 | 311 | ('cs:trusty/juju-gui-42', | ||
701 | 312 | make_reference(user='', series='trusty')), | ||
702 | 313 | ('local:precise/juju-gui-42', | ||
703 | 314 | make_reference(schema='local', user='')), | ||
704 | 315 | ) | ||
705 | 316 | for url, expected_ref in tests: | ||
706 | 317 | ref = references.Reference.from_fully_qualified_url(url) | ||
707 | 318 | self.assertEqual(expected_ref, ref) | ||
708 | 319 | |||
709 | 320 | |||
710 | 321 | class TestReferenceFromJujucharmsUrl( | ||
711 | 322 | helpers.ValueErrorTestsMixin, unittest.TestCase): | ||
712 | 323 | |||
713 | 324 | def test_invalid_form(self): | ||
714 | 325 | # A ValueError is raised if the URL is not valid. | ||
715 | 326 | expected_error = 'invalid bundle URL: bad wolf' | ||
716 | 327 | with self.assert_value_error(expected_error): | ||
717 | 328 | references.Reference.from_jujucharms_url('bad wolf') | ||
718 | 329 | |||
719 | 330 | def test_success(self): | ||
720 | 331 | # A reference is correctly created from a jujucharms.com identifier or | ||
721 | 332 | # complete URL. | ||
722 | 333 | tests = ( | ||
723 | 334 | # Check with both user and revision. | ||
724 | 335 | ('u/myuser/mediawiki/42', | ||
725 | 336 | make_reference(series='bundle', name='mediawiki')), | ||
726 | 337 | ('/u/myuser/mediawiki/42', | ||
727 | 338 | make_reference(series='bundle', name='mediawiki')), | ||
728 | 339 | ('u/myuser/django-scalable/42/', | ||
729 | 340 | make_reference(series='bundle', name='django-scalable')), | ||
730 | 341 | ('{}u/myuser/mediawiki/42'.format(settings.JUJUCHARMS_URL), | ||
731 | 342 | make_reference(series='bundle', name='mediawiki')), | ||
732 | 343 | ('{}u/myuser/mediawiki/42/'.format(settings.JUJUCHARMS_URL), | ||
733 | 344 | make_reference(series='bundle', name='mediawiki')), | ||
734 | 345 | |||
735 | 346 | # Check without revision. | ||
736 | 347 | ('u/myuser/mediawiki', | ||
737 | 348 | make_reference(series='bundle', name='mediawiki', revision=None)), | ||
738 | 349 | ('/u/myuser/wordpress', | ||
739 | 350 | make_reference(series='bundle', name='wordpress', revision=None)), | ||
740 | 351 | ('u/myuser/mediawiki/', | ||
741 | 352 | make_reference(series='bundle', name='mediawiki', revision=None)), | ||
742 | 353 | ('{}u/myuser/django'.format(settings.JUJUCHARMS_URL), | ||
743 | 354 | make_reference(series='bundle', name='django', revision=None)), | ||
744 | 355 | ('{}u/myuser/mediawiki/'.format(settings.JUJUCHARMS_URL), | ||
745 | 356 | make_reference(series='bundle', name='mediawiki', revision=None)), | ||
746 | 357 | |||
747 | 358 | # Check without the user. | ||
748 | 359 | ('rails-single/42', | ||
749 | 360 | make_reference(user='', series='bundle', name='rails-single')), | ||
750 | 361 | ('/mediawiki/42', | ||
751 | 362 | make_reference(user='', series='bundle', name='mediawiki')), | ||
752 | 363 | ('rails-scalable/42/', | ||
753 | 364 | make_reference(user='', series='bundle', name='rails-scalable')), | ||
754 | 365 | ('{}mediawiki/42'.format(settings.JUJUCHARMS_URL), | ||
755 | 366 | make_reference(user='', series='bundle', name='mediawiki')), | ||
756 | 367 | ('{}django/42/'.format(settings.JUJUCHARMS_URL), | ||
757 | 368 | make_reference(user='', series='bundle', name='django')), | ||
758 | 369 | |||
759 | 370 | # Check without user and revision. | ||
760 | 371 | ('mediawiki', | ||
761 | 372 | make_reference(user='', series='bundle', name='mediawiki', | ||
762 | 373 | revision=None)), | ||
763 | 374 | ('/wordpress', | ||
764 | 375 | make_reference(user='', series='bundle', name='wordpress', | ||
765 | 376 | revision=None)), | ||
766 | 377 | ('mediawiki/', | ||
767 | 378 | make_reference(user='', series='bundle', name='mediawiki', | ||
768 | 379 | revision=None)), | ||
769 | 380 | ('{}django'.format(settings.JUJUCHARMS_URL), | ||
770 | 381 | make_reference(user='', series='bundle', name='django', | ||
771 | 382 | revision=None)), | ||
772 | 383 | ('{}mediawiki/'.format(settings.JUJUCHARMS_URL), | ||
773 | 384 | make_reference(user='', series='bundle', name='mediawiki', | ||
774 | 385 | revision=None)), | ||
775 | 386 | |||
776 | 387 | # Check charm entities. | ||
777 | 388 | ('mediawiki/trusty/0', | ||
778 | 389 | make_reference(user='', series='trusty', name='mediawiki', | ||
779 | 390 | revision=0)), | ||
780 | 391 | ('/wordpress/precise', | ||
781 | 392 | make_reference(user='', series='precise', name='wordpress', | ||
782 | 393 | revision=None)), | ||
783 | 394 | ('u/who/rails/vivid', | ||
784 | 395 | make_reference(user='who', series='vivid', name='rails', | ||
785 | 396 | revision=None)), | ||
786 | 397 | ) | ||
787 | 398 | for url, expected_ref in tests: | ||
788 | 399 | ref = references.Reference.from_jujucharms_url(url) | ||
789 | 400 | self.assertEqual(expected_ref, ref) | ||
790 | 401 | 0 | ||
791 | === modified file 'quickstart/tests/test_app.py' | |||
792 | --- quickstart/tests/test_app.py 2015-03-10 11:08:00 +0000 | |||
793 | +++ quickstart/tests/test_app.py 2015-04-21 10:32:19 +0000 | |||
794 | @@ -23,6 +23,7 @@ | |||
795 | 23 | import os | 23 | import os |
796 | 24 | import unittest | 24 | import unittest |
797 | 25 | 25 | ||
798 | 26 | from jujubundlelib import references | ||
799 | 26 | import jujuclient | 27 | import jujuclient |
800 | 27 | import mock | 28 | import mock |
801 | 28 | import yaml | 29 | import yaml |
802 | @@ -32,10 +33,7 @@ | |||
803 | 32 | platform_support, | 33 | platform_support, |
804 | 33 | settings, | 34 | settings, |
805 | 34 | ) | 35 | ) |
810 | 35 | from quickstart.models import ( | 36 | from quickstart.models import bundles |
807 | 36 | bundles, | ||
808 | 37 | references, | ||
809 | 38 | ) | ||
811 | 39 | from quickstart.tests import helpers | 37 | from quickstart.tests import helpers |
812 | 40 | 38 | ||
813 | 41 | 39 | ||
814 | 42 | 40 | ||
815 | === modified file 'quickstart/tests/test_charmstore.py' | |||
816 | --- quickstart/tests/test_charmstore.py 2015-03-10 10:18:58 +0000 | |||
817 | +++ quickstart/tests/test_charmstore.py 2015-04-21 10:32:19 +0000 | |||
818 | @@ -18,16 +18,16 @@ | |||
819 | 18 | 18 | ||
820 | 19 | from __future__ import unicode_literals | 19 | from __future__ import unicode_literals |
821 | 20 | 20 | ||
822 | 21 | import json | ||
823 | 21 | import unittest | 22 | import unittest |
824 | 22 | 23 | ||
826 | 23 | import json | 24 | from jujubundlelib import references |
827 | 24 | 25 | ||
828 | 25 | from quickstart import ( | 26 | from quickstart import ( |
829 | 26 | charmstore, | 27 | charmstore, |
830 | 27 | netutils, | 28 | netutils, |
831 | 28 | settings, | 29 | settings, |
832 | 29 | ) | 30 | ) |
833 | 30 | from quickstart.models import references | ||
834 | 31 | from quickstart.tests import helpers | 31 | from quickstart.tests import helpers |
835 | 32 | 32 | ||
836 | 33 | 33 | ||
837 | 34 | 34 | ||
838 | === modified file 'quickstart/tests/test_jujutools.py' | |||
839 | --- quickstart/tests/test_jujutools.py 2015-02-26 18:57:25 +0000 | |||
840 | +++ quickstart/tests/test_jujutools.py 2015-04-21 10:32:19 +0000 | |||
841 | @@ -20,11 +20,11 @@ | |||
842 | 20 | 20 | ||
843 | 21 | import unittest | 21 | import unittest |
844 | 22 | 22 | ||
845 | 23 | from jujubundlelib import references | ||
846 | 23 | import mock | 24 | import mock |
847 | 24 | import yaml | 25 | import yaml |
848 | 25 | 26 | ||
849 | 26 | from quickstart import jujutools | 27 | from quickstart import jujutools |
850 | 27 | from quickstart.models import references | ||
851 | 28 | from quickstart.tests import helpers | 28 | from quickstart.tests import helpers |
852 | 29 | 29 | ||
853 | 30 | 30 | ||
854 | 31 | 31 | ||
855 | === modified file 'quickstart/tests/test_manage.py' | |||
856 | --- quickstart/tests/test_manage.py 2015-02-26 19:12:17 +0000 | |||
857 | +++ quickstart/tests/test_manage.py 2015-04-21 10:32:19 +0000 | |||
858 | @@ -26,6 +26,7 @@ | |||
859 | 26 | import StringIO as io | 26 | import StringIO as io |
860 | 27 | import unittest | 27 | import unittest |
861 | 28 | 28 | ||
862 | 29 | from jujubundlelib import references | ||
863 | 29 | import mock | 30 | import mock |
864 | 30 | import yaml | 31 | import yaml |
865 | 31 | 32 | ||
866 | @@ -42,7 +43,6 @@ | |||
867 | 42 | bundles, | 43 | bundles, |
868 | 43 | envs, | 44 | envs, |
869 | 44 | jenv, | 45 | jenv, |
870 | 45 | references, | ||
871 | 46 | ) | 46 | ) |
872 | 47 | from quickstart.tests import helpers | 47 | from quickstart.tests import helpers |
873 | 48 | 48 | ||
874 | 49 | 49 | ||
875 | === modified file 'tox.ini' | |||
876 | --- tox.ini 2015-02-27 10:30:20 +0000 | |||
877 | +++ tox.ini 2015-04-21 10:32:19 +0000 | |||
878 | @@ -72,6 +72,7 @@ | |||
879 | 72 | # See https://launchpad.net/~juju/+archive/ubuntu/stable. | 72 | # See https://launchpad.net/~juju/+archive/ubuntu/stable. |
880 | 73 | websocket-client==0.18.0 | 73 | websocket-client==0.18.0 |
881 | 74 | jujuclient==0.50.1 | 74 | jujuclient==0.50.1 |
882 | 75 | jujubundlelib==0.1.1 | ||
883 | 75 | urwid==1.2.1 | 76 | urwid==1.2.1 |
884 | 76 | # The distribution PyYAML requirement is used in this case. | 77 | # The distribution PyYAML requirement is used in this case. |
885 | 77 | 78 | ||
886 | @@ -81,6 +82,7 @@ | |||
887 | 81 | # Ubuntu 14.04 (trusty) distro dependencies. | 82 | # Ubuntu 14.04 (trusty) distro dependencies. |
888 | 82 | websocket-client==0.12.0 | 83 | websocket-client==0.12.0 |
889 | 83 | jujuclient==0.17.5 | 84 | jujuclient==0.17.5 |
890 | 85 | jujubundlelib==0.1.1 | ||
891 | 84 | PyYAML==3.10 | 86 | PyYAML==3.10 |
892 | 85 | urwid==1.1.1 | 87 | urwid==1.1.1 |
893 | 86 | 88 | ||
894 | @@ -90,6 +92,7 @@ | |||
895 | 90 | # Ubuntu 14.10 (utopic) distro dependencies. | 92 | # Ubuntu 14.10 (utopic) distro dependencies. |
896 | 91 | websocket-client==0.12.0 | 93 | websocket-client==0.12.0 |
897 | 92 | jujuclient==0.17.5 | 94 | jujuclient==0.17.5 |
898 | 95 | jujubundlelib==0.1.1 | ||
899 | 93 | PyYAML==3.11 | 96 | PyYAML==3.11 |
900 | 94 | urwid==1.2.1 | 97 | urwid==1.2.1 |
901 | 95 | 98 | ||
902 | @@ -99,6 +102,7 @@ | |||
903 | 99 | # Ubuntu 15.04 (vivid) distro dependencies. | 102 | # Ubuntu 15.04 (vivid) distro dependencies. |
904 | 100 | websocket-client==0.18.0 | 103 | websocket-client==0.18.0 |
905 | 101 | jujuclient==0.18.5 | 104 | jujuclient==0.18.5 |
906 | 105 | jujubundlelib==0.1.1 | ||
907 | 102 | PyYAML==3.11 | 106 | PyYAML==3.11 |
908 | 103 | urwid==1.2.1 | 107 | urwid==1.2.1 |
909 | 104 | 108 |
Reviewers: mp+256906_ code.launchpad. net,
Message:
Please take a look.
Description:
Introduce jujubundlelib dependency.
Use the Reference model defined there.
https:/ /code.launchpad .net/~frankban/ juju-quickstart /jujubundlelib/ +merge/ 256906
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/228460043/
Affected files (+29, -639 lines): charmstore. py jujutools. py manage. py models/ bundles. py models/ references. py tests/models/ test_bundles. py tests/models/ test_references .py tests/test_ app.py tests/test_ charmstore. py tests/test_ jujutools. py tests/test_ manage. py
A [revision details]
M quickstart/app.py
M quickstart/
M quickstart/
M quickstart/
M quickstart/
D quickstart/
M quickstart/
D quickstart/
M quickstart/
M quickstart/
M quickstart/
M quickstart/
M tox.ini