diff options
Diffstat (limited to 'tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py')
-rw-r--r-- | tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py index affa7f2d9670..9539cffa9e5e 100644 --- a/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py +++ b/tools/testing/selftests/tc-testing/plugin-lib/nsPlugin.py | |||
@@ -64,7 +64,7 @@ class SubPlugin(TdcPlugin): | |||
64 | cmdlist.insert(0, self.args.NAMES['NS']) | 64 | cmdlist.insert(0, self.args.NAMES['NS']) |
65 | cmdlist.insert(0, 'exec') | 65 | cmdlist.insert(0, 'exec') |
66 | cmdlist.insert(0, 'netns') | 66 | cmdlist.insert(0, 'netns') |
67 | cmdlist.insert(0, 'ip') | 67 | cmdlist.insert(0, self.args.NAMES['IP']) |
68 | else: | 68 | else: |
69 | pass | 69 | pass |
70 | 70 | ||
@@ -78,16 +78,16 @@ class SubPlugin(TdcPlugin): | |||
78 | return command | 78 | return command |
79 | 79 | ||
80 | def _ports_create(self): | 80 | def _ports_create(self): |
81 | cmd = 'ip link add $DEV0 type veth peer name $DEV1' | 81 | cmd = '$IP link add $DEV0 type veth peer name $DEV1' |
82 | self._exec_cmd('pre', cmd) | 82 | self._exec_cmd('pre', cmd) |
83 | cmd = 'ip link set $DEV0 up' | 83 | cmd = '$IP link set $DEV0 up' |
84 | self._exec_cmd('pre', cmd) | 84 | self._exec_cmd('pre', cmd) |
85 | if not self.args.namespace: | 85 | if not self.args.namespace: |
86 | cmd = 'ip link set $DEV1 up' | 86 | cmd = '$IP link set $DEV1 up' |
87 | self._exec_cmd('pre', cmd) | 87 | self._exec_cmd('pre', cmd) |
88 | 88 | ||
89 | def _ports_destroy(self): | 89 | def _ports_destroy(self): |
90 | cmd = 'ip link del $DEV0' | 90 | cmd = '$IP link del $DEV0' |
91 | self._exec_cmd('post', cmd) | 91 | self._exec_cmd('post', cmd) |
92 | 92 | ||
93 | def _ns_create(self): | 93 | def _ns_create(self): |
@@ -97,16 +97,16 @@ class SubPlugin(TdcPlugin): | |||
97 | ''' | 97 | ''' |
98 | self._ports_create() | 98 | self._ports_create() |
99 | if self.args.namespace: | 99 | if self.args.namespace: |
100 | cmd = 'ip netns add {}'.format(self.args.NAMES['NS']) | 100 | cmd = '$IP netns add {}'.format(self.args.NAMES['NS']) |
101 | self._exec_cmd('pre', cmd) | 101 | self._exec_cmd('pre', cmd) |
102 | cmd = 'ip link set $DEV1 netns {}'.format(self.args.NAMES['NS']) | 102 | cmd = '$IP link set $DEV1 netns {}'.format(self.args.NAMES['NS']) |
103 | self._exec_cmd('pre', cmd) | 103 | self._exec_cmd('pre', cmd) |
104 | cmd = 'ip -n {} link set $DEV1 up'.format(self.args.NAMES['NS']) | 104 | cmd = '$IP -n {} link set $DEV1 up'.format(self.args.NAMES['NS']) |
105 | self._exec_cmd('pre', cmd) | 105 | self._exec_cmd('pre', cmd) |
106 | if self.args.device: | 106 | if self.args.device: |
107 | cmd = 'ip link set $DEV2 netns {}'.format(self.args.NAMES['NS']) | 107 | cmd = '$IP link set $DEV2 netns {}'.format(self.args.NAMES['NS']) |
108 | self._exec_cmd('pre', cmd) | 108 | self._exec_cmd('pre', cmd) |
109 | cmd = 'ip -n {} link set $DEV2 up'.format(self.args.NAMES['NS']) | 109 | cmd = '$IP -n {} link set $DEV2 up'.format(self.args.NAMES['NS']) |
110 | self._exec_cmd('pre', cmd) | 110 | self._exec_cmd('pre', cmd) |
111 | 111 | ||
112 | def _ns_destroy(self): | 112 | def _ns_destroy(self): |
@@ -115,7 +115,7 @@ class SubPlugin(TdcPlugin): | |||
115 | devices as well) | 115 | devices as well) |
116 | ''' | 116 | ''' |
117 | if self.args.namespace: | 117 | if self.args.namespace: |
118 | cmd = 'ip netns delete {}'.format(self.args.NAMES['NS']) | 118 | cmd = '$IP netns delete {}'.format(self.args.NAMES['NS']) |
119 | self._exec_cmd('post', cmd) | 119 | self._exec_cmd('post', cmd) |
120 | 120 | ||
121 | def _exec_cmd(self, stage, command): | 121 | def _exec_cmd(self, stage, command): |