1
diff --git a/cloudinit/sources/DataSourceScaleway.py b/cloudinit/sources/DataSourceScaleway.py
2
index b573b38..efc6ef3 100644
3
--- a/cloudinit/sources/DataSourceScaleway.py
4
+++ b/cloudinit/sources/DataSourceScaleway.py
5
@@ -227,7 +227,7 @@ class DataSourceScaleway(sources.DataSource):
6
227
        Configure networking according to data received from the
227
        Configure networking according to data received from the
7
228
        metadata API.
228
        metadata API.
8
229
        """
229
        """
10
230
        if self._network_config:
230
        if self._network_config and self._network_config != sources.UNSET:
11
231
            return self._network_config
231
            return self._network_config
12
232
232
13
233
        if self._fallback_interface is None:
233
        if self._fallback_interface is None:
14
diff --git a/tests/unittests/test_datasource/test_scaleway.py b/tests/unittests/test_datasource/test_scaleway.py
15
index f96bf0a..23bb54c 100644
16
--- a/tests/unittests/test_datasource/test_scaleway.py
17
+++ b/tests/unittests/test_datasource/test_scaleway.py
18
@@ -7,6 +7,7 @@ import requests
19
7
7
20
8
from cloudinit import helpers
8
from cloudinit import helpers
21
9
from cloudinit import settings
9
from cloudinit import settings
22
10
from cloudinit import sources
23
10
from cloudinit.sources import DataSourceScaleway
11
from cloudinit.sources import DataSourceScaleway
24
11
12
25
12
from cloudinit.tests.helpers import mock, HttprettyTestCase, CiTestCase
13
from cloudinit.tests.helpers import mock, HttprettyTestCase, CiTestCase
26
@@ -403,3 +404,25 @@ class TestDataSourceScaleway(HttprettyTestCase):
27
403
404
28
404
        netcfg = self.datasource.network_config
405
        netcfg = self.datasource.network_config
29
405
        self.assertEqual(netcfg, '0xdeadbeef')
406
        self.assertEqual(netcfg, '0xdeadbeef')
30
407
31
408
    @mock.patch('cloudinit.sources.DataSourceScaleway.net.find_fallback_nic')
32
409
    @mock.patch('cloudinit.util.get_cmdline')
33
410
    def test_network_config_unset(self, m_get_cmdline, fallback_nic):
34
411
        """
35
412
        _network_config will be set to sources.UNSET after the first run.
36
413
        Make sure it behave correctly.
37
414
        """
38
415
        m_get_cmdline.return_value = 'scaleway'
39
416
        fallback_nic.return_value = 'ens2'
40
417
        self.datasource.metadata['ipv6'] = None
41
418
        self.datasource._network_config = sources.UNSET
42
419
43
420
        resp = {'version': 1,
44
421
                'config': [{
45
422
                     'type': 'physical',
46
423
                     'name': 'ens2',
47
424
                     'subnets': [{'type': 'dhcp4'}]}]
48
425
                }
49
426
50
427
        netcfg = self.datasource.network_config
51
428
        self.assertEqual(netcfg, resp)
Status:	Rejected
Rejected by:	Dan Watkins on 2020-01-06
Proposed branch:	~louis/cloud-init:fix_scaleway_datasource_backtrace
Merge into:	cloud-init:master
Diff against target:	51 lines (+24/-1) 2 files modified cloudinit/sources/DataSourceScaleway.py (+1/-1) tests/unittests/test_datasource/test_scaleway.py (+23/-0)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2019-12-26
cloud-init Commiters		2019-12-23	Pending
Review via email: mp+377090@code.launchpad.net