cli: Don't back up networkd config

As the generator will always be called during `netplan apply`, there's
no need to maintain a backup of these files.

Signed-off-by: Wesley Hershberger <wesley.hershberger@canonical.com>

Author: MggMuggins

netplan_cli/configmanager.py

@@ -108,25 +108,17 @@ def backup(self, backup_config_dir=True):
         self._copy_tree(os.path.join(self.prefix, "run/NetworkManager/system-connections"),
                         os.path.join(self.temp_run, "NetworkManager", "system-connections"),
                         missing_ok=True)
-        self._copy_tree(os.path.join(self.prefix, "run/systemd/network"),
-                        os.path.join(self.temp_run, "systemd", "network"),
-                        missing_ok=True)
 
     def revert(self):
         try:
             for extra_file in dict(self.extra_files):
                 os.unlink(self.extra_files[extra_file])
                 del self.extra_files[extra_file]
             temp_nm_path = "{}/NetworkManager/system-connections".format(self.temp_run)
-            temp_networkd_path = "{}/systemd/network".format(self.temp_run)
             if os.path.exists(temp_nm_path):
                 shutil.rmtree(os.path.join(self.prefix, "run/NetworkManager/system-connections"))
                 self._copy_tree(temp_nm_path,
                                 os.path.join(self.prefix, "run/NetworkManager/system-connections"))
-            if os.path.exists(temp_networkd_path):
-                shutil.rmtree(os.path.join(self.prefix, "run/systemd/network"))
-                self._copy_tree(temp_networkd_path,
-                                os.path.join(self.prefix, "run/systemd/network"))
         except Exception as e:  # pragma: nocover (only relevant to filesystem failures)
             # If we reach here, we're in big trouble. We may have wiped out
             # file NM or networkd are using, and we most likely removed the

tests/test_configmanager.py

@@ -30,7 +30,6 @@ def setUp(self):
         self.workdir = tempfile.TemporaryDirectory()
         self.configmanager = ConfigManager(prefix=self.workdir.name, extra_files={})
         os.makedirs(os.path.join(self.workdir.name, "etc/netplan"))
-        os.makedirs(os.path.join(self.workdir.name, "run/systemd/network"))
         os.makedirs(os.path.join(self.workdir.name, "run/NetworkManager/system-connections"))
         with open(os.path.join(self.workdir.name, "newfile.yaml"), 'w') as fd:
             print('''network:
@@ -185,8 +184,6 @@ def setUp(self):
     veth0-peer2:
       peer: veth0-peer1
 ''', file=fd)
-        with open(os.path.join(self.workdir.name, "run/systemd/network/01-pretend.network"), 'w') as fd:
-            print("pretend .network", file=fd)
         with open(os.path.join(self.workdir.name, "run/NetworkManager/system-connections/pretend"), 'w') as fd:
             print("pretend NM config", file=fd)
 
@@ -266,36 +263,33 @@ def test_add(self):
 
     def test_backup_missing_dirs(self):
         backup_dir = self.configmanager.tempdir
-        shutil.rmtree(os.path.join(self.workdir.name, "run/systemd/network"))
+        shutil.rmtree(os.path.join(self.workdir.name, "run/NetworkManager/system-connections"))
         self.configmanager.backup(backup_config_dir=False)
-        self.assertTrue(os.path.exists(os.path.join(backup_dir, "run/NetworkManager/system-connections/pretend")))
         # no source dir means no backup as well
-        self.assertFalse(os.path.exists(os.path.join(backup_dir, "run/systemd/network/01-pretend.network")))
+        self.assertFalse(os.path.exists(os.path.join(backup_dir, "run/NetworkManager/system-connections/pretend")))
         self.assertFalse(os.path.exists(os.path.join(backup_dir, "etc/netplan/test.yaml")))
 
     def test_backup_without_config_file(self):
         backup_dir = self.configmanager.tempdir
         self.configmanager.backup(backup_config_dir=False)
         self.assertTrue(os.path.exists(os.path.join(backup_dir, "run/NetworkManager/system-connections/pretend")))
-        self.assertTrue(os.path.exists(os.path.join(backup_dir, "run/systemd/network/01-pretend.network")))
         self.assertFalse(os.path.exists(os.path.join(backup_dir, "etc/netplan/test.yaml")))
 
     def test_backup_with_config_file(self):
         backup_dir = self.configmanager.tempdir
         self.configmanager.backup(backup_config_dir=True)
         self.assertTrue(os.path.exists(os.path.join(backup_dir, "run/NetworkManager/system-connections/pretend")))
-        self.assertTrue(os.path.exists(os.path.join(backup_dir, "run/systemd/network/01-pretend.network")))
         self.assertTrue(os.path.exists(os.path.join(backup_dir, "etc/netplan/test.yaml")))
 
     def test_revert(self):
         self.configmanager.backup()
-        with open(os.path.join(self.workdir.name, "run/systemd/network/01-pretend.network"), 'a+') as fd:
+        with open(os.path.join(self.workdir.name, "run/NetworkManager/system-connections/pretend"), 'a+') as fd:
             print("CHANGED", file=fd)
-        with open(os.path.join(self.workdir.name, "run/systemd/network/01-pretend.network"), 'r') as fd:
+        with open(os.path.join(self.workdir.name, "run/NetworkManager/system-connections/pretend"), 'r') as fd:
             lines = fd.readlines()
             self.assertIn("CHANGED\n", lines)
         self.configmanager.revert()
-        with open(os.path.join(self.workdir.name, "run/systemd/network/01-pretend.network"), 'r') as fd:
+        with open(os.path.join(self.workdir.name, "run/NetworkManager/system-connections/pretend"), 'r') as fd:
             lines = fd.readlines()
             self.assertNotIn("CHANGED\n", lines)