diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2017-05-25 15:37:15 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-31 13:08:43 -0400 |
| commit | 003c6678e9c873b3b787a814016872b6592f5069 (patch) | |
| tree | f2fe8634229ec869ced9eb4eceb5db37513141e5 /tests/unittests | |
| parent | 4a60af54957634920e84a928aa22b4fc9a6dfd11 (diff) | |
| download | vyos-cloud-init-003c6678e9c873b3b787a814016872b6592f5069.tar.gz vyos-cloud-init-003c6678e9c873b3b787a814016872b6592f5069.zip | |
net: remove systemd link file writing from eni renderer
During the network v2 merge, we inadvertently re-enabled rendering systemd
.link files. This files are not required as cloud-init already has to do
interface renaming due to issues with udevd which may refuse to rename
certain interfaces (such as veth devices in a LXD container). As such,
removing the code altogether.
Diffstat (limited to 'tests/unittests')
| -rw-r--r-- | tests/unittests/test_net.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 167ed01e..5a0fcbcf 100644 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -992,9 +992,7 @@ class TestEniNetRendering(CiTestCase): os.makedirs(render_dir) renderer = eni.Renderer( - {'links_path_prefix': None, - 'eni_path': 'interfaces', 'netrules_path': None, - }) + {'eni_path': 'interfaces', 'netrules_path': None}) renderer.render_network_state(ns, render_dir) self.assertTrue(os.path.exists(os.path.join(render_dir, @@ -1376,7 +1374,7 @@ class TestNetplanRoundTrip(CiTestCase): class TestEniRoundTrip(CiTestCase): def _render_and_read(self, network_config=None, state=None, eni_path=None, - links_prefix=None, netrules_path=None, dir=None): + netrules_path=None, dir=None): if dir is None: dir = self.tmp_dir() @@ -1391,8 +1389,7 @@ class TestEniRoundTrip(CiTestCase): eni_path = 'etc/network/interfaces' renderer = eni.Renderer( - config={'eni_path': eni_path, 'links_path_prefix': links_prefix, - 'netrules_path': netrules_path}) + config={'eni_path': eni_path, 'netrules_path': netrules_path}) renderer.render_network_state(ns, dir) return dir2dict(dir) |