Merge lp://qastaging/~mcgrue/nova/volume-cleanup into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Ben McGraw
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~mcgrue/nova/volume-cleanup |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Diff against target: |
785 lines (+98/-364) 15 files modified
Authors (+1/-0) bin/nova-manage (+2/-3) doc/source/runnova/getting.started.rst (+0/-1) nova/db/api.py (+1/-35) nova/db/sqlalchemy/api.py (+0/-55) nova/db/sqlalchemy/migrate_repo/versions/042_kill_export_devices.py (+51/-0) nova/db/sqlalchemy/migration.py (+1/-1) nova/db/sqlalchemy/models.py (+0/-16) nova/exception.py (+0/-4) nova/tests/fake_flags.py (+0/-4) nova/tests/integrated/test_volumes.py (+5/-5) nova/tests/test_volume.py (+2/-80) nova/volume/driver.py (+28/-146) nova/volume/manager.py (+7/-11) nova/volume/san.py (+0/-3) |
To merge this branch: | bzr merge lp://qastaging/~mcgrue/nova/volume-cleanup |
Related bugs: | |
Related blueprints: |
Volume Code cleanup
(Medium)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thierry Carrez (community) | ffe | Disapprove | |
Soren Hansen (community) | Needs Fixing | ||
Jay Pipes (community) | Needs Information | ||
Rick Harris (community) | Needs Fixing | ||
Review via email:
|
Description of the change
Stage 1 of the AES removal / volume cleanup work.
To post a comment you must log in.
Unmerged revisions
- 1484. By Ben McGraw
-
resolving conflicts.
Looks good, just a couple of small pep8 violations:
nova/db/ sqlalchemy/ migrate_ repo/versions/ 037_kill_ export_ devices. py:38:1: E302 expected 2 blank lines, found 1 migrate_ engine) :
def downgrade(
^
Separate top-level function and class definitions with two blank lines.
Method definitions inside a class are separated by a single blank line.
Extra blank lines may be used (sparingly) to separate groups of related
functions. Blank lines may be omitted between a bunch of related
one-liners (e.g. a set of dummy implementations).
Use blank lines in functions, sparingly, to indicate logical sections.
Okay: def a():\n pass\n\n\ndef b():\n pass
Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass
E301: class Foo:\n b = 0\n def bar():\n pass sqlalchemy/ migrate_ repo/versions/ 037_kill_ export_ devices. py:47:1: E302 expected 2 blank lines, found 1 migrate_ engine) :
E302: def a():\n pass\n\ndef b(n):\n pass
E303: def a():\n pass\n\n\n\ndef b(n):\n pass
E303: def a():\n\n\n\n pass
E304: @decorator\n\ndef a():\n pass
nova/db/
def upgrade(
^
Separate top-level function and class definitions with two blank lines.
Method definitions inside a class are separated by a single blank line.
Extra blank lines may be used (sparingly) to separate groups of related
functions. Blank lines may be omitted between a bunch of related
one-liners (e.g. a set of dummy implementations).
Use blank lines in functions, sparingly, to indicate logical sections.
Okay: def a():\n pass\n\n\ndef b():\n pass
Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass
E301: class Foo:\n b = 0\n def bar():\n pass
E302: def a():\n pass\n\ndef b(n):\n pass
E303: def a():\n pass\n\n\n\ndef b(n):\n pass
E303: def a():\n\n\n\n pass
E304: @decorator\n\ndef a():\n pass