Merge "Transform BaseLinuxTestCase methods in helpers"

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

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

diff --cc neutron/tests/functional/agent/test_ovs_lib.py
index eba1361ffb7351092c95e474ce3580dd53558f89,9f1f33503a78074a26ad91b59642087c82d3f9f4..7c709b380be6cb1ff34b7d851dbfaa469573f42e
--- 1/neutron/tests/functional/agent/test_ovs_lib.py
--- 2/neutron/tests/functional/agent/test_ovs_lib.py
+++ b/neutron/tests/functional/agent/test_ovs_lib.py
@@@ -54,18 -55,8 +55,18 @@@ class OVSBridgeTestCase(base.BaseOVSLin
          self.br.delete_port(port_name)
          self.assertFalse(self.br.port_exists(port_name))
  
 +    def test_duplicate_port_may_exist_false(self):
 +        port_name, ofport = self.create_ovs_port(('type', 'internal'))
 +        cmd = self.br.ovsdb.add_port(self.br.br_name,
 +                                     port_name, may_exist=False)
 +        self.assertRaises(RuntimeError, cmd.execute, check_error=True)
 +
 +    def test_delete_port_if_exists_false(self):
 +        cmd = self.br.ovsdb.del_port('nonexistantport', if_exists=False)
 +        self.assertRaises(RuntimeError, cmd.execute, check_error=True)
 +
      def test_replace_port(self):
-         port_name = base.get_rand_port_name()
+         port_name = net_helpers.get_rand_port_name()
          self.br.replace_port(port_name, ('type', 'internal'))
          self.assertTrue(self.br.port_exists(port_name))
          self.assertEqual('internal',