test-network: rename l2tp_tunnel_remove -> remove_l2tp_tunnels

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index a5056029269e268c5672f5c563dfa8a4913ec3f4..97a75fba372dd5f494f4352417eedfffb6c309c1 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -196,7 +196,7 @@ def remove_routes(routes):
     for route_type, addr in routes:
         call('ip route del', route_type, addr, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
     for route_type, addr in routes:
         call('ip route del', route_type, addr, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 

-def l2tp_tunnel_remove(tunnel_ids):
+def remove_l2tp_tunnels(tunnel_ids):

     output = check_output('ip l2tp show tunnel')
     for tid in tunnel_ids:
         words='Tunnel ' + tid + ', encap'
     output = check_output('ip l2tp show tunnel')
     for tid in tunnel_ids:
         words='Tunnel ' + tid + ', encap'


@@ -1167,11 +1167,11 @@ class NetworkdL2TPTests(unittest.TestCase, Utilities):
     l2tp_tunnel_ids = [ '10' ]
 
     def setUp(self):
     l2tp_tunnel_ids = [ '10' ]
 
     def setUp(self):

-        l2tp_tunnel_remove(self.l2tp_tunnel_ids)
+        remove_l2tp_tunnels(self.l2tp_tunnel_ids)

         remove_links(self.links)
 
     def tearDown(self):
         remove_links(self.links)
 
     def tearDown(self):

-        l2tp_tunnel_remove(self.l2tp_tunnel_ids)
+        remove_l2tp_tunnels(self.l2tp_tunnel_ids)

         remove_links(self.links)
         remove_unit_from_networkd_path(self.units)
 
         remove_links(self.links)
         remove_unit_from_networkd_path(self.units)