Merge lp://staging/~vishvananda/nova/lp781291 into lp://staging/~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Devin Carlen | ||||||||
| Approved revision: | 1064 | ||||||||
| Merged at revision: | 1065 | ||||||||
| Proposed branch: | lp://staging/~vishvananda/nova/lp781291 | ||||||||
| Merge into: | lp://staging/~hudson-openstack/nova/trunk | ||||||||
| Diff against target: |
111 lines (+29/-5) 6 files modified
bin/nova-manage (+1/-1) nova/api/ec2/cloud.py (+1/-1) nova/api/ec2/ec2utils.py (+4/-1) nova/exception.py (+4/-0) nova/tests/test_api.py (+18/-1) nova/tests/test_utils.py (+1/-1) |
||||||||
| To merge this branch: | bzr merge lp://staging/~vishvananda/nova/lp781291 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Devin Carlen (community) | Approve | ||
| Brian Waldon (community) | Approve | ||
| Christopher MacGown (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fixes an issue with conversion of images that was introduced by exception refactoring. This makes the exceptions when trying to locate an ec2 id clearer and also adds some tests for the conversion methods.
To post a comment you must log in.
Revision history for this message
| Christopher MacGown (0x44) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good to have the tests so I don't break it again in the future :)