From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 18 Jul 2015 00:56:51 +0000 (+0000)
Subject: Merge "Introduce connection testers module"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6c7c4c2b339f062cc93bcfc8988f9ffbfb0b5255;p=openstack-build%2Fneutron-build.git

Merge "Introduce connection testers module"
---

6c7c4c2b339f062cc93bcfc8988f9ffbfb0b5255
diff --cc neutron/tests/common/machine_fixtures.py
index c6ff0f78f,969cb4064..65a1a433c
--- a/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