summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merged flavor_swap extension into core APIAlexei Kornienko2013-06-275-126/+50
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements blueprint nova-v3-api Change-Id: Ib58afac2159b25a38165882375e6d6ac57dc6da5
* | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-2941-18260/+47815
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-2841-18260/+47815
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2c4e2fd0303edec73bbf04dff8f3ef689686e2e
* | | | | | | | | | | | | Merge "Report the az based on the value in the instance table."Jenkins2013-06-285-14/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Report the az based on the value in the instance table.Joshua Harlow2013-06-265-14/+94
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When attempting to find the availability zone of an instance do so by first trying to locate the availability zone of the host the instance is active on. If that fails then attempt to use the value that is in the instances 'availability_zone' key instead. For the caching used in the availability_zones module there was a new method added to get and reset the cache that is useful for unit tests, since during each run of a test you do not want to be affected by something in cache from a previous test. Fixes bug 1172246 Change-Id: I6f54a44cc87434120656ccc789cebcc08d434418
* | | | | | | | | | | | | Merge "Fix sqlalchemy utils."Jenkins2013-06-282-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix sqlalchemy utils.Yuriy Zveryanskyy2013-06-272-4/+39
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch affects drop_unique_constraint() on sqlite engine. 1. Fix error for tables with foreign key(s). 2. Now work with tables contains reserved words in column names ("key" for example). Fix bug 1195216. Change-Id: Idc4dfa5006eee115f578b00d675cae1d6241ec69
* | | | | | | | | | | | | Merge "Port flavor_disabled extension to v3 API Part 2"Jenkins2013-06-285-27/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Port flavor_disabled extension to v3 API Part 2Alexei Kornienko2013-06-275-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports the flavor_disabled extension and the corresponding unittests to the v3 framework. Partially implements blueprint nova-v3-api Change-Id: I8af3f69ebc0584b79499e2695d6120c7c0833d24
* | | | | | | | | | | | | | Merge "Port flavor_disabled extension to v3 API Part 1"Jenkins2013-06-282-0/+195
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Port flavor_disabled extension to v3 API Part 1Alexei Kornienko2013-06-272-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Partially implements blueprint nova-v3-api Change-Id: I01688d7f9d976b7e406d46283c6d0010ddc3476a
* | | | | | | | | | | | | | Merge "VNC console does not work with VCDriver"Jenkins2013-06-286-13/+308
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | VNC console does not work with VCDriverhartsocks2013-06-276-13/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces get_vnc_console_vcenter as a way to get a modified vnc_console object that connects to the ESXi host underneath vCenter control. * adds new fake classes for testing * documents classes, methods & API logic fixes bug: #1178369 Change-Id: I48430cb9bc9615e02ca9af235f97853f3f0bdafd
* | | | | | | | | | | | | | | Merge "Port cells extension to v3 API Part 1"Jenkins2013-06-282-0/+821
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Port cells extension to v3 API Part 1Chris Yeoh2013-06-142-0/+821
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Partially implements blueprint nova-v3-api Change-Id: Ie629ee328d76a1595350b597c7874b430217c769
* | | | | | | | | | | | | | | Merge "Port server_diagnostics extension to v3 API Part1"Jenkins2013-06-282-0/+151
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Port server_diagnostics extension to v3 API Part1Chris Yeoh2013-06-172-0/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Implements blueprint nova-v3-api Change-Id: I52f906948b5873cf3fdfff14270c7384ee5e7b9f
* | | | | | | | | | | | | | | | Merge "Allow retrying network allocations separately"Jenkins2013-06-282-19/+147
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Allow retrying network allocations separatelyChris Behrens2013-06-262-19/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new config option, 'network_allocate_retries', that allows one to retry network allocations. The default is 0 for no retries to match the current behavior. The network allocations currently get retried by a full retry of a build via the scheduler, if those are enabled. This patch reduces the need to re-schedule for simple network allocation issues. The retrying happens in the network alloc async greenthread, so for virt drivers that support the new NetworkModel, the retrying potentially happens in the background while the image is being downloaded, etc. DocImpact Change-Id: I1a5fdcccbb736fc0b1d8c0cbc3b45a8372a6aef7
* | | | | | | | | | | | | | | | | Merge "db.compute_node_update: ignore values['update_at']"Jenkins2013-06-282-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | db.compute_node_update: ignore values['update_at']Peter Feiner2013-06-262-2/+14
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When individual instances are updated (e.g., during spawn and terminate), ResourceTracker (in nova.compute.resource_tracker) calls compute_node_update with values=self.compute_node. Since self.compute_node is an instance of ComputeNode that was retrieved from the database, it has updated_at set. Since updated_at is in values, sqlalchemy doesn't automatically change the record's updated_at column (see nova.openstack.common.db.sqlalchemy.models.TimestampMixin). Moreover, since updated_at is set to the last value's updated_at, updated_at effectively doesn't change until values without updated_at are sent, which only happens during the periodic task that calls ResourceTracker.update_available_resources. Nova-scheduler relies on ComputeNode.updated_at to keep its model of available resources up-to-date. In particular, nova-scheduler doesn't play a role in instance termination, so it doesn't account for freed resources until ComputeNode.updated_at changes. Thus, between nova-compute's periodic calls to ResourceTracker.update_available_resources, nova-scheduler's model of available resources monotonically decreases. If, for example, a node has resources for 10 instances, and you manage to boot 10, terminate 10, then attempt to boot another before the end of the period, nova-scheduler won't schedule the new instance on the vacant node. Fixes bug #1194900. Note that f398b9e195cda582bad57396b097dec274384c07 fixed a separate issue (bug #1153778) related to ComputeNode.update_at being stale. Change-Id: Ifd1e56edfd811241816970715071876857de80d3
* | | | | | | | | | | | | | | | | Merge "Port images functionality to v3 API Part 1"Jenkins2013-06-282-0/+1550
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Port images functionality to v3 API Part 1Chris Yeoh2013-06-282-0/+1550
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 implementation file into the appropriate v3 directory unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Note that this functionality will be moved from core to an extension. Consensus appears to be that we continue to need this functionality for v3 because some deployers disable the public image endpoint due security concerns and whether this will be fixed in glance for Havana. Deployers can disable this extension if they do not want it. Partially implements nova-v3-api Change-Id: I02b32b40b14a5593bf254ad9e6a78c14cb15ced5
* | | | | | | | | | | | | | | | | | Merge "Add AggregateRamFilter"Jenkins2013-06-283-5/+119
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add AggregateRamFilterQiu Yu2013-06-213-5/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint per-aggregate-resource-ratio * AggregateRamFilter to support per-aggregate ram_allocation_ratio * Falls back to global setting if per-aggregate value not found DocImpact Change-Id: I93e069f0ac3f595d9a2a17119274c7bfbe8fca31
* | | | | | | | | | | | | | | | | | | Merge "Add AggregateCoreFilter"Jenkins2013-06-283-4/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add AggregateCoreFilterQiu Yu2013-06-213-4/+105
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint per-aggregate-resource-ratio * AggregateCoreFilter to support per-aggregate cpu_allocation_ratio * Falls back to global setting if per-aggregate value not found DocImpact Change-Id: I9230f46e2490226f3c50d616aa173d4722095087
* | | | | | | | | | | | | | | | | | | Merge "Moves scheduler.manager._set_vm_state_and_notify to scheduler.utils"Jenkins2013-06-282-52/+54
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Moves scheduler.manager._set_vm_state_and_notify to scheduler.utilsTiago Mello2013-06-282-52/+54
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is required by the scheduler.manager.prep_resize method which is being moved to conductor.manager. We move it to scheduler.utils until we completely move migrations logic out of scheduler.manager. Partially implements bp cold-migrations-to-conductor Change-Id: I8203577fc26da5cc1039815e31fb8fe356d1f7d6
* | | | | | | | | | | | | | | | | | Merge "Ignore lifecycle events for non-existent instances"Jenkins2013-06-282-1/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Ignore lifecycle events for non-existent instancesPeter Feiner2013-06-272-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since event delivery is asynchronous, there's an inherent yet benign race in the event handler querying the database for a deleted instance. Fixes bug #1180501. Change-Id: I8e478fb13bedfc86730018ba849ecc71d4286f0d
* | | | | | | | | | | | | | | | | | Merge "Better default for my_ip if 8.8.8.8 is unreachable"Jenkins2013-06-283-1/+145
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Better default for my_ip if 8.8.8.8 is unreachableDavanum Srinivas2013-06-263-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run if route/show, extract ipv4 addresses and pick the first one. Fall back to 127.0.0.1 as before if we don't find anything or if we have running the ip route/show commands Fixes LP# 1193013 Change-Id: If73f0f6bf67f858f7506220debab0f74cc9e3cb4
* | | | | | | | | | | | | | | | | | Merge "No support for double nested 64 bit guest using VCDriver"Jenkins2013-06-281-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | No support for double nested 64 bit guest using VCDriverJacob Cherkas2013-06-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64bit instances launched on ESX via the VCDriver will not support running 64bit guests. There is an option that can be passed during the vmx creation that will allow for this to happen. This is very useful if you want to run hypervisors (esx, kvm) on top of ESX and then run 64bit VMs on top of those hypervisors. Fixes bug 1192256 Change-Id: Id6eb224c97569737cbb41f1b64f61805e1df004e
* | | | | | | | | | | | | | | | | | | Merge "Fix resizes with attached file-based volumes"Jenkins2013-06-273-6/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fix resizes with attached file-based volumesRafi Khardalian2013-06-273-6/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 1190364 get_instance_disk_info() now takes an additional, optional argument of block_device_info. When passed in, we use it to filter out volumes, such that they are not returned. Previously, any devices classified as "file" as parsed from the instance XML were considered local disks. This assumption is incorrect, since some volumes are simply files, rather than block devices. Added a new test, based almost entirely off the existing test case for this function, which represents an XML file with two fake file-based (NFS-like) volumes and associated block_device_info to claim those volumes. Change-Id: I4809a8fd68eb0f709347aa7cad0fa85389ade41c
* | | | | | | | | | | | | | | | | | | | Merge "Remove broken config_drive image_href support."Jenkins2013-06-279-94/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove broken config_drive image_href support.Chris Behrens2013-06-269-95/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image_href support has not been working since at least shortly before Folsom release. This is a good indication that this functionality is not used. As far as I can tell, the docs also do not match what was supported. An image ID was required, but docs show examples with full hrefs. DocImpact http://docs.openstack.org/developer/nova/api_ext/ext_config_drive.html References to supporting image_hrefs should be removed. This patch also removes the hack that passed a config_drive_id via the Instance dictionary when config_drive_id is not a valid Column for Instance. Fixes bug 1186401 Change-Id: Iced7bc8e278cb9f208183f1dbb7a293675a47eae
* | | | | | | | | | | | | | | | | | | | | Merge "Fix a couple typos in the nova.exception module"Jenkins2013-06-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix a couple typos in the nova.exception moduleMatt Riedemann2013-06-261-2/+2
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a couple of typos in localized user-facing strings in the nova.exception module. Fixes bug 1194944 Change-Id: Ia85e69c23832ab4fd9f56c525075bd30bf4b059e
* | | | | | | | | | | | | | | | | | | | Merge "Remove trivial cases of unused variables (3)"Jenkins2013-06-2720-130/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove trivial cases of unused variables (3)Stanislaw Pitucha2013-06-2720-130/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kill some of the variables marked as unused by flakes8. This should allow to enable F841 check in the future. Only trivial cases with no function calls and obviously pure functions (like datetime.now(), or len()) are cleaned up here. Part 3, split to reduce conflicts. Change-Id: I7b8e806ddd7b0e077243d4e31de140cd08fe0155
* | | | | | | | | | | | | | | | | | | | | Merge "Fix metadata access in prep for instance objects"Jenkins2013-06-274-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix metadata access in prep for instance objectsAlexei Kornienko2013-06-274-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to blueprint unified-object-model Fixes: bug #1192012 Change-Id: I8b708dc3d89fedfcb4bbf5d26b959da1298b0525
* | | | | | | | | | | | | | | | | | | | | | Merge "Baremetal_deploy_helper error message formatting."Jenkins2013-06-271-12/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Baremetal_deploy_helper error message formatting.Dan Prince2013-06-211-12/+13
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates our baremetal_deploy_helper so our error message use formatting that works with translations. Change-Id: I8811df50f0e80c5680e6316c829a197b0ade5967
* | | | | | | | | | | | | | | | | | | | | | Merge "Organize limits units and per-units constants"Jenkins2013-06-273-33/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Organize limits units and per-units constantsMauro S. M. Rodrigues2013-06-143-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During v3 api review there was an agreement that would be nice to move limits constants to utils file and refactor its usage inside limits api to avoid unnecessary code duplication. Also changed TestLimiter class to MockLimiter since that name can be confuse to some unit test frameworks. Change-Id: I1b8626e8d1e3257333d4dfee61591fd4cde82bd1
* | | | | | | | | | | | | | | | | | | | | | Merge "Sync db.models.Quota* with migrations."Jenkins2013-06-271-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |