Merge "rename ACTIVE_PENDING to ACTIVE_PENDING_STATUSES"
Merge "Remove unnecessary call to get_dhcp_port from DeviceManager"
Imported Translations from Transifex

Change-Id: I57165f5a6cdba143c130c97d15f492a0a925fca4
Merge "ML2 Cisco Nexus MD: VM migration support"
NSX plugin: return 400 for invalid gw certificate

Gateway certificates are validated by the NSX backend.
The code currently treats a failure in certification
validation as a backend failure and therefore returns
a 500 status code.

This patch changes this behaviour by returning a 400
status code and an appropriate error description.
To this aim a handler for 400 errors has been added to
the NSX API client.

Closes-Bug: #1293508

Change-Id: I196f14337e47cd40710a6d8a30bbe1cac5ffe05b
Merge "Return meaningful error message on pool creation error"
Merge "Log dnsmasq host file generation"
LBaaS: make device driver decide whether to deploy instance

Currently server throws an error in case agent (device driver)
requests logical config for non-active pool, which is a bug
as it's ok if pool is in pending create/update states.
Also the pool may be already scheduled for delete (pending_delete)
while agent requests it to perform some previous update, which
as also ok and agent just doesn't deploy such config.

This patch moves active pool check from server side to agent side

Closes-Bug: #1295491
Change-Id: Ib088355a0b3efffdcd211a8cfe6942833bb9f895
Correct OVS VXLAN version check

Update the version checking logic used to determine if the combination of
Linux kernel, OVS userspace, and OVS kernel module can properly support
VXLAN.

Tested on Ubuntu 14.04 without the OVS DKMS module.

Closes-Bug: #1291535

Change-Id: If034164b775989d52c3c449caba6baadb970afd9
Merge "Remove extra space in help string"
Add script to migrate ovs or lb db to ml2 db

This script migrates an ovs or lb database to work with ml2.
The script's docstring provides details as to how it is intended to
work.

I've tested this manually on a trivial deployment, and would like
to add support for testing the migration with grenade.  However,
that will have to wait until grenade support for neutron has
merged.

DocImpact

Implements: blueprint ml2-deprecated-plugin-migration

Change-Id: I1eb908c866e19f72e61f687d56a0bc391cdb4760
Merge "NEC plugin: Rename quantum_id column to neutron_id"
Merge "Add nec plugin to allowed address pairs migration"
Merge "Add script to migrate ovs or lb db to ml2 db"
Cisco VPN driver correct reporting for admin state chg

Depends on reference implementation change (81124 review) that will pass VPN
service admin up/down changes to the service driver (for subsequent passing
to the device driver).

This change will save the runtime state of the IPSec connections that have
been removed due to a VPN service down change, so that this can be reported
to the plugin properly. Otherwise, without the change, there is no info
on the downed connection and no change report so the plugin thinks the
connection is still active.

In addition, the status for the VPN service will reflect whether there are
any IPSec connections ACTIVE. If one or more are acive, the service will
be active, otherwise it will be DOWN.

Updated UT to add tests for admin state and status reporting. Also changed
some IPSec create UTs because they were not cleaning up correctly upon test
failures (only seen with a live CSR).

In the future, when the Cisco CSR REST API supports admin up/down support,
the IPSec connections will not be deleted, but instead will be shut down, in
response to an admin down event (and then brought up, for admin up). During
the down time, the state will be reported correctly and no run-time state
recording needed.

Change-Id: I294bfb400c31ef36dfe5d9e85b34845e5aef8515
Closes-Bug: 1291619
Replace a usage of the deprecated root_helper option

This change replaces a usage of the deprecated root_helper option
by the usage of get_root_helper result.

Change-Id: Icfc698243784557cbf987a817c13d0b80969e5d3
Closes-Bug: #1297145
Fixed TypeError when creating MlnxException

MlnxException expect a 'err_msg' keyword argument.

Change-Id: I4570219c0a6a466391b43cbdaa5372b85566c421
Closes-Bug: #1283990
Signe-off-by: Roey Chen <roeyc@mellanox.com>
ML2 Cisco Nexus MD: Remove workaround for bug 1276395

Before bug 1276395 was merged the delete_port_postcommit() mechanism
drivers did not have access to the bound_segment information that was
in the process of being deleted.
Code was added to the cisco_nexus md to workaround this issue.
This code can now be removed.

Change-Id: If47ef1958bf4de863995b9cfc042abf5bc849e24
Closes-Bug: 1297321
Merge "Add enable_security_group to BigSwitch and OneConvergence ini files"
Merge "ML2 Cisco Nexus MD: Remove workaround for bug 1276395"