diff options
| author | Adam Dobrawy <ad-m@users.noreply.github.com> | 2020-06-29 19:52:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-29 13:52:13 -0400 |
| commit | baf11418c196ca72e6d570b64051d8ed35065abb (patch) | |
| tree | 6712b7ed758620dbfe8d9cb2e567f4cbe0ec92f2 /tests | |
| parent | b0eba6a4c3a25a13259c01ac4c9a35720fecfdd2 (diff) | |
| download | vyos-cloud-init-baf11418c196ca72e6d570b64051d8ed35065abb.tar.gz vyos-cloud-init-baf11418c196ca72e6d570b64051d8ed35065abb.zip | |
RbxCloud: Add support for FreeBSD (#464)
Changes are made that simplify code and aim to properly support FreeBSD:
- use `util.find_devs_with` instead call directly `blkid`, because on FreeBSD is not supported well and `util.find_devs_with` have solution for FreeBSD for that
- introduction of an additional name on FAT file system, which is used in FreeBSD
- drop shell to use default value, because FreeBSD – by default – does not have `/bin/bash`
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unittests/test_ds_identify.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py index fbb88e8a..cb57f2d0 100644 --- a/tests/unittests/test_ds_identify.py +++ b/tests/unittests/test_ds_identify.py @@ -273,6 +273,10 @@ class TestDsIdentify(DsIdentifyBase): """Rbx datasource has a disk with LABEL=CLOUDMD.""" self._test_ds_found('RbxCloud') + def test_rbx_cloud_lower(self): + """Rbx datasource has a disk with LABEL=cloudmd.""" + self._test_ds_found('RbxCloudLower') + def test_config_drive_upper(self): """ConfigDrive datasource has a disk with LABEL=CONFIG-2.""" self._test_ds_found('ConfigDriveUpper') @@ -948,6 +952,18 @@ VALID_CFG = { )}, ], }, + 'RbxCloudLower': { + 'ds': 'RbxCloud', + 'mocks': [ + {'name': 'blkid', 'ret': 0, + 'out': blkid_out( + [{'DEVNAME': 'vda1', 'TYPE': 'vfat', 'PARTUUID': uuid4()}, + {'DEVNAME': 'vda2', 'TYPE': 'ext4', + 'LABEL': 'cloudimg-rootfs', 'PARTUUID': uuid4()}, + {'DEVNAME': 'vdb', 'TYPE': 'vfat', 'LABEL': 'cloudmd'}] + )}, + ], + }, 'Hetzner': { 'ds': 'Hetzner', 'files': {P_SYS_VENDOR: 'Hetzner\n'}, |