Merge "Revert "Cisco DFA ML2 Mechanism Driver""
Revert "Skip functional l3 agent test"

This reverts commit 0918ce91e5af5100ee3a4fcd6861741c4f00ac41. The
specified commit skipped a test which caused non-deterministic gate
failures, but the actual reason for the failures was found and fixed
so the skip is no longer needed.

Related-bug: #1358206
Related-bug: #1364171
Change-Id: I9b0d9ad9ad8b62ee92877fc0a6db0323604433ac
Updated from global requirements

Change-Id: Id4037028812b11e088897c6cb1ff3108c0d4e85d
Merge "Fixes Hyper-V agent issue on Hyper-V 2008 R2"
Merge "Fix a bug in Mellanox plugin RPC caused by secgroup RPC refactoring"
Remove unused arg to config.setup_logging()

The cfg.CFG argument is ignored and misleading.  This change removes it
and updates all callers.

Closes-Bug: #1355565
Change-Id: I2fcece85d1abe848e5c01125cfb62c02f2dcbc86
Reset IPv6 detection flag after IPv6 tests

Resets a module level flag that was being left in the
state that the previous test set it to. This was causing
unrelated tests to fail if the last state was left disabled.

Closes-Bug: #1365829
Change-Id: Id3f6cb680f5d832e21966de7d4fa335c0c59697c
Supply missing cisco_cfg_agent.ini file

cisco_cfg_agent.ini file was missed in the initial commit and
caused neutron startup issues. This patch supplies the proper
ini file and adds it back to neutron setup.cfg.
Also the introduced config options are put in a specific group
instead of default as was in the initial commit.

Change-Id: I74b3b77fe6e196524809580f522f91f3b62f5ba7
Closes-bug: #1351466
Avoid testing code duplication which introduced testing bugs

SecurityGroupAgentEnhancedRpcTestCase duplicated code in
SecurityGroupAgentRpcTestCase setUp, also
TestSecurityGroupAgentEnhancedRpcWithIptables duplicated
code from TestSecurityGroupAgentWithIptables setUp()
introducing bugs by improper initialization, like a missing
    self.iptables.use_ipv6 = True
which in combination with tests.unit.test_ipv6.TestIsEnabled
produced inconsistent testing results.

Change-Id: Ic0b596b6fe1d8273df197e9426abad818832c00a
Closes-bug: #1365829
Fixes formatting for debug output in neutron/agent/l3_agent.py

The %s format type was missing.

Change-Id: I4efba513f7b0a6e4a21908bf0b05407e74b524c7
Closes-bug: #1366105
Merge "Reset IPv6 detection flag after IPv6 tests"
Stop tracking connections in DVR FIP Namespace

For DVR, connections to external network using floating IPs do not
need to be tracked in FIP namespace because they are being
already tracked in router namespace.
This fix adds iptable rules to not track connections.

Change-Id: I378039e311763d114860cb70ded7349d6580855a
Closes-bug: #1360395
Fix AttributeError when setting external gateway on DVR router

DVR routers will have this manager initialized only after one
or more subnets have been attached to the router. To address
the issue, make sure the manager is defined and handle the snat
rules appropriately.

This patch also makes _update_arp_entry more defensive; this is
because the arp update process can be affected by the same issue:
the router may not have internal ports at the time the request
come in. This is likely when VM's port creation and router
configuration overlap slightly.

Closes-bug: #1353006

Change-Id: Ib46852f5b264e5ef2e2d499d3351f8974e393011
Co-authored-by: Rajeev Grover <rajeev.grover@hp.com>
Merge "Fix leftover Timeout effecting most eventlet calls"
Merge "Updated from global requirements"
Merge "Cleanup rename of get_compute_ports_on_host_by_subnet"
Merge "Remove unused arg to config.setup_logging()"
Merge "Remove SELECT FOR UPDATE use in delete_firewall"
Add scheduler unit tests to enable bug fixes and refactoring

Improves the coverage for DVR scheduling and will allow safer bug
fixes and refactoring in follow-on patches.

Change-Id: I02d0126e31adcab88a7ee82ba1cb76f952c9a68c
Partial-bug: #1353266
Partial-bug: #1356639
Co-Authored-By: Swaminathan Vasudevan <swaminathan.vasudevan@hp.com>
Merge "Fixes formatting for debug output in neutron/agent/l3_agent.py"