Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Link: https://lore.kernel.org/r/20231124154248.315470-4-pctammela@mojatatu.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Pedro Tammela and committed by
Jakub Kicinski
56e16bc6 8059e68b

+8 -8
+8 -8
tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py
··· 37 37 if netlink == True: 38 38 self._nl_ns_create() 39 39 else: 40 - self._ns_create() 40 + self._ipr2_ns_create() 41 41 42 42 # Make sure the netns is visible in the fs 43 43 ticks = 20 ··· 71 71 if netlink == True: 72 72 self._nl_ns_destroy() 73 73 else: 74 - self._ns_destroy() 74 + self._ipr2_ns_destroy() 75 75 76 76 def post_suite(self, index): 77 77 if self.args.verbose: ··· 161 161 ticks -= 1 162 162 continue 163 163 164 - def _ns_create_cmds(self): 164 + def _ipr2_ns_create_cmds(self): 165 165 cmds = [] 166 166 167 167 ns = self.args.NAMES['NS'] ··· 181 181 182 182 return cmds 183 183 184 - def _ns_create(self): 184 + def _ipr2_ns_create(self): 185 185 ''' 186 186 Create the network namespace in which the tests will be run and set up 187 187 the required network devices for it. 188 188 ''' 189 - self._exec_cmd_batched('pre', self._ns_create_cmds()) 189 + self._exec_cmd_batched('pre', self._ipr2_ns_create_cmds()) 190 190 191 191 def _nl_ns_destroy(self): 192 192 ns = self.args.NAMES['NS'] 193 193 netns.remove(ns) 194 194 195 - def _ns_destroy_cmd(self): 195 + def _ipr2_ns_destroy_cmd(self): 196 196 return self._replace_keywords('netns delete {}'.format(self.args.NAMES['NS'])) 197 197 198 - def _ns_destroy(self): 198 + def _ipr2_ns_destroy(self): 199 199 ''' 200 200 Destroy the network namespace for testing (and any associated network 201 201 devices as well) 202 202 ''' 203 - self._exec_cmd('post', self._ns_destroy_cmd()) 203 + self._exec_cmd('post', self._ipr2_ns_destroy_cmd()) 204 204 205 205 @cached_property 206 206 def _proc(self):