Merge lp://qastaging/~vladimir.p/nova/admin-vm into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Vladimir Popovski
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~vladimir.p/nova/admin-vm |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Diff against target: |
2176 lines (+1311/-96) 20 files modified
Authors (+1/-0) bin/nova-manage (+120/-11) nova/api/ec2/admin.py (+16/-1) nova/api/ec2/cloud.py (+134/-18) nova/api/openstack/create_instance_helper.py (+15/-1) nova/api/openstack/servers.py (+9/-1) nova/cloudpipe/pipelib.py (+1/-0) nova/compute/api.py (+95/-47) nova/compute/instance_categories.py (+196/-0) nova/compute/manager.py (+3/-1) nova/db/api.py (+58/-2) nova/db/sqlalchemy/api.py (+160/-10) nova/db/sqlalchemy/migrate_repo/versions/029_add_instance_categories.py (+152/-0) nova/db/sqlalchemy/migration.py (+1/-1) nova/db/sqlalchemy/models.py (+19/-1) nova/exception.py (+17/-0) nova/flags.py (+10/-0) nova/tests/api/openstack/test_servers.py (+4/-0) nova/tests/test_instance_categories.py (+295/-0) nova/virt/libvirt/firewall.py (+5/-2) |
To merge this branch: | bzr merge lp://qastaging/~vladimir.p/nova/admin-vm |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Prince (community) | Needs Fixing | ||
Brian Lamar (community) | Needs Fixing | ||
Devin Carlen (community) | Needs Fixing | ||
Josh Kearney (community) | Needs Fixing | ||
Brian Waldon (community) | Needs Information | ||
Review via email:
|
This proposal supersedes a proposal from 2011-06-07.
Description of the change
First cut of Admin-VM changes:
- added instance categories. By default, all instances have 'regular' category assigned
- each category has default image_id
- new param "category" in ec2/openstack APIs
- filter admin instances/
To post a comment you must log in.
Unmerged revisions
- 1116. By Vladimir Popovski
-
replaced my fix for nova-api with community's
- 1115. By Vladimir Popovski
-
merged with 1222
- 1114. By Vladimir Popovski
-
merged with 1221
- 1113. By Vladimir Popovski
-
changed unit_test properties (otherwise was skipped)
- 1112. By Vladimir Popovski
-
Pep8 normalization
- 1111. By Vladimir Popovski
-
Admin-VM: merged with 1187
- 1110. By Vladimir Popovski
-
Admin-VM: merged with 1186
- 1109. By Vladimir Popovski
-
pep8 code normalization
- 1108. By Vladimir Popovski
-
Admin-VM: removed nova.conf (accidentally added)
- 1107. By Vladimir Popovski
-
Admin-VM: merged with nova trunk-1159
Hi Vladimir,
You have a number of merge conflicts that need to be resolved.