summaryrefslogtreecommitdiff
path: root/tests/unittests
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-11-27 21:39:42 +0000
committerServer Team CI Bot <josh.powers+server-team-bot@canonical.com>2018-11-27 21:39:42 +0000
commit530850f971e36f4b0ef216cec9d889a99474ca0e (patch)
tree6f62b2ae6d44c74e0f77cc8b9fd6d91aea572c4a /tests/unittests
parente9d57b80c51a9952d7efa27da3ce469cbdf414b1 (diff)
downloadvyos-cloud-init-530850f971e36f4b0ef216cec9d889a99474ca0e.tar.gz
vyos-cloud-init-530850f971e36f4b0ef216cec9d889a99474ca0e.zip
OVF: identify label iso9660 filesystems with label 'OVF ENV'.
When deploying an OVA, at least some versions of vmware attach a cdrom with an ISO9660 filesystem label of 'OVF ENV'. This was seen on Vmware vCenter Server, 6.0.0, 2776510. In order to accomplish this we had to change the content of the DI_ISO9660_DEVS variable to be comma delimited rather than space delimited.
Diffstat (limited to 'tests/unittests')
-rw-r--r--tests/unittests/test_ds_identify.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py
index 46778e95..80640f19 100644
--- a/tests/unittests/test_ds_identify.py
+++ b/tests/unittests/test_ds_identify.py
@@ -499,7 +499,7 @@ class TestDsIdentify(DsIdentifyBase):
# Add recognized labels
valid_ovf_labels = ['ovf-transport', 'OVF-TRANSPORT',
- "OVFENV", "ovfenv"]
+ "OVFENV", "ovfenv", "OVF ENV", "ovf env"]
for valid_ovf_label in valid_ovf_labels:
ovf_cdrom_by_label['mocks'][0]['out'] = blkid_out([
{'DEVNAME': 'sda1', 'TYPE': 'ext4', 'LABEL': 'rootfs'},