Fix flavor deletion when there is a deleted flavor

If there is a deleted flavor with the same ID as an undeleted flavor,
the flavormanage delete code attempts to delete it again, which fails.
This patch makes sure to pass read_deleted='no' when the flavor is
retrieved for deletion so we get the undeleted flavor. Includes a
failing test to make sure the value is passed properly.

Fixes bug 1048678

Change-Id: If6a20de2526b7ba90ada4a40317a98f79b2141dc
Merge "Add documentation for scheduler filters scope"
Fixes snat rules in complex networking configs

There is currently no way to disable nova's snat rule, which causes
problems for some network configurations with an external gateway.
This patch allows the snat to be completely disabled by setting
a blank value for routing_source_ip.

This patch also makes the snat rule a little more specific, only
snatting traffic that is destined for the public interface (or
the floating interface if it is defined). This allows the snat
to work without changing routing_source_ip and also ensures that
an instance assigned multiple ips from different floating pools
will connect from the appropriate address for each pool

Fixes bug 1048765

Change-Id: I18be88a3dbb7a9f4762db7beefc94e07b8310100
Merge "Make size optional when creating a volume from a snapshot."
Merge "xapi: Fix live block migration"
Merge "Add a criteria to sort a list of dict in api samples"
More specific lxml versions in tools/pip-requires

Changed lxml version in tools/pip-requires from >=2.3,<3 to
>=2.3,<2.3.5.  pip was apparently accepting 3.0alpha as a <3 requirement
but the ordering of elements changes in that version.  Some of the
libvirt tests would pass with lxml 3.0alpha but fail with any 2.3.x
version.  The tests now pass with any version of lxml within the range
specified.

Change-Id: I2d84d32f1bf6fba2c6dbe05799a284a44d4c39d8
Adds API sample test for Flavors Extra Data extension.

Change-Id: I65f8ed10dc5c1d31f848ad3fdc5c63e17fdc518f
Merge "Improve floating IP delete speed."
Handle missing network_size in nova-manage

In 'nova-manage network create' --network_size should be optional.

Fixes bug 1046605

Change-Id: I25ce9acbe664810aa8fe9a3b4a2951c0fac4e41a
Add flag cinder_endpoint_template to volume.cinder

Add optional flag to allow cinder endpoint to be defined by flag rather
than extracted from the request context's service catalog.  No change to
default behavior.

This flag allows deployers to use a seperate management endpoint for
cinder which compute can use exclusively to send messages to cinder, or
just use an auth system that doesn't add/forward the catalog along with
the request (e.g. noauth).

Add python-cinderclient to tools/test-requires

fix lp bug #1048798

Change-Id: Icb416bf4df2a6e37024f1fbc866006d46d30bcf2
Prevent Partial terminations in EC2

When passing in a valid and an invalid EC2 id, the API should not partially
execute the command, and instead just return an error.

Fix bug 979336

Also prevents partial:
* starts
* stops
* reboots

Change-Id: I28fb4f34aadfb7af14774db983d44584e61c5414
Make ip block splitting a bit more self documenting.

Change-Id: If1343850d75707bc189ba11b33491361f7f58e29
Merge "Prevent Partial terminations in EC2"
Merge "Handle missing network_size in nova-manage"
Remove an unused import

Remove the nova.virt.driver import because it is not used

Change-Id: I6f9a0bd5593497d8e1af4dec9361064a374a00fb
Remove unused AddressAlreadyAllocated exception

Coincidentally, unused for two years now since commit 2f3a63ac

Change-Id: I2112c7686ef22116e777e397d4fc2c1bbbb1ad58
Convert to ints in VlanManager.create_networks

Fixes bug 1046778

Change-Id: I17647b0e495964c305e54221bf3fcfd6bdbc1547
Merge "Remove an unused import"
Merge "Remove unused AddressAlreadyAllocated exception"