VM: fix name of method dealing with CD insertion, provide a generic API

"vm-cd-insert" does not mount anything, as the need for a subsequent
"mount" in the only test using it shows.

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

lib/vm.py

@@ -334,10 +334,13 @@ def detect_package_manager(self):
         else:
             return PackageManagerEnum.UNKNOWN
 
-    def mount_guest_tools_iso(self):
-        self.host.xe('vm-cd-insert', {'uuid': self.uuid, 'cd-name': 'guest-tools.iso'})
+    def insert_cd(self, vdi_name):
+        self.host.xe('vm-cd-insert', {'uuid': self.uuid, 'cd-name': vdi_name})
 
-    def unmount_guest_tools_iso(self):
+    def insert_guest_tools_iso(self):
+        self.insert_cd('guest-tools.iso')
+
+    def eject_cd(self):
         self.host.xe('vm-cd-eject', {'uuid': self.uuid})
 
     # *** Common reusable test fragments

tests/guest-tools/unix/test_guest_tools_unix.py

@@ -62,7 +62,7 @@ def test_install(self, running_vm, state):
 
         # mount ISO
         logging.info("Mount guest tools ISO")
-        vm.mount_guest_tools_iso()
+        vm.insert_guest_tools_iso()
         tmp_mnt = vm.ssh(['mktemp', '-d'])
         time.sleep(2) # wait a small amount of time just to ensure the device is available
         vm.ssh(['mount', '-t', 'iso9660', '/dev/cdrom', tmp_mnt])
@@ -80,7 +80,7 @@ def test_install(self, running_vm, state):
         # unmount ISO
         logging.info("Unmount guest tools ISO")
         vm.ssh(['umount', tmp_mnt])
-        vm.unmount_guest_tools_iso()
+        vm.eject_cd()
 
         # check that xe-daemon is running
         wait_for(lambda: vm.ssh_with_result(['pgrep', '-f', 'xe-daemon']).returncode == 0,