Merge "Introduce connection testers module"

diff --cc neutron/agent/linux/iptables_firewall.py
Simple merge

diff --cc neutron/tests/common/machine_fixtures.py
index c6ff0f78f8a85e62e8dd63c9464845f2e9fa195b,969cb4064096938a3af94575086c046f956bca80..65a1a433cd11646fbda41076616767ef2245823e
--- 1/neutron/tests/common/machine_fixtures.py
--- 2/neutron/tests/common/machine_fixtures.py
+++ b/neutron/tests/common/machine_fixtures.py
@@@ -39,11 -38,11 +39,10 @@@ class FakeMachine(fixtures.Fixture)
      def __init__(self, bridge, ip_cidr, gateway_ip=None):
          super(FakeMachine, self).__init__()
          self.bridge = bridge
-         self.ip_cidr = ip_cidr
-         self.ip = self.ip_cidr.partition('/')[0]
+         self._ip_cidr = ip_cidr
          self.gateway_ip = gateway_ip
  
 -    def setUp(self):
 -        super(FakeMachine, self).setUp()
 +    def _setUp(self):
          ns_fixture = self.useFixture(
              net_helpers.NamespaceFixture())
          self.namespace = ns_fixture.name

diff --cc neutron/tests/common/net_helpers.py
Simple merge