Commit 56e16bc6 authored by Pedro Tammela's avatar Pedro Tammela Committed by Jakub Kicinski

selftests: tc-testing: prefix iproute2 functions with "ipr2"

As suggested by Simon, prefix the functions that operate on iproute2
commands in contrast with the "nl" netlink prefix.

Cc: Simon Horman <horms@kernel.org>
Signed-off-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20231124154248.315470-4-pctammela@mojatatu.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8059e68b
......@@ -37,7 +37,7 @@ class SubPlugin(TdcPlugin):
if netlink == True:
self._nl_ns_create()
else:
self._ns_create()
self._ipr2_ns_create()
# Make sure the netns is visible in the fs
ticks = 20
......@@ -71,7 +71,7 @@ class SubPlugin(TdcPlugin):
if netlink == True:
self._nl_ns_destroy()
else:
self._ns_destroy()
self._ipr2_ns_destroy()
def post_suite(self, index):
if self.args.verbose:
......@@ -161,7 +161,7 @@ class SubPlugin(TdcPlugin):
ticks -= 1
continue
def _ns_create_cmds(self):
def _ipr2_ns_create_cmds(self):
cmds = []
ns = self.args.NAMES['NS']
......@@ -181,26 +181,26 @@ class SubPlugin(TdcPlugin):
return cmds
def _ns_create(self):
def _ipr2_ns_create(self):
'''
Create the network namespace in which the tests will be run and set up
the required network devices for it.
'''
self._exec_cmd_batched('pre', self._ns_create_cmds())
self._exec_cmd_batched('pre', self._ipr2_ns_create_cmds())
def _nl_ns_destroy(self):
ns = self.args.NAMES['NS']
netns.remove(ns)
def _ns_destroy_cmd(self):
def _ipr2_ns_destroy_cmd(self):
return self._replace_keywords('netns delete {}'.format(self.args.NAMES['NS']))
def _ns_destroy(self):
def _ipr2_ns_destroy(self):
'''
Destroy the network namespace for testing (and any associated network
devices as well)
'''
self._exec_cmd('post', self._ns_destroy_cmd())
self._exec_cmd('post', self._ipr2_ns_destroy_cmd())
@cached_property
def _proc(self):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment