.. | .. |
---|
18 | 18 | |
---|
19 | 19 | if self.args.namespace: |
---|
20 | 20 | self._ns_create() |
---|
| 21 | + else: |
---|
| 22 | + self._ports_create() |
---|
21 | 23 | |
---|
22 | 24 | def post_suite(self, index): |
---|
23 | 25 | '''run commands after test_runner goes into a test loop''' |
---|
.. | .. |
---|
27 | 29 | |
---|
28 | 30 | if self.args.namespace: |
---|
29 | 31 | self._ns_destroy() |
---|
| 32 | + else: |
---|
| 33 | + self._ports_destroy() |
---|
30 | 34 | |
---|
31 | 35 | def add_args(self, parser): |
---|
32 | 36 | super().add_args(parser) |
---|
.. | .. |
---|
34 | 38 | 'netns', |
---|
35 | 39 | 'options for nsPlugin(run commands in net namespace)') |
---|
36 | 40 | self.argparser_group.add_argument( |
---|
37 | | - '-n', '--namespace', action='store_true', |
---|
38 | | - help='Run commands in namespace') |
---|
| 41 | + '-N', '--no-namespace', action='store_false', default=True, |
---|
| 42 | + dest='namespace', help='Don\'t run commands in namespace') |
---|
39 | 43 | return self.argparser |
---|
40 | 44 | |
---|
41 | 45 | def adjust_command(self, stage, command): |
---|
.. | .. |
---|
60 | 64 | cmdlist.insert(0, self.args.NAMES['NS']) |
---|
61 | 65 | cmdlist.insert(0, 'exec') |
---|
62 | 66 | cmdlist.insert(0, 'netns') |
---|
63 | | - cmdlist.insert(0, 'ip') |
---|
| 67 | + cmdlist.insert(0, self.args.NAMES['IP']) |
---|
64 | 68 | else: |
---|
65 | 69 | pass |
---|
66 | 70 | |
---|
.. | .. |
---|
73 | 77 | print('adjust_command: return command [{}]'.format(command)) |
---|
74 | 78 | return command |
---|
75 | 79 | |
---|
| 80 | + def _ports_create(self): |
---|
| 81 | + cmd = '$IP link add $DEV0 type veth peer name $DEV1' |
---|
| 82 | + self._exec_cmd('pre', cmd) |
---|
| 83 | + cmd = '$IP link set $DEV0 up' |
---|
| 84 | + self._exec_cmd('pre', cmd) |
---|
| 85 | + if not self.args.namespace: |
---|
| 86 | + cmd = '$IP link set $DEV1 up' |
---|
| 87 | + self._exec_cmd('pre', cmd) |
---|
| 88 | + |
---|
| 89 | + def _ports_destroy(self): |
---|
| 90 | + cmd = '$IP link del $DEV0' |
---|
| 91 | + self._exec_cmd('post', cmd) |
---|
| 92 | + |
---|
76 | 93 | def _ns_create(self): |
---|
77 | 94 | ''' |
---|
78 | 95 | Create the network namespace in which the tests will be run and set up |
---|
79 | 96 | the required network devices for it. |
---|
80 | 97 | ''' |
---|
| 98 | + self._ports_create() |
---|
81 | 99 | if self.args.namespace: |
---|
82 | | - cmd = 'ip netns add {}'.format(self.args.NAMES['NS']) |
---|
| 100 | + cmd = '$IP netns add {}'.format(self.args.NAMES['NS']) |
---|
83 | 101 | self._exec_cmd('pre', cmd) |
---|
84 | | - cmd = 'ip link add $DEV0 type veth peer name $DEV1' |
---|
| 102 | + cmd = '$IP link set $DEV1 netns {}'.format(self.args.NAMES['NS']) |
---|
85 | 103 | self._exec_cmd('pre', cmd) |
---|
86 | | - cmd = 'ip link set $DEV1 netns {}'.format(self.args.NAMES['NS']) |
---|
87 | | - self._exec_cmd('pre', cmd) |
---|
88 | | - cmd = 'ip link set $DEV0 up' |
---|
89 | | - self._exec_cmd('pre', cmd) |
---|
90 | | - 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']) |
---|
91 | 105 | self._exec_cmd('pre', cmd) |
---|
92 | 106 | if self.args.device: |
---|
93 | | - cmd = 'ip link set $DEV2 netns {}'.format(self.args.NAMES['NS']) |
---|
| 107 | + cmd = '$IP link set $DEV2 netns {}'.format(self.args.NAMES['NS']) |
---|
94 | 108 | self._exec_cmd('pre', cmd) |
---|
95 | | - 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']) |
---|
96 | 110 | self._exec_cmd('pre', cmd) |
---|
97 | 111 | |
---|
98 | 112 | def _ns_destroy(self): |
---|
.. | .. |
---|
101 | 115 | devices as well) |
---|
102 | 116 | ''' |
---|
103 | 117 | if self.args.namespace: |
---|
104 | | - cmd = 'ip netns delete {}'.format(self.args.NAMES['NS']) |
---|
| 118 | + cmd = '$IP netns delete {}'.format(self.args.NAMES['NS']) |
---|
105 | 119 | self._exec_cmd('post', cmd) |
---|
106 | 120 | |
---|
107 | 121 | def _exec_cmd(self, stage, command): |
---|