← Back to branch summary

~cloud-init-dev/cloud-init/trunk

« back to all changes in this revision

Viewing changes to tests/unittests/test_distros/test_netconfig.py

Enable flake8 and fix a large amount of reported issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/test_distros/test_netconfig.py
1
1
import os
 
2
from six import StringIO
2
3
 
3
4
try:
4
5
    from unittest import mock
9
10
except ImportError:
10
11
    from contextlib2 import ExitStack
11
12
 
12
 
from six import StringIO
13
13
from ..helpers import TestCase
14
14
 
15
15
from cloudinit import distros
 
16
from cloudinit.distros.parsers.sys_conf import SysConf
16
17
from cloudinit import helpers
17
18
from cloudinit import settings
18
19
from cloudinit import util
19
20
 
20
 
from cloudinit.distros.parsers.sys_conf import SysConf
21
 
 
22
21
 
23
22
BASE_NET_CFG = '''
24
23
auto lo
108
107
 
109
108
            ub_distro.apply_network(BASE_NET_CFG, False)
110
109
 
111
 
            self.assertEquals(len(write_bufs), 1)
 
110
            self.assertEqual(len(write_bufs), 1)
112
111
            eni_name = '/etc/network/interfaces.d/50-cloud-init.cfg'
113
112
            self.assertIn(eni_name, write_bufs)
114
113
            write_buf = write_bufs[eni_name]
115
 
            self.assertEquals(str(write_buf).strip(), BASE_NET_CFG.strip())
116
 
            self.assertEquals(write_buf.mode, 0o644)
 
114
            self.assertEqual(str(write_buf).strip(), BASE_NET_CFG.strip())
 
115
            self.assertEqual(write_buf.mode, 0o644)
117
116
 
118
117
    def assertCfgEquals(self, blob1, blob2):
119
118
        b1 = dict(SysConf(blob1.strip().splitlines()))
120
119
        b2 = dict(SysConf(blob2.strip().splitlines()))
121
 
        self.assertEquals(b1, b2)
 
120
        self.assertEqual(b1, b2)
122
121
        for (k, v) in b1.items():
123
122
            self.assertIn(k, b2)
124
123
        for (k, v) in b2.items():
125
124
            self.assertIn(k, b1)
126
125
        for (k, v) in b1.items():
127
 
            self.assertEquals(v, b2[k])
 
126
            self.assertEqual(v, b2[k])
128
127
 
129
128
    def test_simple_write_rh(self):
130
129
        rh_distro = self._get_distro('rhel')
148
147
 
149
148
            rh_distro.apply_network(BASE_NET_CFG, False)
150
149
 
151
 
            self.assertEquals(len(write_bufs), 4)
 
150
            self.assertEqual(len(write_bufs), 4)
152
151
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-lo',
153
152
                          write_bufs)
154
153
            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-lo']
157
156
ONBOOT=yes
158
157
'''
159
158
            self.assertCfgEquals(expected_buf, str(write_buf))
160
 
            self.assertEquals(write_buf.mode, 0o644)
 
159
            self.assertEqual(write_buf.mode, 0o644)
161
160
 
162
161
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth0',
163
162
                          write_bufs)
172
171
BROADCAST="192.168.1.0"
173
172
'''
174
173
            self.assertCfgEquals(expected_buf, str(write_buf))
175
 
            self.assertEquals(write_buf.mode, 0o644)
 
174
            self.assertEqual(write_buf.mode, 0o644)
176
175
 
177
176
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth1',
178
177
                          write_bufs)
183
182
ONBOOT=yes
184
183
'''
185
184
            self.assertCfgEquals(expected_buf, str(write_buf))
186
 
            self.assertEquals(write_buf.mode, 0o644)
 
185
            self.assertEqual(write_buf.mode, 0o644)
187
186
 
188
187
            self.assertIn('/etc/sysconfig/network', write_bufs)
189
188
            write_buf = write_bufs['/etc/sysconfig/network']
192
191
NETWORKING=yes
193
192
'''
194
193
            self.assertCfgEquals(expected_buf, str(write_buf))
195
 
            self.assertEquals(write_buf.mode, 0o644)
 
194
            self.assertEqual(write_buf.mode, 0o644)
196
195
 
197
196
    def test_write_ipv6_rhel(self):
198
197
        rh_distro = self._get_distro('rhel')
216
215
 
217
216
            rh_distro.apply_network(BASE_NET_CFG_IPV6, False)
218
217
 
219
 
            self.assertEquals(len(write_bufs), 4)
 
218
            self.assertEqual(len(write_bufs), 4)
220
219
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-lo',
221
220
                          write_bufs)
222
221
            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-lo']
225
224
ONBOOT=yes
226
225
'''
227
226
            self.assertCfgEquals(expected_buf, str(write_buf))
228
 
            self.assertEquals(write_buf.mode, 0o644)
 
227
            self.assertEqual(write_buf.mode, 0o644)
229
228
 
230
229
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth0',
231
230
                          write_bufs)
243
242
IPV6_DEFAULTGW="2607:f0d0:1002:0011::1"
244
243
'''
245
244
            self.assertCfgEquals(expected_buf, str(write_buf))
246
 
            self.assertEquals(write_buf.mode, 0o644)
 
245
            self.assertEqual(write_buf.mode, 0o644)
247
246
            self.assertIn('/etc/sysconfig/network-scripts/ifcfg-eth1',
248
247
                          write_bufs)
249
248
            write_buf = write_bufs['/etc/sysconfig/network-scripts/ifcfg-eth1']
260
259
IPV6_DEFAULTGW="2607:f0d0:1002:0011::1"
261
260
'''
262
261
            self.assertCfgEquals(expected_buf, str(write_buf))
263
 
            self.assertEquals(write_buf.mode, 0o644)
 
262
            self.assertEqual(write_buf.mode, 0o644)
264
263
 
265
264
            self.assertIn('/etc/sysconfig/network', write_bufs)
266
265
            write_buf = write_bufs['/etc/sysconfig/network']
271
270
IPV6_AUTOCONF=no
272
271
'''
273
272
            self.assertCfgEquals(expected_buf, str(write_buf))
274
 
            self.assertEquals(write_buf.mode, 0o644)
 
273
            self.assertEqual(write_buf.mode, 0o644)
275
274
 
276
275
    def test_simple_write_freebsd(self):
277
276
        fbsd_distro = self._get_distro('freebsd')
319
318
defaultrouter="192.168.1.254"
320
319
'''
321
320
            self.assertCfgEquals(expected_buf, str(write_buf))
322
 
            self.assertEquals(write_buf.mode, 0o644)
 
321
            self.assertEqual(write_buf.mode, 0o644)