Merge "Fix incorrect usage of assertTrue()"
Merge "Improve dhcp agent structure to support multiple dhcp models"
Fix unsuitable assertTrue/assertFalse in api ut

Some usages of assertTrue()/assertFalse() are incorrect, improve
them to more explicit assert from the unit test suite.

Closes-Bug: #1218621
Change-Id: I22be2af05f06e91020dbaa4cf08bf395d68f563b
Merge "Forbid update of subnet gateway ip when in use by a port"
Merge "Fix unsuitable assertTrue/assertFalse in api ut"
Correct VPNaaS limit checks in extension

For the following VPNaaS attributes, ensure that these validation
tests are performed in the extension:

    keepalive >= 60 (seconds)
    mtu >= 0 (octets)
    DPD interval > 0 (seconds)
    DPD timeout > 0 (seconds)

Currently, the units for keepalive can only be seconds. If this
changes in the future (e.g. to allow kilobytes units), then the
test for the value will need to be changed.

To correctly test the MTU limits for an IPSec connection, the
protocol must be taken into consideration, which is defined by
the vpnservice object. Because of this dependency, we cannot
validate this in the extension, and will instead, just make
sure the value is positive.

Likewise, the attribute validators cannot ensure that the
DPD timeout is greater than the interval (again, because the
validators can only check the individual attributes one at
a time).

The range validator was modified to allow single ended ranges
for some of these attributes. The range also ensures the value
is an integer.

Companion changes are being made in the CLI code for these limit
changes.

Update: Fixed typo causing tox failure.

bug 1216117

Change-Id: I85d6175d81fbe7d27231aed48fb4691351e0db4c
Merge "Support for NVP distributed router"
Merge "Load tables of service plugins when migration auto generation"
Corrects error in ml2 rpc log message formatting

Change-Id: Ic6f445408ef83c2aa0376c94f395363503412814
Imported Translations from Transifex

Change-Id: I503e7e0273a8b344646a99373ddd87451ed7fd75
Merge "Corrects error in ml2 rpc log message formatting"
Return 400 if creating a distributed router on old NVP platforms

Without checking for the right NVP support, creating a distributed
router will silently fail, i.e. ithe 'distributed' attribute will
be ignored and a centralized router will be created instead.

Supports blueprint nvp-distributed-router

Change-Id: If8e40c0907d78c30f9ba918aaaff57e58ebb8055
Merge "Imported Translations from Transifex"
Create RPC connection before modifying OVS bridges

On startup, the agent removes and readds flows to the OVS bridges.  If
an RPC setup error exits the process prematurely, this can leave the
bridges in an unsafe state.  It is better to set the RPC communication
up before making changes to the host system.

Closes-Bug: 1217980
Change-Id: Ib9bbb864b9129bb7b1376a150a37a0c07908d74b
Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
Add missing match in OVS agent tunnel mac leaning

Learned flows introduced in commit a369f9e39691c01a4e4f7f8668cb37fc17ba03b3
to learn remote mac addresses on tunnels currently only match local VLAN,
but not destination mac address, as a consequence, connectivity may be
erratic as soon as more than two agents are used

Change-Id: I467e47d0dd2c1e5aca12a4e240e348116d530d4f
Closes-Bug: #1219074
Fix comment typo s/no/so

Change-Id: I1c7b0834202caca6b3bb79acd243c96b865583bc
Merge "Create RPC connection before modifying OVS bridges"
bp: pxeboot-port, provide pxeboot on ports

Teach neutron how to manage PXE boot.

Allow pxe boot parameters to be specified when creating a network port.

Implements bp:pxeboot-ports

Change-Id: I45fe7a16bc6c5975a765dd6a065558b9ba702e5b
Merge "Return 400 if creating a distributed router on old NVP platforms"
Merge "Fix 500 error on invalid security-group-rule creation for NVP"