Merge "Make ComputeDrivers send hypervisor_hostname"
Merge "Fixed instance deletion issue from Nova API."
Decouple EC2 API from using instance id

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
Map NotAuthorized to 403 in floating ips extension

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
Switch from FLAGS to CONF in nova.console

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 "Switch from FLAGS to CONF in nova.network"
Merge "Switch from FLAGS to CONF in misc modules"
Merge "Fix quota updating during soft delete and restore"
Merge "Forbid resizing instance to deleted instance types"
Merge "Map NotAuthorized to 403 in floating ips extension"
Corrects usage of db.api.network_get

Sets project_only='allow_none' to get the network whose project_id
is None or not.

Fixes bug 1075215

Change-Id: I80622b1f5ccf194b4810bd0560bd0cdb077370df
Merge "libvirt: Regenerates xml instead of using on-disk"
'BackupCreate' rotation parameter >= 0

In the extension 'admin-actions' of OpenStack Compute API, the action
create backups should only accept rotation parameter greater than or
equal to zero.

If the 'rotation' parameter is negative, OS API returns a badRequest
400 HTTP error.

Fixes LP bug #1071168

Change-Id: I6ef08fbecb0f88942cdb16193e9d2c3831866fe9
Switch from FLAGS to CONF in nova.virt

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
Make HostManager.get_all_host_states() return an iterator

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 bandwidth polling exception."
Remove out-of-date comment

The code now uses excutils, so the comment is out-of-date

Change-Id: If04032999f1408ee8db8238b210d044d0a21f622
Refactor resource tracker claims and test logic.

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_exists

Change-Id: I9862daebaadca4af0c1ec47ddb66e329cdce98a7
Merge "Refactor resource tracker claims and test logic."