Updated from global requirements

Change-Id: If26b2e9b875f8cae0af1cf66607ef1efb8dd429c
Fix UnboundLocalError raised during L3 router sync task

This can be fixed in a number of ways: a) consolidating the
two except clauses into one; b) adding a 'return' after the
last except clause c) by calling the cleanup method only on
success; d) initializing 'routers' before usage.

Approach c) has the benefit of stating the developer's intent
more explicitly and minimize chances of regression.

Closes-bug: #1336566

Change-Id: Ib91ac5bb07869cbec6825b60d7c4c5b23c4c4d3a
ofagent: Fix an argument mismatch bug in commit 9d13ea88

recently merged commit 9d13ea884bff749b3975acb5eb5630e5aca4a665
had an argument mismatch bug which causes the following crash.

    TypeError: _get_ports() takes exactly 2 arguments (1 given)

this commit fixes it.

Closes-Bug: #1336175
Change-Id: I46bb1fc1aebf06274bb226014e4a9bc5a83f98ac
OVS agent: fix a comment on CANARY_TABLE

CANARY_TABLE is for br-int, not for br-tun.  Grouping it with
constants for br-tun tables together is misleading.  Move it into
a separate section and comment appropriately.  No functional changes.

Change-Id: Ic1aed992776a87ed77665b712de7ec3bd9dab397
Merge "Add configurable http_timeout parameter for Cisco N1K"
Merge "Updated from global requirements"
Merge "Imported Translations from Transifex"
Merge "Allow setting a rootwrap cmd for functional tests"
Merge "OVS agent: fix a comment on CANARY_TABLE"
Merge "Remove SELECT FOR UPDATE use in ML2 type driver release_segment"
Fixed spelling mistake in securitygroups_rpc

Fixed spelling mistake in a doctext.

Change-Id: I04a44521403aa00048c875b44a3c0bf5ce8a6c4b
Omit mode keyword when spawning dnsmasq with some ipv6 subnets

Fix UnboundLocalError for certain cases of ipv6 subnets

Closes-Bug: #1335959
Change-Id: I5e4b94d9ba1b13b72e2300b53d5638968e0d3401
sync periodic_task fix from incubator

Set the value of time the periodic task was last run to a multiple of the
spacing value rather than the actual last time run. This ensures tasks runs
regularly but avoids synchronizing that interval with other nodes.

This patch also removes the coalescing of tasks which are _nearby_ (0.2
seconds away).

4dbd3aa Make periodic tasks run on regular spacing interval
21249f1 Fix parenthesis typo misunderstanding in periodic_task

Change-Id: I8873545578f104fd204fbc25493350128b2bc8d4
Merge "Trigger provider security group update for RA"
Avoid notifying while inside transaction opened in delete_port()

delete_port() calls to disassociate_floatingips() while in transaction.
The latter method sends RPC notification which may result in eventlet
yield. If yield switches a thread to another one that tries to access
the same floating IP object in db as disassociate_floatingips() method
does, we're locked and get db timeout.

We should avoid calling to notifier while under transaction.

To achieve this, I introduce a do_notify argument that controls whether
notification is done by disassociate_floatingips() itself or delegated
to caller. Callers that call to disassociate_floatingips() from under
transactions should handle notifications on their own. For this,
disassociate_floatingips() returns a set of routers that require
notification.

Updated drivers to reflect new behaviour. Added unit test.

Change-Id: I2411f2aa778ea088be416d062c4816c16f49d2bf
Closes-Bug: 1330955
VPNaaS REST Client UT Broken

When the H302 work was done, it broke two modules used for UT of
Cisco CSR VPNaaS REST client. Since the UT is currently disabled
(because the httmock library was not approved for test-requirements),
the error was not detected.

This fixes the files, so that they can still be used manually (by
locally importing httmock or its source file, and renaming the
module to remove the "_" prefix).

In the long term, the UT needs to be reworked to use httpretty,
which uses a register based mechanism, instead of a context
manager based mechanism, so this will take some effort. In addition.
there is discussion of switching to a new mock-request package,
instead of httpretty.

Change-Id: I8badc249ad021fdbdb2367b5416c72435ed58994
Closes-Bug: 1335977
Closes-Bug: 1326785
Merge "Fix example for running individual tests"
Merge "VPNaaS REST Client UT Broken"
Merge "NSX: properly handle floating ip status"
Merge "Avoid notifying while inside transaction opened in delete_port()"