Merge ~raharper/curtin:fix/swap-files-on-btrfs into curtin:master

[Ryan Harper]

swaps: handle swapfiles on btrfs

Special care and handling are needed for creating swap files on top
of btrfs filesystems. Curtin will attempt to disable btrfs CoW
on the target file before attempting to fallocate/dd the file.

- Btrfs swapfile requires target kernel 5.0+, older kernels cannot use.
  https://btrfs.wiki.kernel.org/index.php/FAQ
- Query target fstype to check if we can proceed with swap file
  btrfs requires newer kernel, xfs cannot use fallocate
- Update distro.parse_dpkg_version to handle additional formatting
  including linux-image-generic, and versions with Epoch present.
- Adjust TestBasic,TestScsiBasic to add a swapfile to the /btrfs target
- Add the swap partition/file to TestBasic's fstab unittest
- Fix test_swaps_used to use fstab data instead of storage config
  since file-based swaps are created via curtin 'swap' config not
  storage-config.
- Add swap config key 'force', default is false
- Add curtin feature flag, BTRFS_SWAPFILE

LP: #1884161

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:e0e89ae1240db5c2da577f9f9e02db22401f2c70
https://jenkins.ubuntu.com/server/job/curtin-ci/151/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/151/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/151/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/151/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/151/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/151//rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

The Bionic/Xenial tests are failing due to the kernel version; prior to kernel 5.0, brtfs does not implement the required features to support a swapfile

https://btrfs.wiki.kernel.org/index.php/FAQ#Does_btrfs_support_swap_files

I'm fixing this branch to detect the target linux version installed and will skip creating a swapfile if not < 5.0

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:8b1ba51091ec5e82fb0ffa502492845a14a2581e
https://jenkins.ubuntu.com/server/job/curtin-ci/152/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/152/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/152/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/152/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/152/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/152//rebuild

review: Needs Fixing (continuous-integration)

[Paride Legovini (paride)]

Just in case it's useful here is the output of the CI run:

https://paste.ubuntu.com/p/tPJnMZdqm8/

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:4643789b9c02d029e377ccd7be9b88a003c5ec73
https://jenkins.ubuntu.com/server/job/curtin-ci/153/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/153/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/153/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/153/
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/153/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/153//rebuild

review: Needs Fixing (continuous-integration)

[Chad Smith (chad.smith)]

Latest test run https://paste.ubuntu.com/p/SWxRcZqGGm/

[Chad Smith (chad.smith)]

and the install.log https://paste.ubuntu.com/p/RjMyyd7sC7/

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:0c596d8db22a1e54dbfff2c0783bdc93c209efe4
https://jenkins.ubuntu.com/server/job/curtin-ci/154/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/154/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/154/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/154/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/154/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/154//rebuild

review: Approve (continuous-integration)

[Paride Legovini (paride)]

Nice, thanks Ryan! I left some inline comments.

review: Needs Fixing

[Ryan Harper (raharper)]

Thanks for the review, I'll address your comments.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:994563e081cefb2bcc283ee70865242397ee3d9d
https://jenkins.ubuntu.com/server/job/curtin-ci/155/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/155/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/155/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/155/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/155/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/155//rebuild

review: Approve (continuous-integration)

[Paride Legovini (paride)]

LGTM modulo one too much "they".

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:beccf1f0b604b9f71e018d31416c871e61919624
https://jenkins.ubuntu.com/server/job/curtin-ci/156/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/156/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/156/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/156/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/156/

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/156//rebuild

review: Approve (continuous-integration)

[Paride Legovini (paride)]

review: Approve

[Server Team CI bot (server-team-bot)]

Commit message lints:
- Line #7 has 1 too many characters. Line starts with: " https://btrfs.wiki.kernel.org/index.php/FAQ#Does_btrfs_support_swap_file"...

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

Autolanding: FAILED
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/curtin-autoland-test/222/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-amd64/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-arm64/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-ppc64el/222/
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-autoland-test/nodes=metal-s390x/222/

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

review: Approve (continuous-integration)

diff --git a/curtin/__init__.py b/curtin/__init__.py
index 2e1a0ed..ae4ce11 100644
--- a/curtin/__init__.py
+++ b/curtin/__init__.py
@@ -8,6 +8,8 @@ KERNEL_CMDLINE_COPY_TO_INSTALL_SEP = "---"
 # can determine which features are supported.  Each entry should have
 # a consistent meaning.
 FEATURES = [
+    # curtin supports creating swapfiles on btrfs, if possible
+    'BTRFS_SWAPFILE',
     # curtin can apply centos networking via centos_apply_network_config
     'CENTOS_APPLY_NETWORK_CONFIG',
     # curtin can configure centos storage devices and boot devices
diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index d66afa7..458eb9d 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -900,6 +900,7 @@ def add_swap(cfg, target, fstab):
     fname = swapcfg.get('filename', None)
     size = swapcfg.get('size', None)
     maxsize = swapcfg.get('maxsize', None)
+    force = swapcfg.get('force', False)
 
     if size:
         size = util.human2bytes(str(size))
@@ -907,7 +908,7 @@ def add_swap(cfg, target, fstab):
         maxsize = util.human2bytes(str(maxsize))
 
     swap.setup_swapfile(target=target, fstab=fstab, swapfile=fname, size=size,
-                        maxsize=maxsize)
+                        maxsize=maxsize, force=force)
 
 
 def detect_and_handle_multipath(cfg, target, osfamily=DISTROS.debian):
diff --git a/curtin/commands/swap.py b/curtin/commands/swap.py
index f2381e6..089cd73 100644
--- a/curtin/commands/swap.py
+++ b/curtin/commands/swap.py
@@ -40,7 +40,7 @@ def swap_main(args):
 
     swap.setup_swapfile(target=state['target'], fstab=state['fstab'],
                         swapfile=args.swapfile, size=size,
-                        maxsize=args.maxsize)
+                        maxsize=args.maxsize, force=args.force)
     sys.exit(2)
 
 
@@ -54,6 +54,9 @@ CMD_ARGUMENTS = (
                 'default is env[TARGET_MOUNT_POINT]'),
        'action': 'store', 'metavar': 'TARGET',
        'default': os.environ.get('TARGET_MOUNT_POINT')}),
+     (('-F', '--force'),
+      {'help': 'force creating of swapfile even if it may fail (btrfs,xfs)',
+               'default': False, 'action': 'store_true'}),
      (('-s', '--size'),
       {'help': 'size of swap file (eg: 1G, 1500M, 1024K, 100000. def: "auto")',
                'default': None, 'action': 'store'}),
diff --git a/curtin/distro.py b/curtin/distro.py
index 43b0c19..e2af24a 100644
--- a/curtin/distro.py
+++ b/curtin/distro.py
@@ -472,6 +472,7 @@ def parse_dpkg_version(raw, name=None, semx=None):
        as the upstream version.
 
        returns a dictionary with fields:
+          'epoch'
           'major' (int), 'minor' (int), 'micro' (int),
           'semantic_version' (int),
           'extra' (string), 'raw' (string), 'upstream' (string),
@@ -484,12 +485,20 @@ def parse_dpkg_version(raw, name=None, semx=None):
     if semx is None:
         semx = (10000, 100, 1)
 
-    if "-" in raw:
-        upstream = raw.rsplit('-', 1)[0]
+    raw_offset = 0
+    if ':' in raw:
+        epoch, _, upstream = raw.partition(':')
+        raw_offset = len(epoch) + 1
     else:
-        # this is a native package, package version treated as upstream.
+        epoch = 0
         upstream = raw
 
+    if "-" in raw[raw_offset:]:
+        upstream = raw[raw_offset:].rsplit('-', 1)[0]
+    else:
+        # this is a native package, package version treated as upstream.
+        upstream = raw[raw_offset:]
+
     match = re.search(r'[^0-9.]', upstream)
     if match:
         extra = upstream[match.start():]
@@ -498,8 +507,10 @@ def parse_dpkg_version(raw, name=None, semx=None):
         upstream_base = upstream
         extra = None
 
-    toks = upstream_base.split(".", 2)
-    if len(toks) == 3:
+    toks = upstream_base.split(".", 3)
+    if len(toks) == 4:
+        major, minor, micro, extra = toks
+    elif len(toks) == 3:
         major, minor, micro = toks
     elif len(toks) == 2:
         major, minor, micro = (toks[0], toks[1], 0)
@@ -507,6 +518,7 @@ def parse_dpkg_version(raw, name=None, semx=None):
         major, minor, micro = (toks[0], 0, 0)
 
     version = {
+        'epoch': int(epoch),
         'major': int(major),
         'minor': int(minor),
         'micro': int(micro),
diff --git a/curtin/swap.py b/curtin/swap.py
index d3f29dc..11e95c4 100644
--- a/curtin/swap.py
+++ b/curtin/swap.py
@@ -5,6 +5,8 @@ import resource
 
 from .log import LOG
 from . import util
+from curtin import paths
+from curtin import distro
 
 
 def suggested_swapsize(memsize=None, maxsize=None, fsys=None):
@@ -51,7 +53,62 @@ def suggested_swapsize(memsize=None, maxsize=None, fsys=None):
     return maxsize
 
 
-def setup_swapfile(target, fstab=None, swapfile=None, size=None, maxsize=None):
+def get_fstype(target, source):
+    target_source = paths.target_path(target, source)
+    try:
+        out, _ = util.subp(['findmnt', '--noheading', '--target',
+                            target_source, '-o', 'FSTYPE'], capture=True)
+    except util.ProcessExecutionError as exc:
+        LOG.warning('Failed to query %s fstype, findmnt returned error: %s',
+                    target_source, exc)
+        return None
+
+    if out:
+        """
+        $ findmnt --noheading --target /btrfs  -o FSTYPE
+        btrfs
+        """
+        return out.splitlines()[-1]
+
+    return None
+
+
+def get_target_kernel_version(target):
+    pkg_ver = None
+
+    distro_info = distro.get_distroinfo(target=target)
+    if not distro_info:
+        raise RuntimeError('Failed to determine target distro')
+    osfamily = distro_info.family
+    if osfamily == distro.DISTROS.debian:
+        try:
+            # check in-target version
+            pkg_ver = distro.get_package_version('linux-image-generic',
+                                                 target=target)
+        except Exception as e:
+            LOG.warn(
+                "failed reading linux-image-generic package version, %s", e)
+    return pkg_ver
+
+
+def can_use_swapfile(target, fstype):
+    if fstype is None:
+        raise RuntimeError(
+            'Unknown target filesystem type, may not support swapfiles')
+    if fstype in ['btrfs', 'xfs']:
+        # check kernel version
+        pkg_ver = get_target_kernel_version(target)
+        if not pkg_ver:
+            raise RuntimeError('Failed to read target kernel version')
+        if fstype == 'btrfs' and pkg_ver['major'] < 5:
+            raise RuntimeError(
+                'btrfs requiers kernel version 5.0+ to use swapfiles')
+    elif fstype in ['zfs']:
+        raise RuntimeError('ZFS cannot use swapfiles')
+
+
+def setup_swapfile(target, fstab=None, swapfile=None, size=None, maxsize=None,
+                   force=False):
     if size is None:
         size = suggested_swapsize(fsys=target, maxsize=maxsize)
 
@@ -65,6 +122,24 @@ def setup_swapfile(target, fstab=None, swapfile=None, size=None, maxsize=None):
     if not swapfile.startswith("/"):
         swapfile = "/" + swapfile
 
+    # query the directory in which swapfile will reside
+    fstype = get_fstype(target, os.path.dirname(swapfile))
+    try:
+        can_use_swapfile(target, fstype)
+    except RuntimeError as err:
+        if force:
+            LOG.warning('swapfile may not work: %s', err)
+        else:
+            LOG.debug('Not creating swap: %s', err)
+            return
+
+    allocate_cmd = 'fallocate -l "${2}M" "$1"'
+    # fallocate uses IOCTLs to allocate space in a filesystem, however it's not
+    # clear (from curtin's POV) that it creates non-sparse files as required by
+    # mkswap so we'll skip fallocate for now and use dd.
+    if fstype in ['btrfs', 'xfs']:
+        allocate_cmd = 'dd if=/dev/zero "of=$1" bs=1M "count=$2"'
+
     mbsize = str(int(size / (2 ** 20)))
     msg = "creating swap file '%s' of %sMB" % (swapfile, mbsize)
     fpath = os.path.sep.join([target, swapfile])
@@ -73,10 +148,9 @@ def setup_swapfile(target, fstab=None, swapfile=None, size=None, maxsize=None):
         with util.LogTimer(LOG.debug, msg):
             util.subp(
                 ['sh', '-c',
-                 ('rm -f "$1" && umask 0066 && '
-                  '{ fallocate -l "${2}M" "$1" || '
-                  '  dd if=/dev/zero "of=$1" bs=1M "count=$2"; } && '
-                  'mkswap "$1" || { r=$?; rm -f "$1"; exit $r; }'),
+                 ('rm -f "$1" && umask 0066 && truncate -s 0 "$1" && '
+                  '{ chattr +C "$1" || true; } && ') + allocate_cmd +
+                 (' && mkswap "$1" || { r=$?; rm -f "$1"; exit $r; }'),
                  'setup_swap', fpath, mbsize])
     except Exception:
         LOG.warn("failed %s" % msg)
diff --git a/doc/topics/config.rst b/doc/topics/config.rst
index 72cd683..7f8396e 100644
--- a/doc/topics/config.rst
+++ b/doc/topics/config.rst
@@ -752,13 +752,27 @@ Configure the max size of the swapfile, defaults to 8GB
 Configure the exact size of the swapfile.  Setting ``size`` to 0 will
 disable swap.
 
+**force**: *<boolean>*
+
+Force the creation of swapfile even if curtin detects it may not work.
+In some target filesystems, e.g. btrfs, xfs, zfs, the use of a swap file has
+restrictions.  If curtin detects that there may be issues it will refuse
+to create the swapfile.  Users can force creation of a swapfile by passing
+``force: true``.  A forced swapfile may not be used by the target OS and could
+log cause an error.
+
 **Example**::
 
   swap:
     filename: swap.img
-    size: None
+    size: 1GB
     maxsize: 4GB
 
+  swap:
+    filename: btrfs_swapfile.img
+    size: 1GB
+    force: true
+
 
 system_upgrade
 ~~~~~~~~~~~~~~
diff --git a/examples/tests/basic.yaml b/examples/tests/basic.yaml
index 71730c0..82f5ad1 100644
--- a/examples/tests/basic.yaml
+++ b/examples/tests/basic.yaml
@@ -1,4 +1,8 @@
 showtrace: true
+swap:
+    filename: /btrfs/btrfsswap.img
+    size: 1GB
+    maxsize: 1GB
 storage:
     version: 1
     config:
diff --git a/examples/tests/basic_scsi.yaml b/examples/tests/basic_scsi.yaml
index 51f5236..fd28bbe 100644
--- a/examples/tests/basic_scsi.yaml
+++ b/examples/tests/basic_scsi.yaml
@@ -1,4 +1,8 @@
 showtrace: true
+swap:
+    filename: /btrfs/btrfsswap.img
+    size: 1GB
+    maxsize: 1GB
 storage:
     version: 1
     config:
diff --git a/tests/unittests/test_distro.py b/tests/unittests/test_distro.py
index eb62dd8..23c3fba 100644
--- a/tests/unittests/test_distro.py
+++ b/tests/unittests/test_distro.py
@@ -65,7 +65,7 @@ class TestParseDpkgVersion(CiTestCase):
     def test_simple_native_package_version(self):
         """dpkg versions must have a -. If not present expect value error."""
         self.assertEqual(
-            {'major': 2, 'minor': 28, 'micro': 0, 'extra': None,
+            {'epoch': 0, 'major': 2, 'minor': 28, 'micro': 0, 'extra': None,
              'raw': '2.28', 'upstream': '2.28', 'name': 'germinate',
              'semantic_version': 22800},
             distro.parse_dpkg_version('2.28', name='germinate'))
@@ -73,7 +73,7 @@ class TestParseDpkgVersion(CiTestCase):
     def test_complex_native_package_version(self):
         dver = '1.0.106ubuntu2+really1.0.97ubuntu1'
         self.assertEqual(
-            {'major': 1, 'minor': 0, 'micro': 106,
+            {'epoch': 0, 'major': 1, 'minor': 0, 'micro': 106,
              'extra': 'ubuntu2+really1.0.97ubuntu1',
              'raw': dver, 'upstream': dver, 'name': 'debootstrap',
              'semantic_version': 100106},
@@ -82,14 +82,14 @@ class TestParseDpkgVersion(CiTestCase):
 
     def test_simple_valid(self):
         self.assertEqual(
-            {'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
+            {'epoch': 0, 'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
              'raw': '1.2.3-0', 'upstream': '1.2.3', 'name': 'foo',
              'semantic_version': 10203},
             distro.parse_dpkg_version('1.2.3-0', name='foo'))
 
     def test_simple_valid_with_semx(self):
         self.assertEqual(
-            {'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
+            {'epoch': 0, 'major': 1, 'minor': 2, 'micro': 3, 'extra': None,
              'raw': '1.2.3-0', 'upstream': '1.2.3',
              'semantic_version': 123},
             distro.parse_dpkg_version('1.2.3-0', semx=(100, 10, 1)))
@@ -98,7 +98,8 @@ class TestParseDpkgVersion(CiTestCase):
         """upstream versions may have a hyphen."""
         cver = '18.2-14-g6d48d265-0ubuntu1'
         self.assertEqual(
-            {'major': 18, 'minor': 2, 'micro': 0, 'extra': '-14-g6d48d265',
+            {'epoch': 0, 'major': 18, 'minor': 2, 'micro': 0,
+             'extra': '-14-g6d48d265',
              'raw': cver, 'upstream': '18.2-14-g6d48d265',
              'name': 'cloud-init', 'semantic_version': 180200},
             distro.parse_dpkg_version(cver, name='cloud-init'))
@@ -107,11 +108,30 @@ class TestParseDpkgVersion(CiTestCase):
         """multipath tools has a + in it."""
         mver = '0.5.0+git1.656f8865-5ubuntu2.5'
         self.assertEqual(
-            {'major': 0, 'minor': 5, 'micro': 0, 'extra': '+git1.656f8865',
+            {'epoch': 0, 'major': 0, 'minor': 5, 'micro': 0,
+             'extra': '+git1.656f8865',
              'raw': mver, 'upstream': '0.5.0+git1.656f8865',
              'semantic_version': 500},
             distro.parse_dpkg_version(mver))
 
+    def test_package_with_epoch(self):
+        """xxd has epoch"""
+        mver = '2:8.1.2269-1ubuntu5'
+        self.assertEqual(
+            {'epoch': 2, 'major': 8, 'minor': 1, 'micro': 2269,
+             'extra': None, 'raw': mver, 'upstream': '8.1.2269',
+             'semantic_version': 82369},
+            distro.parse_dpkg_version(mver))
+
+    def test_package_with_dot_in_extra(self):
+        """linux-image-generic has multiple dots in extra"""
+        mver = '5.4.0.37.40'
+        self.assertEqual(
+            {'epoch': 0, 'major': 5, 'minor': 4, 'micro': 0,
+             'extra': '37.40', 'raw': mver, 'upstream': '5.4.0.37.40',
+             'semantic_version': 50400},
+            distro.parse_dpkg_version(mver))
+
 
 class TestDistros(CiTestCase):
 
diff --git a/tests/unittests/test_feature.py b/tests/unittests/test_feature.py
index 7c55882..84325ef 100644
--- a/tests/unittests/test_feature.py
+++ b/tests/unittests/test_feature.py
@@ -24,4 +24,7 @@ class TestExportsFeatures(CiTestCase):
     def test_has_centos_curthook_support(self):
         self.assertIn('CENTOS_CURTHOOK_SUPPORT', curtin.FEATURES)
 
+    def test_has_btrfs_swapfile_support(self):
+        self.assertIn('BTRFS_SWAPFILE', curtin.FEATURES)
+
 # vi: ts=4 expandtab syntax=python
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 8ffb7cb..1fc3650 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1676,8 +1676,8 @@ class VMBaseClass(TestCase):
                 if spec in line:
                     fstab_entry = line
                     self.assertIsNotNone(fstab_entry)
-                    self.assertEqual(mp, fstab_entry.split(' ')[1])
-                    self.assertEqual(fsopts, fstab_entry.split(' ')[3])
+                    self.assertEqual(mp, fstab_entry.split()[1])
+                    self.assertEqual(fsopts, fstab_entry.split()[3])
                     found.append((spec, mp, fsopts))
 
         self.assertEqual(sorted(expected), sorted(found))
@@ -1810,6 +1810,36 @@ class VMBaseClass(TestCase):
         self.assertEqual(len(uuid), 36)
         return uuid
 
+    def _byuuid_to_kname(self, devpath):
+        # lookup kname via /dev/disk/by-uuid symlink
+        # parsing ls -al output on /dev/disk/by-uuid:
+        # lrwxrwxrwx 1 root root   9 Dec  4 20:02
+        #  d591e9e9-825a-4f0a-b280-3bfaf470b83c -> ../../vdg
+        uuid = os.path.basename(devpath)
+        self.assertIsNotNone(uuid)
+        print(uuid)
+        ls_uuid = self.load_collect_file("ls_al_byuuid")
+        kname = [line.split()[-1] for line in ls_uuid.split('\n')
+                 if uuid in line.split()]
+        self.assertEqual(len(kname), 1)
+        kname = os.path.basename(kname.pop())
+        return kname
+
+    def _bypath_to_kname(self, devpath):
+        # lookup kname via /dev/disk/by-path symlink
+        # parsing ls -al output on /dev/disk/by-path:
+        # lrwxrwxrwx 1 root root   9 Dec  4 20:02
+        #  pci-0000:00:03.0-scsi-0:0:0:0-part3 -> ../../sda3
+        dpath = os.path.basename(devpath)
+        self.assertIsNotNone(dpath)
+        print(dpath)
+        ls_bypath = self.load_collect_file("ls_al_bypath")
+        kname = [line.split()[-1] for line in ls_bypath.split('\n')
+                 if dpath in line.split()]
+        self.assertEqual(len(kname), 1)
+        kname = os.path.basename(kname.pop())
+        return kname
+
     def _bcache_to_byuuid(self, kname):
         # extract bcache uuid from /dev/bcache/by-uuid on /dev/<kname>
         # parsing ls -al output on /dev/bcache/by-uuid
@@ -1991,25 +2021,33 @@ class VMBaseClass(TestCase):
 
     @skip_if_flag('expected_failure')
     def test_swaps_used(self):
-        if not self.has_storage_config():
-            raise SkipTest("This test does not use storage config.")
 
-        stgcfg = self.get_storage_config()
-        swap_ids = [d["id"] for d in stgcfg if d.get("fstype") == "swap"]
-        swap_mounts = [d for d in stgcfg if d.get("device") in swap_ids]
-        self.assertEqual(len(swap_ids), len(swap_mounts),
-                         "number config swap fstypes != number swap mounts")
-
-        swaps_found = []
-        for line in self.load_collect_file("proc-swaps").splitlines():
-            fname, ttype, size, used, priority = line.split()
-            if ttype == "partition":
-                swaps_found.append(
-                    {"fname": fname, ttype: "ttype", "size": int(size),
-                     "used": int(used), "priority": int(priority)})
-        self.assertEqual(
-            len(swap_mounts), len(swaps_found),
-            "Number swaps configured != number used")
+        def find_fstab_swaps():
+            swaps = []
+            path = self.collect_path("fstab")
+            if not os.path.exists(path):
+                return swaps
+            for line in util.load_file(path).splitlines():
+                if line.startswith("#"):
+                    continue
+                (fs, mp, fstype, opts, dump, passno) = line.split()
+                if fstype == 'swap':
+                    if fs.startswith('/dev/disk/by-uuid'):
+                        swaps.append('/dev/' + self._byuuid_to_kname(fs))
+                    elif fs.startswith('/dev/disk/by-id'):
+                        kname = self._serial_to_kname(os.path.basename(fs))
+                        swaps.append('/dev/' + kname)
+                    elif fs.startswith('/dev/disk/by-path'):
+                        swaps.append('/dev/' + self._bypath_to_kname(fs))
+                    else:
+                        swaps.append(fs)
+
+            return swaps
+
+        expected_swaps = find_fstab_swaps()
+        proc_swaps = self.load_collect_file("proc-swaps")
+        for swap in expected_swaps:
+            self.assertIn(swap, proc_swaps)
 
 
 class PsuedoVMBaseClass(VMBaseClass):
diff --git a/tests/vmtests/test_basic.py b/tests/vmtests/test_basic.py
index 88b9897..4a0f427 100644
--- a/tests/vmtests/test_basic.py
+++ b/tests/vmtests/test_basic.py
@@ -143,11 +143,16 @@ class TestBasicAbs(VMBaseClass):
     def get_fstab_expected(self):
         rootdev = self._serial_to_kname('disk-a')
         btrfsdev = self._serial_to_kname('disk-c')
-        return [
+        expected = [
             (self._kname_to_byuuid(rootdev + '1'), '/', 'defaults'),
             (self._kname_to_byuuid(rootdev + '2'), '/home', 'defaults'),
-            (self._kname_to_byuuid(btrfsdev), '/btrfs', 'defaults,noatime')
+            (self._kname_to_byuuid(btrfsdev), '/btrfs', 'defaults,noatime'),
+            (self._kname_to_byuuid(rootdev + '3'), 'none', 'sw'),
         ]
+        if self.target_release in ['focal']:
+            expected.append(('/btrfs/btrfsswap.img', 'none', 'sw'))
+
+        return expected
 
     def test_whole_disk_uuid(self):
         self._test_whole_disk_uuid(
@@ -307,14 +312,23 @@ class TestBasicScsiAbs(TestBasicAbs):
         home_kname = (
             self._serial_to_kname('0x39cc071e72c64cc4-part2'))
         btrfs_kname = self._serial_to_kname('0x22dc58dc023c7008')
+        swap_kname = (
+            self._serial_to_kname('0x39cc071e72c64cc4-part3'))
 
         map_func = self._kname_to_byuuid
         if self.arch == 's390x':
             map_func = self._kname_to_bypath
 
-        return [(map_func(root_kname), '/', 'defaults'),
-                (map_func(home_kname), '/home', 'defaults'),
-                (map_func(btrfs_kname), '/btrfs', 'defaults,noatime')]
+        expected = [
+            (map_func(root_kname), '/', 'defaults'),
+            (map_func(home_kname), '/home', 'defaults'),
+            (map_func(btrfs_kname), '/btrfs', 'defaults,noatime'),
+            (map_func(swap_kname), 'none', 'sw')]
+
+        if self.target_release in ['focal']:
+            expected.append(('/btrfs/btrfsswap.img', 'none', 'sw'))
+
+        return expected
 
     @skip_if_arch('s390x')
     def test_whole_disk_uuid(self):