Adding a path split based on snapper version

Signed-off-by: David Cassany <[email protected]>

Author: davidcassany

kiwi/volume_manager/btrfs.py

@@ -31,6 +31,7 @@
 from kiwi.mount_manager import MountManager
 from kiwi.storage.mapped_device import MappedDevice
 from kiwi.filesystem import FileSystem
+from kiwi.utils.command_capabilities import CommandCapabilities
 from kiwi.utils.sync import DataSync
 from kiwi.utils.block import BlockID
 from kiwi.utils.sysconfig import SysConfig
@@ -541,40 +542,46 @@ def _set_snapper_sysconfig_file(root_path):
         )
 
     def _create_first_snapper_snapshot_as_default(self):
-        snapshot_volume = self.mountpoint + \
-            f'/{self.root_volume_name}/.snapshots'
-        Command.run(
-            ['btrfs', 'subvolume', 'create', snapshot_volume]
-        )
-        os.chmod(snapshot_volume, 0o700)
-        Path.create(snapshot_volume + '/1')
-        snapshot = self.mountpoint + \
-            f'/{self.root_volume_name}/.snapshots/1/snapshot'
-        Command.run(
-            ['btrfs', 'subvolume', 'create', snapshot]
-        )
-        self._set_default_volume(
-            f'{self.root_volume_name}/.snapshots/1/snapshot'
-        )
+        if not CommandCapabilities.check_version(
+            'snapper', (0,12,1), root=self.root_dir
+        ):
+            snapshot_volume = self.mountpoint + \
+                f'/{self.root_volume_name}/.snapshots'
+            Command.run(
+                ['btrfs', 'subvolume', 'create', snapshot_volume]
+            )
+            os.chmod(snapshot_volume, 0o700)
+            Path.create(snapshot_volume + '/1')
+            snapshot = self.mountpoint + \
+                f'/{self.root_volume_name}/.snapshots/1/snapshot'
+            Command.run(
+                ['btrfs', 'subvolume', 'create', snapshot]
+            )
+            self._set_default_volume(
+                f'{self.root_volume_name}/.snapshots/1/snapshot'
+            )
 
     def _create_snapshot_info(self, path):
-        date_info = datetime.datetime.now()
-        snapshot = ElementTree.Element('snapshot')
+        if not CommandCapabilities.check_version(
+            'snapper', (0,12,1), root=self.mountpoint
+        ):
+            date_info = datetime.datetime.now()
+            snapshot = ElementTree.Element('snapshot')
 
-        snapshot_type = ElementTree.SubElement(snapshot, 'type')
-        snapshot_type.text = 'single'
+            snapshot_type = ElementTree.SubElement(snapshot, 'type')
+            snapshot_type.text = 'single'
 
-        snapshot_number = ElementTree.SubElement(snapshot, 'num')
-        snapshot_number.text = '1'
+            snapshot_number = ElementTree.SubElement(snapshot, 'num')
+            snapshot_number.text = '1'
 
-        snapshot_description = ElementTree.SubElement(snapshot, 'description')
-        snapshot_description.text = 'first root filesystem'
+            snapshot_description = ElementTree.SubElement(snapshot, 'description')
+            snapshot_description.text = 'first root filesystem'
 
-        snapshot_date = ElementTree.SubElement(snapshot, 'date')
-        snapshot_date.text = date_info.strftime("%Y-%m-%d %H:%M:%S")
+            snapshot_date = ElementTree.SubElement(snapshot, 'date')
+            snapshot_date.text = date_info.strftime("%Y-%m-%d %H:%M:%S")
 
-        with open(os.path.join(path, 'info.xml'), 'w') as snapshot_info_file:
-            snapshot_info_file.write(self._xml_pretty(snapshot))
+            with open(os.path.join(path, 'info.xml'), 'w') as snapshot_info_file:
+                snapshot_info_file.write(self._xml_pretty(snapshot))
 
     def __exit__(self, exc_type, exc_value, traceback):
         if self.toplevel_mount:

test/unit/volume_manager/btrfs_test.py

@@ -132,15 +132,25 @@ def test_setup_with_snapshot(
         self, mock_Temporary, mock_mount, mock_mapped_device, mock_fs,
         mock_command, mock_os_exists, mock_os_chmod
     ):
+        def return_snapper_version(cmd, *args):
+            mock = Mock()
+            snapperCmd = ['chroot', 'snapper', '--version']
+            subCmd = [element for element in cmd if element in snapperCmd]
+            if snapperCmd == subCmd:
+                mock = Mock()
+                mock.output = 'snapper 0.12.0'
+            else:
+                mock.output = \
+                    'ID 258 gen 26 top level 257 path @/.snapshots/1/snapshot'
+            return mock
+
+        mock_command.side_effect = return_snapper_version
+
         mock_Temporary.return_value.new_dir.return_value.name = 'tmpdir'
         toplevel_mount = Mock()
         mock_mount.return_value = toplevel_mount
-        command_call = Mock()
-        command_call.output = \
-            'ID 258 gen 26 top level 257 path @/.snapshots/1/snapshot'
         mock_mapped_device.return_value = 'mapped_device'
         mock_os_exists.return_value = False
-        mock_command.return_value = command_call
         self.volume_manager.custom_args['root_is_snapper_snapshot'] = True
         self.volume_manager.custom_args['quota_groups'] = True
 
@@ -161,6 +171,7 @@ def test_setup_with_snapshot(
         assert mock_command.call_args_list == [
             call(['btrfs', 'quota', 'enable', 'tmpdir']),
             call(['btrfs', 'subvolume', 'create', 'tmpdir/@']),
+            call(['chroot', 'root_dir', 'snapper', '--version']),
             call(['btrfs', 'subvolume', 'create', 'tmpdir/@/.snapshots']),
             call(['btrfs', 'subvolume', 'create', 'tmpdir/@/.snapshots/1/snapshot']),
             call(['btrfs', 'subvolume', 'list', 'tmpdir']),
@@ -436,6 +447,16 @@ def exists(name):
                 return False
             return True
 
+        def return_snapper_version(cmd, *args):
+            snapperCmd = ['chroot', 'snapper', '--version']
+            subCmd = [element for element in cmd if element in snapperCmd]
+            if snapperCmd == subCmd:
+                mock = Mock()
+                mock.output = 'snapper 0.12.0'
+                return mock
+
+        mock_command.side_effect = return_snapper_version
+
         self.volume_manager.custom_args['quota_groups'] = True
         mock_exists.side_effect = exists
 
@@ -479,6 +500,7 @@ def exists(name):
             call(minidom.parseString(xml_info).toprettyxml(indent="    "))
         ]
         assert mock_command.call_args_list == [
+            call(['chroot', 'tmpdir', 'snapper', '--version']),
             call(['btrfs', 'qgroup', 'create', '1/0', 'tmpdir']),
             call([
                 'chroot', 'tmpdir/@/.snapshots/1/snapshot',
@@ -502,6 +524,16 @@ def getitem(key):
         def contains(key):
             return key in item
 
+        def return_snapper_version(cmd, *args):
+            snapperCmd = ['chroot', 'snapper', '--version']
+            subCmd = [element for element in cmd if element in snapperCmd] 
+            if snapperCmd == subCmd:
+                mock = Mock()
+                mock.output = 'snapper 0.12.0'
+                return mock
+
+        mock_command.side_effect = return_snapper_version
+
         sysconf = Mock()
         sysconf.__contains__ = Mock(side_effect=contains)
         sysconf.__getitem__ = Mock(side_effect=getitem)