summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "Make utils.mkfs() set label when fs=swap"Jenkins2012-11-092-12/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make utils.mkfs() set label when fs=swapArata Notsu2012-11-102-12/+27
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And add some tests for utils.mkfs() Change-Id: I6bf439f2076d401259f07aef26720cd0f7dac61e
* / | | | | | | | | | | | | | Another case of dictionary accessJoshua Harlow2012-11-092-1/+84
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1076114 which was using the old dictionary access for getting the qemu image info 'file format' attribute which now should be through direct attribute access to 'file_format' instead. Change-Id: Id4c12b43b389b2fd2300d02743db17cf48b38e8f
* | | | | | | | | | | | | | Merge "make diagnostics workable for libvirt with Xen"Jenkins2012-11-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | make diagnostics workable for libvirt with XenChristian Berendt2012-11-081-1/+1
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using "diagnostics" with libvirt as driver on nova-compute and Xen as hypervisor the call to domain.memoryStats() in get_diagnostics() doesn't fail with a libvirt.libvirtError, but with an AttributeError. This exception should be catched, too. The method virDomainMemoryStats is not implemented in libvirt for Xen. fixes bug 1076527 Change-Id: I16645654b346e3c40ff3dd63f20600c802cbeb3f
* | | | | | | | | | | | | Merge "Limit formatting routes when adding resources"Jenkins2012-11-082-0/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Limit formatting routes when adding resourcesVishvananda Ishaya2012-11-082-0/+37
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, routes.mapper.Mapper.resource adds a bunch of formatted routes that accept anything after a '.'. Our spec says only .xml and .json are accepted so limit the formatting to those valuse. This allows identifiers with a '.' in urls. A few tests were added to the extensions test to prove that .xml and .json are stripped but other values are not. Change-Id: Ic888aa5d75050d6b14763c2a787ac8c8d5ab1f69
* | | | | | | | | | | | Merge "Make HostManager.get_all_host_states() return an iterator"Jenkins2012-11-084-24/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make HostManager.get_all_host_states() return an iteratorArata Notsu2012-11-084-24/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the method's returning from a dictionary {host: HostState} to an iterator for HostState, because the only caller of the method (in filter_scheduler.py) is not interested in its key. Change-Id: I84f649795a422e392a4c0d555c6cb29a01fae2d9
* | | | | | | | | | | | | Merge "Fix verification in test_api_samples.py"Jenkins2012-11-081-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix verification in test_api_samples.pyArata Notsu2012-11-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some regexps are corrected. Change-Id: I77bb6503352083254d8887b6cb513c45bcfae99c
* | | | | | | | | | | | | | Merge "Sync rpc from openstack-common."Jenkins2012-11-083-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Sync rpc from openstack-common.Russell Bryant2012-11-083-4/+5
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49771b9bb741f95ccc3ab0e8e8f7ce82849120e2
* | | | | | | | | | | | | Send instance_type to resize_instance.Russell Bryant2012-11-084-17/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send the instance_type as an argument to the resize_instance method in the compute rpc api. Previously, the code would look up the new instance_type's ID that is saved in the migration, and then look up the instance_type in the db using the ID. This removes another db read from the nova-compute service. Part of blueprint no-db-compute. Change-Id: Ica45cb94191e9418446056e4fb59d3b9337a41ec
* | | | | | | | | | | | | Remove instance_type db lookup in prep_resize.Russell Bryant2012-11-081-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a db read in prep_resize() by grabbing the instance_type data out of the instance dict. The code was unnecessarily looking it up from the db. Part of blueprint no-db-compute. Change-Id: I6e26a8a90f7cfca12426fad2430a0eb73991f42f
* | | | | | | | | | | | | Send all aggregate data to remove_aggregate_host.Russell Bryant2012-11-085-14/+21
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the remove_aggregate_host method of the compute rpc api to take in all of the aggregate data instead of looking it up from the db in the compute manager. This removes a db read from the nova-compute service. Part of blueprint no-db-compute. Change-Id: I8da3da264e358c14df97ba34d250e46c6cb577e2
* | | | | | | | | | | | Merge "Switch from FLAGS to CONF in nova.virt"Jenkins2012-11-0841-400/+409
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Switch from FLAGS to CONF in nova.virtMark McLoughlin2012-11-0741-400/+409
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the global CONF variable instead of FLAGS. This is purely a cleanup since FLAGS is already just another reference to CONF. We leave the nova.flags imports until a later cleanup commit since removing them may cause unpredictable problems due to config options not being registered. Change-Id: Icb61d67965628dca65bda393d4373beab5c5c64a
* | | | | | | | | | | | Merge "Switch from FLAGS to CONF in nova.console"Jenkins2012-11-086-33/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Switch from FLAGS to CONF in nova.consoleMark McLoughlin2012-11-076-33/+37
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the global CONF variable instead of FLAGS. This is purely a cleanup since FLAGS is already just another reference to CONF. We leave the nova.flags imports until a later cleanup commit since removing them may cause unpredictable problems due to config options not being registered. Change-Id: I155d363e26260aa402bb918b4d0726502e7e8758
* | | | | | | | | | | Merge "Corrects usage of db.api.network_get"Jenkins2012-11-082-1/+56
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Corrects usage of db.api.network_getJian Wen2012-11-072-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets project_only='allow_none' to get the network whose project_id is None or not. Fixes bug 1075215 Change-Id: I80622b1f5ccf194b4810bd0560bd0cdb077370df
* | | | | | | | | | | | Merge "Decouple EC2 API from using instance id"Jenkins2012-11-085-32/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Decouple EC2 API from using instance idMotoKen2012-11-075-32/+33
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continuation of 0dc32690fe158e4cb11c2c9bcc65acaf73b94a7a Some code in ec2 api use Instance.id rather than InstanceIdMapping.id directly while converting ec2 id to an instance object. This is very dangerous if Instance.id is not equal to InstanceIdMapping.id for the same instance uuid. To avoid the id mapping confusion, this patch: * uses instance_id_mappings.id instead of instances.id * uses instance_uuid in ec2utils.id_to_ec2_inst_id * removes ec2utils.ec2_instance_id_to_uuid Change-Id: I22638f667c18eefe542b03e31f1a3aa2ce782db7
* | | | | | | | | | | Merge "Refactor resource tracker claims and test logic."Jenkins2012-11-075-419/+433
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactor resource tracker claims and test logic.Brian Elliott2012-11-075-419/+433
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for adding resize support to resource tracker: * Claim class has been factored out of resource tracker. * Broke out claim testing logic for easier re-use This patch is pre-work to ease adding resize claims to resource tracker: bug 1065267 Change-Id: Ib0b856376417f140dc9ed114913f47a8a790b8a2
* | | | | | | | | | | Remove unused function require_instance_existsDavid Ripton2012-11-071-14/+0
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9862daebaadca4af0c1ec47ddb66e329cdce98a7
* | | | | | | | | | Remove out-of-date commentJohannes Erdfelt2012-11-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code now uses excutils, so the comment is out-of-date Change-Id: If04032999f1408ee8db8238b210d044d0a21f622
* | | | | | | | | | Merge "Fix bandwidth polling exception."Jenkins2012-11-072-3/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix bandwidth polling exception.Monsyne Dragon2012-11-052-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the bandwidth polling task tries to update bw usage for an instance that does not have an entry for the last two periods already in the bw_usage_cache table, it will throw an exception in the polling task. This was just a misses 'if' statement. Also: xenserver: fix swapped bw data in xs plugin. This fixes bug 1075255 Change-Id: I44bb143039fcdfc8dacb13b67ae8f79dc5f38777
* | | | | | | | | | Merge "libvirt: Regenerates xml instead of using on-disk"Jenkins2012-11-071-8/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | libvirt: Regenerates xml instead of using on-diskVishvananda Ishaya2012-11-061-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libvirt.xml file is written on initial boot of the instance and may not reflect the current state of the vm if volumes have been attached. If the libvirt definition of the vm has been lost, it is safer to regenerate it rather than attempt to load it from the outdated file. This should properly bring back vms with attached volumes. Fixes bug 1073720 Change-Id: Iaa754700a149f09fc0c022fa664c06ad17f505f5
* | | | | | | | | | Merge "Map NotAuthorized to 403 in floating ips extension"Jenkins2012-11-072-1/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Map NotAuthorized to 403 in floating ips extensionBrian Waldon2012-11-062-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a NotAuthorized exception is raised in the network manager, it would be presented as an HTTP 401 exception through the floating ips extension. This patch presents it as a 403 instead. Fixes bug 1074505 Change-Id: Idb45c78755a182635ef353bb9ec8b557c8ea9b16
* | | | | | | | | | | Merge "Forbid resizing instance to deleted instance types"Jenkins2012-11-072-5/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Forbid resizing instance to deleted instance typesJian Wen2012-11-042-5/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets read_deleted="no" while get_instance_type_by_flavor_id to forbid resizing instance to deleted instance types Fixes bug 1068539 Change-Id: I3859f63a33391a840e041f06f08af361b6d64157
* | | | | | | | | | | | Merge "Fix quota updating during soft delete and restore"Jenkins2012-11-073-67/+104
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix quota updating during soft delete and restoreJohannes Erdfelt2012-11-063-67/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1075716 Quotas were not properly updated when soft deletes were enabled. This patch fixes quotas for soft deletes and restores. Change-Id: I77fd3ff76caa9eba3e2180c1abcfb390ea7857d6
* | | | | | | | | | | | | Merge "Switch from FLAGS to CONF in misc modules"Jenkins2012-11-0728-216/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Switch from FLAGS to CONF in misc modulesMark McLoughlin2012-11-0428-216/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the global CONF variable instead of FLAGS. This is purely a cleanup since FLAGS is already just another reference to CONF. We leave the nova.flags imports until a later cleanup commit since removing them may cause unpredictable problems due to config options not being registered. Change-Id: Ib110ba8d1837780e90b0d3fe13f8e6b68ed15f65
* | | | | | | | | | | | | | Merge "Switch from FLAGS to CONF in nova.network"Jenkins2012-11-0711-136/+134
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Switch from FLAGS to CONF in nova.networkMark McLoughlin2012-11-0411-136/+134
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the global CONF variable instead of FLAGS. This is purely a cleanup since FLAGS is already just another reference to CONF. We leave the nova.flags imports until a later cleanup commit since removing them may cause unpredictable problems due to config options not being registered. Change-Id: I20b45c6325e9a03b8800032f761c2b6101376e8e
* | | | | | | | | | | | | Merge "Fixed instance deletion issue from Nova API."Jenkins2012-11-072-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed instance deletion issue from Nova API.Unmesh Gurjar2012-11-062-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When host Compute is down, Nova API deletes the resources associated with the instance. However, since the instance is marked deleted first, the next query to update the instance vm_state and task_state in DB fails. And instance remains in state vm_state=ACTIVE, task_state=DELETING, deleted=True. Fixes LP: #1074305 Change-Id: I0a4e64d180b4b2c5e398a21a62b29b7d59549a9f
* | | | | | | | | | | | | | Merge "Make ComputeDrivers send hypervisor_hostname"Jenkins2012-11-0716-10/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Make ComputeDrivers send hypervisor_hostnameArata Notsu2012-11-0616-10/+27
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hypervisor_hostname is set in get_available_resource() and in get_host_stats(). Except for vmwareapi driver. Change-Id: I66348ae1e986162b8139b04ab03c42c424338175
* | | | | | | | | | | | | | Merge "Read deleted flavors when using to_xml()"Jenkins2012-11-072-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Read deleted flavors when using to_xml()Rafi Khardalian2012-11-012-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1073736 Extend get_instance_type to accept an optional flag to return inactive flavors and use this within to_xml(). Change-Id: Id01724a85d9aff3b32b3502be06a84578fa8f4df
* | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2012-11-071-558/+562
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2012-11-071-558/+562
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b22b8c7bcb058e1784ab747d5440ff0e226567c