Merge "dom0 rootwrap - case insensitive xenapi section"
Merge "faster quantum-openvswitch-agent periodic reports"
Fix case with no host_id in BigSwitch plugin

This correctly checks for the case where nova does not
provide the host_id in port creation/updates.

Fixes: bug #1195903
Change-Id: Ic0d714a3977810c6b1144c1e25488f75cc95d0f0
Improve Nicira plugin test coverage

Blueprint nvp-test-coverage

This patch improves the Nicira plugin test coverage by:
- adding a suite of test cases for nvplib
- removing unused exception handling code
- removing 'vestigial' code in nvp plugin modules

This patches also fixes a few minor glitches with the plugin
and the fake api client.

Change-Id: Ia319f556a815e5061b867a97d834123786218fec
Merge "Nicira plugin: Do not expect a minimum number of SNAT rules"
Merge "Update code to properly use dict returned from get_gateway."
Merge "Remove duplicate _check_provider_update from plugins"
Merge "Fix logic for handling SNAT rules"
Merge "Improve Nicira plugin test coverage"
Imported Translations from Transifex

Change-Id: Ia1a1fd6e7536281e7b238b419c02991a1e4dc523
Merge "Add support for moving ip/addresss/default gateway"
Imported Translations from Transifex

Change-Id: I2a21a217a7cd00067ca4aed2ae385b387e5a9731
Move NVP DB extensions under dbexts module.

Small clean-up to the plugin directory. This is also
more in line with how API extensions have their own
module.

Change-Id: Idae52e30128f4ed9f8f7f5164991952bc3189f53
Jointly load ExternalNetwork with Network

Bug 1177572

This patch leverages the same approach as bug 1174111 for avoiding
loading ExternalNetwork element from db for each network element.
make_network_dict, _extend_network_dict_l3 are refactored accordingly.

Also, this patch sligthly alters the logic of process_l3_network_create
and process_l3_network_update as these methods assumed
_extend_network_dict_l3 was always executed before retuerning.

Finally, calls to get_network and get_networks in plugins which only
extended the response with l3 attributes have been completely removed.

Change-Id: I3b4c28ec0c78f731a534c2b66150d529fd797e72
Merge "Move NVP DB extensions under dbexts module."
Allow non-root ip in subnet CIDR

If a subnet is created using an IP that isn't a root IP
(doesn't end with .0) the code that handles IP checking
for fixed IPs fails.  This fix changes the check for a
valid IP to use the net.network IP address to
avoid problems in subnets created with the non-root CIDR.

(fixes bug 1188845)

Change-Id: I89df64261d0f2741668576e45dc8f026857f20b0
Imported Translations from Transifex

Change-Id: Ibc186825cb89a78fcfcb7124c203f1ec63fcf63c
Merge "Jointly load ExternalNetwork with Network"
Do not mask NotImplementedError exceptions

With this patch we  avoid masking NotImplementedError(s).
Previously, a catch-all clause returned 500, and it makes
sense to distinguish between genuine 500 errors (i.e. a bug),
versus 501 ones.

This opens up the issue of keeping the server behavior
consistent from one release to another, but one might argue
that this was bad design decision in the first place.

Fixes bug 1197200

Change-Id: I2d81cba5ee9e5fbe8e865378381790b5b467d255
Imported Translations from Transifex

Change-Id: Ic473f0a8aae5786fa5fdf21eccc9653422d04177