From: Cedric Brandily <zzelle@gmail.com>
Date: Fri, 27 Feb 2015 20:54:06 +0000 (+0000)
Subject: Simplify prepare_veth_pairs in functional tests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dcd45d8a27351f5545b26f8a902b57e50f546bbe;p=openstack-build%2Fneutron-build.git

Simplify prepare_veth_pairs in functional tests

This change simplifies prepare_veth_pairs[1] as optional arguments are
never used by prepare_veth_pairs callers and uses create_veth.

This changes prepares to transform BaseLinuxTestCase[1] and
BaseOVSLinuxTestCase[1] methods in to helper methods.

[1] in neutron.tests.functional.agent.linux.base

Change-Id: I2e50057023bbf7575051f04b65cacc093338938a
---

diff --git a/neutron/tests/functional/agent/linux/base.py b/neutron/tests/functional/agent/linux/base.py
index e822e1362..3fe5ad00d 100644
--- a/neutron/tests/functional/agent/linux/base.py
+++ b/neutron/tests/functional/agent/linux/base.py
@@ -166,26 +166,20 @@ class BaseIPVethTestCase(BaseLinuxTestCase):
         device.addr.add(ip_version=ip_version, cidr=cidr, broadcast=broadcast)
         device.link.set_up()
 
-    def prepare_veth_pairs(self, src_addr=None,
-                           dst_addr=None,
-                           broadcast_addr=None,
-                           src_ns=None, dst_ns=None,
-                           src_veth=None,
-                           dst_veth=None):
-
-        src_addr = src_addr or self.SRC_ADDRESS
-        dst_addr = dst_addr or self.DST_ADDRESS
-        broadcast_addr = broadcast_addr or self.BROADCAST_ADDRESS
-        src_veth = src_veth or get_rand_veth_name()
-        dst_veth = dst_veth or get_rand_veth_name()
-        src_ns = src_ns or self._create_namespace()
-        dst_ns = dst_ns or self._create_namespace()
+    def prepare_veth_pairs(self):
+
+        src_addr = self.SRC_ADDRESS
+        dst_addr = self.DST_ADDRESS
+        src_veth = get_rand_veth_name()
+        dst_veth = get_rand_veth_name()
+        src_ns = self._create_namespace()
+        dst_ns = self._create_namespace()
 
         src_veth, dst_veth = src_ns.add_veth(src_veth,
                                              dst_veth,
                                              dst_ns.namespace)
 
-        self._set_ip_up(src_veth, '%s/24' % src_addr, broadcast_addr)
-        self._set_ip_up(dst_veth, '%s/24' % dst_addr, broadcast_addr)
+        self._set_ip_up(src_veth, '%s/24' % src_addr, self.BROADCAST_ADDRESS)
+        self._set_ip_up(dst_veth, '%s/24' % dst_addr, self.BROADCAST_ADDRESS)
 
         return src_ns, dst_ns