Merge tag '7.0.0_b2' into debian/liberty

Neutron liberty-2 milestone (7.0.0.0b2)

diff --cc neutron/agent/l3/ha.py
Simple merge

diff --cc neutron/tests/functional/agent/linux/helpers.py
index 3ac8bfaeb22955436c7a1627bb4f6836c27593c7,9980293aa75ce65cbf0509060adbe21340acffab..6eb5516725732a49f7807e3fe094a00e2e18fe2d
--- 1/neutron/tests/functional/agent/linux/helpers.py
--- 2/neutron/tests/functional/agent/linux/helpers.py
+++ b/neutron/tests/functional/agent/linux/helpers.py
@@@ -12,28 -12,10 +12,11 @@@
  #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  #    License for the specific language governing permissions and limitations
  #    under the License.
- import functools
  import os
- import random
- import re
- import select
- import shlex
- import subprocess
  
  import fixtures
 +import netaddr
  
- from neutron.agent.common import config
- from neutron.agent.linux import ip_lib
- from neutron.agent.linux import utils
- 
- CHILD_PROCESS_TIMEOUT = os.environ.get('OS_TEST_CHILD_PROCESS_TIMEOUT', 20)
- CHILD_PROCESS_SLEEP = os.environ.get('OS_TEST_CHILD_PROCESS_SLEEP', 0.5)
- READ_TIMEOUT = os.environ.get('OS_TEST_READ_TIMEOUT', 5)
- 
- SS_SOURCE_PORT_PATTERN = re.compile(
-     r'^.*\s+\d+\s+.*:(?P<port>\d+)\s+[0-9:].*')
- 
  
  class RecursivePermDirFixture(fixtures.Fixture):
      """Ensure at least perms permissions on directory and ancestors."""

diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge

diff --cc neutron/tests/functional/agent/test_ovs_flows.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge