Merge lp://qastaging/~justin-fathomdb/nova/justinsb-openstack-api-volumes into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
justinsb
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~justin-fathomdb/nova/justinsb-openstack-api-volumes |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Prerequisite: | lp://qastaging/~justin-fathomdb/nova/servicify-nova-api |
Diff against target: |
1411 lines (+1117/-53) 18 files modified
nova/api/ec2/cloud.py (+14/-40) nova/api/keys.py (+93/-0) nova/api/openstack/__init__.py (+14/-0) nova/api/openstack/keys.py (+122/-0) nova/api/openstack/volumes.py (+160/-0) nova/cloudpipe/pipelib.py (+2/-1) nova/compute/api.py (+2/-1) nova/db/api.py (+2/-2) nova/db/sqlalchemy/api.py (+17/-6) nova/tests/integrated/__init__.py (+20/-0) nova/tests/integrated/api/__init__.py (+20/-0) nova/tests/integrated/api/client.py (+184/-0) nova/tests/integrated/integrated_helpers.py (+184/-0) nova/tests/integrated/test_keys.py (+84/-0) nova/tests/integrated/test_volumes.py (+130/-0) nova/tests/test_api.py (+2/-1) nova/tests/test_cloud.py (+3/-2) nova/volume/driver.py (+64/-0) |
To merge this branch: | bzr merge lp://qastaging/~justin-fathomdb/nova/justinsb-openstack-api-volumes |
Related bugs: | |
Related blueprints: |
Achieve Stability in Cactus
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vish Ishaya (community) | Needs Information | ||
Review via email:
|
This proposal supersedes a proposal from 2011-02-23.
Description of the change
Create unit tests for volumes and (for-testing-
To post a comment you must log in.
Unmerged revisions
- 727. By justinsb
-
Fixed unit tests to derive from standard nova unit tests; was able to use fake_rabbit and remove the flags code duplication
- 726. By justinsb
-
Add an import for a missing flag
- 725. By justinsb
-
Merged with trunk
- 724. By justinsb
-
Merged with upstream branch
- 723. By justinsb
-
ApiService has moved
- 722. By justinsb
-
Merged with pre-req branch
- 721. By justinsb
-
Re-remove the problematic sqlalchemy fix that somehow made it back into this branch
- 720. By justinsb
-
Merged servicify branch
- 719. By justinsb
-
Another style issue (2 blank lines)
- 718. By justinsb
-
PEP8 / Style issues
looks like this requires your api service branch. I would resubmit it using that as a prerequisite branch so it doesn't pollute the diff (it is in extra options when you propose merge)