diff options
| author | Sankar Tanguturi <stanguturi@vmware.com> | 2018-02-13 13:00:53 -0800 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2018-02-21 20:57:00 -0500 |
| commit | 3814d559c3e973238d819721605c7451e852fe63 (patch) | |
| tree | 2e5a815e84abc0bad12130bb3d59a12b76a3b6d0 /tests | |
| parent | b7497e807fa12a26d4a12aaf1ee9302a4fd24728 (diff) | |
| download | vyos-cloud-init-3814d559c3e973238d819721605c7451e852fe63.tar.gz vyos-cloud-init-3814d559c3e973238d819721605c7451e852fe63.zip | |
OVF: Fix VMware support for 64-bit platforms.
On few 64-bit platforms, the open-vm-tools package is installed at
/usr/lib64/. The DataSourceOVF is changed to search look there for the
'customization plugin'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unittests/test_ds_identify.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/unittests/test_ds_identify.py b/tests/unittests/test_ds_identify.py index 21258347..9be3f964 100644 --- a/tests/unittests/test_ds_identify.py +++ b/tests/unittests/test_ds_identify.py @@ -337,6 +337,16 @@ class TestDsIdentify(CiTestCase): """OVF is identified when vmware customization is enabled.""" self._test_ds_found('OVF-vmware-customization') + def test_ovf_on_vmware_iso_found_open_vm_tools_64(self): + """OVF is identified when open-vm-tools installed in /usr/lib64.""" + cust64 = copy.deepcopy(VALID_CFG['OVF-vmware-customization']) + p32 = 'usr/lib/vmware-tools/plugins/vmsvc/libdeployPkgPlugin.so' + open64 = 'usr/lib64/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so' + cust64['files'][open64] = cust64['files'][p32] + del cust64['files'][p32] + return self._check_via_dict( + cust64, RC_FOUND, dslist=[cust64.get('ds'), DS_NONE]) + def test_ovf_on_vmware_iso_found_by_cdrom_with_matching_fs_label(self): """OVF is identified by well-known iso9660 labels.""" ovf_cdrom_by_label = copy.deepcopy(VALID_CFG['OVF']) |